From 5e9ee3e380f7934f420021eaf3a212524ee21461 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 23 Mar 2024 16:53:46 +0100
Subject: [PATCH 001/342] xxhash: pkgConfigModules, drop flags

* add the `libxxhash` pkg-config module name
* `BUILD_SHARED_LIBS` is handled by `pkgsStatic` automatically.
---
 pkgs/development/libraries/xxHash/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix
index c78fc302afe49..f7461c878c236 100644
--- a/pkgs/development/libraries/xxHash/default.nix
+++ b/pkgs/development/libraries/xxHash/default.nix
@@ -22,10 +22,6 @@ stdenv.mkDerivation rec {
   # Using unofficial CMake build script to install CMake module files.
   cmakeDir = "../cmake_unofficial";
 
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
-  ];
-
   meta = with lib; {
     description = "Extremely fast hash algorithm";
     longDescription = ''
@@ -40,5 +36,8 @@ stdenv.mkDerivation rec {
     mainProgram = "xxhsum";
     maintainers = with maintainers; [ orivej ];
     platforms = platforms.all;
+    pkgConfigModules = [
+      "libxxhash"
+    ];
   };
 }

From 381c7ccf76adda7e88f56570c4189b2bdb1a34bd Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 16 Jun 2024 10:39:01 +0100
Subject: [PATCH 002/342] x265: 3.5 -> 3.6

---
 pkgs/development/libraries/x265/default.nix   | 30 ++-----------------
 .../libraries/x265/fix-neon-detection.patch   | 28 -----------------
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/development/libraries/x265/fix-neon-detection.patch

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 7f44834d48672..323b0ede0f5c8 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , cmake
 , nasm
 
@@ -30,7 +29,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "x265";
-  version = "3.5";
+  version = "3.6";
 
   outputs = [ "out" "dev" ];
 
@@ -38,36 +37,11 @@ stdenv.mkDerivation rec {
   # whether we fetch a source tarball or a tag from the git repo
   src = fetchurl {
     url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${version}.tar.gz";
-    hash = "sha256-5wozNcrKy7oLOiDsb+zWeDkyKI68gWOtdLzJYGR3yug=";
+    hash = "sha256-ZjUx80HFOJ9GDXMOYuEKT8yjQoyiyhCWk4Z7xf4uKAc=";
   };
 
   sourceRoot = "x265_${version}/source";
 
-  patches = [
-    # More aliases for ARM platforms + do not force CLFAGS for ARM :
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/arm-r1.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c";
-      sha256 = "1hgzq5vxkwh0nyikxjfz8gz3jvx2nq3yy12mz3fn13qvzdlb5ilp";
-    })
-    # use proper check to avoid undefined symbols when enabling assembly on ARM :
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/neon.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c";
-      sha256 = "1mmshpbyldrfqxfmdajqal4l647zvlrwdai8pxw99qg4v8gajfii";
-    })
-    # More complete PPC64 matches :
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/x265-3.3-ppc64.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c";
-      sha256 = "1mvw678xfm0vr59n5jilq56qzcgk1gmcip2afyafkqiv21nbms8c";
-    })
-    # Namespace functions for multi-bitdepth builds so that libraries are self-contained (and tests succeeds) :
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/test-ns.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c";
-      sha256 = "0zg3g53l07yh7ar5c241x50y5zp7g8nh8rh63ad4bdpchpc2f52d";
-    })
-    # Fix detection of NEON (and armv6 build) :
-    ./fix-neon-detection.patch
-  ];
-
   postPatch = ''
     substituteInPlace cmake/Version.cmake \
       --replace "unknown" "${version}" \
diff --git a/pkgs/development/libraries/x265/fix-neon-detection.patch b/pkgs/development/libraries/x265/fix-neon-detection.patch
deleted file mode 100644
index dbb826e546684..0000000000000
--- a/pkgs/development/libraries/x265/fix-neon-detection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 72489cd0a1c229258abe4f20e4fdfd414dfa88da
-Author: rnhmjoj <rnhmjoj@inventati.org>
-Date:   Sun Oct 2 00:15:24 2022 +0200
-
-    Fix NEON detection
-
-diff --git a/cmake/FindNeon.cmake b/cmake/FindNeon.cmake
-index 0062449..9c436d9 100644
---- a/cmake/FindNeon.cmake
-+++ b/cmake/FindNeon.cmake
-@@ -1,10 +1,11 @@
- include(FindPackageHandleStandardArgs)
- 
- # Check the version of neon supported by the ARM CPU
--execute_process(COMMAND cat /proc/cpuinfo | grep Features | grep neon
--                OUTPUT_VARIABLE neon_version
--                ERROR_QUIET
--                OUTPUT_STRIP_TRAILING_WHITESPACE)
--if(neon_version)
--    set(CPU_HAS_NEON 1)
-+message(STATUS "Detecting NEON support")
-+execute_process(COMMAND sed -n "/Features.* neon/q 1" /proc/cpuinfo
-+                RESULT_VARIABLE CPU_HAS_NEON)
-+if(CPU_HAS_NEON)
-+    message(STATUS "Detecting NEON support - supported")
-+else()
-+    message(STATUS "Detecting NEON support - not supported" )
- endif()

From e6bb2e638d731588ffa85fc5269ecda4772b5df2 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 21 Jun 2024 22:27:35 +0100
Subject: [PATCH 003/342] libproxy: 0.5.6 -> 0.5.7

Changes: https://github.com/libproxy/libproxy/releases/tag/0.5.7
---
 pkgs/development/libraries/libproxy/default.nix             | 4 ++--
 .../development/libraries/libproxy/hardcode-gsettings.patch | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 1183f46799ef5..59b2966711dd0 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libproxy";
-  version = "0.5.6";
+  version = "0.5.7";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libproxy";
     repo = "libproxy";
     rev = finalAttrs.version;
-    hash = "sha256-2uDlKjxzrKlyZKV0BSUDzmLSo2voJKDerbZZkamgNYk=";
+    hash = "sha256-VKVazLkmm1BZeGxrQmkpHors27bki0l8US3ZGI6OR0w=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/libproxy/hardcode-gsettings.patch b/pkgs/development/libraries/libproxy/hardcode-gsettings.patch
index 22aeb5836f9c5..6f4b3ec0e0314 100644
--- a/pkgs/development/libraries/libproxy/hardcode-gsettings.patch
+++ b/pkgs/development/libraries/libproxy/hardcode-gsettings.patch
@@ -1,8 +1,8 @@
 diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c
-index 820827b..338e269 100644
+index 52e812e..a1141c5 100644
 --- a/src/backend/plugins/config-gnome/config-gnome.c
 +++ b/src/backend/plugins/config-gnome/config-gnome.c
-@@ -85,11 +85,60 @@ px_config_gnome_init (PxConfigGnome *self)
+@@ -83,11 +83,60 @@ px_config_gnome_init (PxConfigGnome *self)
    if (!self->available)
      return;
  
@@ -69,7 +69,7 @@ index 820827b..338e269 100644
  
  static void
 diff --git a/tests/config-gnome-test.c b/tests/config-gnome-test.c
-index f80914a..118d429 100644
+index 677a3e9..a28d277 100644
 --- a/tests/config-gnome-test.c
 +++ b/tests/config-gnome-test.c
 @@ -60,11 +60,60 @@ static void

From 366f8032ceaddd094972ba27b77d3e7e00474533 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 21 Jun 2024 22:35:17 +0100
Subject: [PATCH 004/342] libksba: 1.6.6 -> 1.6.7

Changes: https://dev.gnupg.org/T7173
---
 pkgs/development/libraries/libksba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index d33de73e40914..accd730f19682 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libksba";
-  version = "1.6.6";
+  version = "1.6.7";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2";
-    hash = "sha256-XewDPSEVWTOIOMDElXxz39w+6G9zl31ieWQMnNCM5qQ=";
+    hash = "sha256-z3JRC467TrZpPu92V0nYNnegPHkpGjEQQKW/15uqt2M=";
   };
 
   outputs = [ "out" "dev" "info" ];

From 896027bc0e89cbd9269b869c4dfe9179cf0f2a7e Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 19 Jun 2024 19:46:53 +0200
Subject: [PATCH 005/342] publicsuffix-list: add update script

---
 pkgs/data/misc/publicsuffix-list/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix
index b2c69dff10919..1a8e8f8801b94 100644
--- a/pkgs/data/misc/publicsuffix-list/default.nix
+++ b/pkgs/data/misc/publicsuffix-list/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
+{ lib, stdenvNoCC, fetchFromGitHub, unstableGitUpdater }:
 
 stdenvNoCC.mkDerivation {
   pname = "publicsuffix-list";
@@ -21,6 +21,8 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     homepage = "https://publicsuffix.org/";
     description = "Cross-vendor public domain suffix database";

From 31cf9da817371c35695a17eaf28afaebb50baebf Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 19 Jun 2024 17:47:33 +0000
Subject: [PATCH 006/342] publicsuffix-list: 0-unstable-2024-01-07 ->
 0-unstable-2024-06-19

---
 pkgs/data/misc/publicsuffix-list/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix
index 1a8e8f8801b94..95cab65aa61b2 100644
--- a/pkgs/data/misc/publicsuffix-list/default.nix
+++ b/pkgs/data/misc/publicsuffix-list/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "publicsuffix-list";
-  version = "0-unstable-2024-01-07";
+  version = "0-unstable-2024-06-19";
 
   src = fetchFromGitHub {
     owner = "publicsuffix";
     repo = "list";
-    rev = "5db9b65997e3c9230ac4353b01994c2ae9667cb9";
-    hash = "sha256-kIJVS2ETAXQa1MMG8cjRUSFUn+jm9jBWH8go3L+lqHE=";
+    rev = "92c74a6cde6092a5e80531c0662e1055abeb975e";
+    hash = "sha256-fkfjR2A2nf3/F16Pn0hCwXtAd26TbUVA5gIv+J4DOjc=";
   };
 
   dontBuild = true;

From cf6ae5b73467083899565186a65d90d6c63315c8 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 25 Jun 2024 21:40:29 +0100
Subject: [PATCH 007/342] fribidi: 1.0.14 -> 1.0.15

Changes: https://github.com/fribidi/fribidi/releases/tag/v1.0.15
---
 pkgs/development/libraries/fribidi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 768c2185a1581..f5d6bcc7df344 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fribidi";
-  version = "1.0.14";
+  version = "1.0.15";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
   src = fetchurl {
     url = with finalAttrs; "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-dq4gSnAnZSrDmBufpYF8CDuiMRQ0AoTFjnVrJZzSJZo=";
+    sha256 = "sha256-C7x/9jO/ogiuMtfjac9afSDV0lV6CwZ8mqmLy/mWdYc=";
   };
 
   postPatch = ''

From f8f44e161099a2a921fa643964992dc462729f47 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Thu, 4 Jul 2024 03:35:35 +0000
Subject: [PATCH 008/342] Revert "db4: fix configure with llvm"

the configure program fails to compile due to using exit without a
function prototype. the fix should be to patch the configure script.

This reverts commit 227afde6d8eeb9c08b4f9bb3c42521925e2977a5.
---
 pkgs/development/libraries/db/db-4.8.nix  | 6 ++----
 pkgs/development/libraries/db/generic.nix | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index 4d6029d6d8211..81705374381e7 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, autoreconfHook, targetPlatform, ... } @ args:
+{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args:
 
-import ./generic.nix (builtins.removeAttrs args ["targetPlatform"] // {
+import ./generic.nix (args // {
   version = "4.8.30";
   sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
   extraPatches = [
@@ -9,8 +9,6 @@ import ./generic.nix (builtins.removeAttrs args ["targetPlatform"] // {
     ./darwin-mutexes-4.8.patch
   ];
 
-  drvArgs.configureFlags = lib.optional (targetPlatform.useLLVM or false) "--with-mutex=POSIX/pthreads";
-
   drvArgs.hardeningDisable = [ "format" ];
   drvArgs.doCheck = false;
 })
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index ddb4139e116d1..d715c1ffc8b19 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -67,8 +67,7 @@ stdenv.mkDerivation (rec {
       (if compat185 then "--enable-compat185" else "--disable-compat185")
     ]
     ++ lib.optional dbmSupport "--enable-dbm"
-    ++ lib.optional stdenv.isFreeBSD "--with-pic"
-    ++ (drvArgs.configureFlags or []);
+    ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   preConfigure = ''
     cd build_unix
@@ -93,4 +92,4 @@ stdenv.mkDerivation (rec {
     license = license;
     platforms = platforms.unix;
   };
-} // builtins.removeAttrs drvArgs [ "configureFlags" ])
+} // drvArgs)

From 91069620eaaa0cc8386d4589b6a6b93a284bbfa3 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Thu, 4 Jul 2024 03:38:10 +0000
Subject: [PATCH 009/342] db4: fix pthread configure detection

add header stdlib.h so pthread detection doesn't fail do to a missing
function prototype for exit.

```
configure:21863: clang -o conftest -O3   -D_GNU_SOURCE -D_REENTRANT
conftest.c  >&5
conftest.c:52:2: error: call to undeclared library function 'exit' with
type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not
support implicit function declarations [-Wimplicit-function-declaration]
   52 |         exit (
      |         ^
conftest.c:52:2: note: include the header <stdlib.h> or explicitly
provide a declaration for 'exit'
```
---
 pkgs/development/libraries/db/clang-4.8.patch | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch
index 0aff876820373..bf0de55fc1bf6 100644
--- a/pkgs/development/libraries/db/clang-4.8.patch
+++ b/pkgs/development/libraries/db/clang-4.8.patch
@@ -153,22 +153,42 @@ diff -ur a/dist/aclocal/clock.m4 b/dist/aclocal/clock.m4
 diff -ur a/dist/aclocal/mutex.m4 b/dist/aclocal/mutex.m4
 --- a/dist/aclocal/mutex.m4	1969-12-31 19:00:01.000000000 -0500
 +++ b/dist/aclocal/mutex.m4	2023-06-05 19:14:47.214158196 -0400
-@@ -4,6 +4,7 @@
+@@ -3,7 +3,9 @@
+ # POSIX pthreads tests: inter-process safe and intra-process only.
  AC_DEFUN(AM_PTHREADS_SHARED, [
  AC_TRY_RUN([
++#include <stdlib.h>
  #include <pthread.h>
 +int
  main() {
  	pthread_cond_t cond;
  	pthread_mutex_t mutex;
-@@ -46,6 +47,7 @@
+@@ -24,6 +26,7 @@ main() {
+ 	pthread_mutexattr_destroy(&mutexattr));
+ }], [db_cv_mutex="$1"],,
+ AC_TRY_LINK([
++#include <stdlib.h>
+ #include <pthread.h>],[
+ 	pthread_cond_t cond;
+ 	pthread_mutex_t mutex;
+@@ -45,7 +48,9 @@ AC_TRY_LINK([
+ ], [db_cv_mutex="$1"]))])
  AC_DEFUN(AM_PTHREADS_PRIVATE, [
  AC_TRY_RUN([
++#include <stdlib.h>
  #include <pthread.h>
 +int
  main() {
  	pthread_cond_t cond;
  	pthread_mutex_t mutex;
+@@ -64,6 +69,7 @@ main() {
+ 	pthread_mutexattr_destroy(&mutexattr));
+ }], [db_cv_mutex="$1"],,
+ AC_TRY_LINK([
++#include <stdlib.h>
+ #include <pthread.h>],[
+ 	pthread_cond_t cond;
+ 	pthread_mutex_t mutex;
 diff -ur a/dist/aclocal/sequence.m4 b/dist/aclocal/sequence.m4
 --- a/dist/aclocal/sequence.m4	1969-12-31 19:00:01.000000000 -0500
 +++ b/dist/aclocal/sequence.m4	2023-06-05 19:14:02.007869956 -0400
@@ -183,7 +203,7 @@ diff -ur a/dist/aclocal/sequence.m4 b/dist/aclocal/sequence.m4
  			$db_cv_seq_type l;
  			unsigned $db_cv_seq_type u;
 @@ -59,7 +62,9 @@
-				return (1);
+ 				return (1);
  			return (0);
  		}],, [db_cv_build_sequence="no"],
 -		AC_TRY_LINK(,[

From b803189674cb5c15a5730dafa951208951749700 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 25 May 2024 21:22:22 +0000
Subject: [PATCH 010/342] pam: packaging cleanups

- don't set null postPatch
- remove unnecessary musl patch

null postPatch breaks common override idioms like
```nix
pam.overrideAttrs (attrs: {
  postPatch = (attrs.postPatch or "") + "...";
});
```

the musl patch was upstreamed into pam
<https://github.com/linux-pam/linux-pam/commit/1d1d3b59af50c40efcc74f9c3f37b446a921e83e>
and subsequently removed from Alpine (where we took it from)
<https://gitlab.alpinelinux.org/alpine/aports/-/commit/e51f5c2997fd7a2140d417b6ddad1cec2cec9952>
---
 pkgs/os-specific/linux/pam/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index e5f8fec5acb14..b460348a105d4 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   ];
 
   # Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569
-  postPatch = if stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform then ''
+  postPatch = lib.optionalString (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform != stdenv.hostPlatform) ''
     rm CHANGELOG
     touch ChangeLog
-  '' else null;
+  '';
 
   outputs = [ "out" "doc" "man" /* "modules" */ ];
 
@@ -36,14 +36,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
-      # export ac_cv_search_crypt=no
-      # (taken from Alpine linux, apparently insecure but also doesn't build O:))
-      # disable insecure modules
-      # sed -e 's/pam_rhosts//g' -i modules/Makefile.am
-      sed -e 's/pam_rhosts//g' -i modules/Makefile.in
-  '';
-
   configureFlags = [
     "--includedir=${placeholder "out"}/include/security"
     "--enable-sconfigdir=/etc/security"

From e8913e8f3eb0a0f5c79ae394470bb95140beab95 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 4 Jul 2024 09:38:25 +0100
Subject: [PATCH 011/342] SDL2: 2.30.4 -> 2.30.5

Changes: https://github.com/libsdl-org/SDL/releases/tag/release-2.30.5
---
 pkgs/development/libraries/SDL2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 816afa176754d..0f87b46e5a179 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -58,13 +58,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL2";
-  version = "2.30.4";
+  version = "2.30.5";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-RhqbmS+mPVlXlo4/jrqPqtyGzvfaPTozlUEeAjHUBoA=";
+    hash = "sha256-ZonlvXAAWCTfDYf/w5RxP1Av67v89kex4H43xkbPYEA=";
   };
   dontDisableStatic = if withStatic then 1 else 0;
   outputs = [ "out" "dev" ];

From 5ef0a3a0e5f067fd2650cf30c2d239320fa714b5 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 19 Jun 2024 04:51:03 +0000
Subject: [PATCH 012/342] libical: fix strict deps

add icu to nativeBuildInputs
---
 pkgs/development/libraries/libical/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index d3ee9581305c7..9d5db75bb1214 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    icu
     ninja
     perl
     pkg-config

From c68739f4f0c3d1b3d3278da299865d8be772a0be Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 11 Jul 2024 23:10:19 +0100
Subject: [PATCH 013/342] bootstrap-tools-musl: match bootstrap-tools
 hardeningUnsupportedFlags

seems we missed adding stackclashprotection
---
 pkgs/stdenv/linux/bootstrap-tools-musl/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
index 6d2490acfa477..4450679983ff2 100644
--- a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
+++ b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
@@ -15,5 +15,10 @@ derivation ({
   langC = true;
   langCC = true;
   isGNU = true;
-  hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" "trivialautovarinit" ];
+  hardeningUnsupportedFlags = [
+    "fortify3"
+    "stackclashprotection"
+    "trivialautovarinit"
+    "zerocallusedregs"
+  ];
 } // extraAttrs)

From b207b6ef740dd402cfa96dac681c0523996835ae Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 11 Jul 2024 23:11:13 +0100
Subject: [PATCH 014/342] cc-wrapper: add support for shadowstack hardening
 flag

---
 nixos/doc/manual/release-notes/rl-2411.section.md        | 2 ++
 pkgs/build-support/cc-wrapper/add-hardening.sh           | 6 +++++-
 pkgs/development/compilers/gcc/default.nix               | 6 ++++++
 pkgs/development/compilers/llvm/common/clang/default.nix | 5 +++++
 pkgs/stdenv/darwin/default.nix                           | 1 +
 pkgs/stdenv/generic/make-derivation.nix                  | 1 +
 pkgs/stdenv/linux/bootstrap-tools-musl/default.nix       | 1 +
 pkgs/stdenv/linux/bootstrap-tools/default.nix            | 1 +
 pkgs/top-level/stage.nix                                 | 1 +
 9 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index c27d948be4c2b..7ca984a8eef4e 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -242,6 +242,8 @@
   - Nemo is now built with gtk-layer-shell support, note that for now it will be expected to see nemo-desktop
     listed as a regular entry in Cinnamon Wayland session's window list applet.
 
+- The `shadowstack` hardening flag has been added, though disabled by default.
+
 - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872)
   in `gitlab-runner` 15.6 and is expected to be removed in `gitlab-runner` 18.0. Configuration of existing runners
   should be changed to using *runner authentication tokens* by configuring
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index 0dca3b3347e5b..fc457ed0134aa 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -32,7 +32,7 @@ if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then
 fi
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
-  declare -a allHardeningFlags=(fortify fortify3 stackprotector stackclashprotection pie pic strictoverflow format trivialautovarinit zerocallusedregs)
+  declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection pie pic strictoverflow format trivialautovarinit zerocallusedregs)
   declare -A hardeningDisableMap=()
 
   # Determine which flags were effectively disabled so we can report below.
@@ -75,6 +75,10 @@ for flag in "${!hardeningEnableMap[@]}"; do
           ;;
       esac
       ;;
+    shadowstack)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling shadowstack >&2; fi
+      hardeningCFlagsBefore+=('-fcf-protection=return')
+      ;;
     stackprotector)
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
       hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 5eb92fd701da9..e5dcb1e0b3319 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -430,6 +430,12 @@ pipe ((callFile ./common/builder.nix {}) ({
       ) "stackclashprotection"
       ++ optional (!atLeast11) "zerocallusedregs"
       ++ optionals (!atLeast12) [ "fortify3" "trivialautovarinit" ]
+      ++ optional (!(
+        atLeast8
+        && targetPlatform.isLinux
+        && targetPlatform.isx86_64
+        && targetPlatform.libc == "glibc"
+      )) "shadowstack"
       ++ optionals (langFortran) [ "fortify" "format" ];
   };
 
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 922eb8657cee5..862c5cbb11782 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -138,6 +138,11 @@ let
       isClang = true;
       hardeningUnsupportedFlagsByTargetPlatform = targetPlatform:
         [ "fortify3" ]
+        ++ lib.optional (
+          (lib.versionOlder release_version "7")
+          || !targetPlatform.isLinux
+          || !targetPlatform.isx86_64
+        ) "shadowstack"
         ++ lib.optional (
           (lib.versionOlder release_version "11")
           || (targetPlatform.isAarch64 && (lib.versionOlder release_version "18.1"))
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 5e5f2be12ba6b..dcab951fdfcc8 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -416,6 +416,7 @@ in
                 isFromBootstrapFiles = true;
                 hardeningUnsupportedFlags = [
                   "fortify3"
+                  "shadowstack"
                   "stackclashprotection"
                   "zerocallusedregs"
                 ];
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 952b8b66c10c3..bda0060900dd7 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -115,6 +115,7 @@ let
     "format"
     "fortify"
     "fortify3"
+    "shadowstack"
     "pic"
     "pie"
     "relro"
diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
index 4450679983ff2..3b69f7c531941 100644
--- a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
+++ b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
@@ -17,6 +17,7 @@ derivation ({
   isGNU = true;
   hardeningUnsupportedFlags = [
     "fortify3"
+    "shadowstack"
     "stackclashprotection"
     "trivialautovarinit"
     "zerocallusedregs"
diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix
index 4450679983ff2..3b69f7c531941 100644
--- a/pkgs/stdenv/linux/bootstrap-tools/default.nix
+++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix
@@ -17,6 +17,7 @@ derivation ({
   isGNU = true;
   hardeningUnsupportedFlags = [
     "fortify3"
+    "shadowstack"
     "stackclashprotection"
     "trivialautovarinit"
     "zerocallusedregs"
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index b0c7ec03827b4..648b81f95a5c3 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -292,6 +292,7 @@ let
           pkgsExtraHardening = super';
           stdenv = super'.withDefaultHardeningFlags (
             super'.stdenv.cc.defaultHardeningFlags ++ [
+              "shadowstack"
               "stackclashprotection"
               "trivialautovarinit"
             ]

From 3ebc7bbf61dfd9b0fa2bc65d6484ea9a44adb3e4 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 11 Jul 2024 22:52:23 +0100
Subject: [PATCH 015/342] glibc: add option enableCETRuntimeDefault to
 runtime-enable CET by default

this appears to have been added to glibc because of the number
of packages in some distributions that were built with CET enabled
before a CET enabled machine was available to test for breakage
with.

we don't have that problem to such an extent and users of hardened
systems will likely want to enable this by default.
---
 .../2.39-revert-cet-default-disable.patch     | 49 +++++++++++++++++++
 pkgs/development/libraries/glibc/common.nix   |  5 +-
 pkgs/development/libraries/glibc/default.nix  |  3 +-
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/glibc/2.39-revert-cet-default-disable.patch

diff --git a/pkgs/development/libraries/glibc/2.39-revert-cet-default-disable.patch b/pkgs/development/libraries/glibc/2.39-revert-cet-default-disable.patch
new file mode 100644
index 0000000000000..8590581daf0bc
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.39-revert-cet-default-disable.patch
@@ -0,0 +1,49 @@
+Revert 55d63e731253de82e96ed4ddca2e294076cd0bc5
+
+--- b/sysdeps/x86/cpu-features.c
++++ a/sysdeps/x86/cpu-features.c
+@@ -110,7 +110,7 @@
+   if (!CPU_FEATURES_CPU_P (cpu_features, RTM_ALWAYS_ABORT))
+     CPU_FEATURE_SET_ACTIVE (cpu_features, RTM);
+ 
++#if CET_ENABLED
+-#if CET_ENABLED && 0
+   CPU_FEATURE_SET_ACTIVE (cpu_features, IBT);
+   CPU_FEATURE_SET_ACTIVE (cpu_features, SHSTK);
+ #endif
+reverted:
+--- b/sysdeps/x86/cpu-tunables.c
++++ a/sysdeps/x86/cpu-tunables.c
+@@ -35,17 +35,6 @@
+       break;								\
+     }
+ 
+-#define CHECK_GLIBC_IFUNC_CPU_BOTH(f, cpu_features, name, len)		\
+-  _Static_assert (sizeof (#name) - 1 == len, #name " != " #len);	\
+-  if (tunable_str_comma_strcmp_cte (&f, #name))				\
+-    {									\
+-      if (f.disable)							\
+-	CPU_FEATURE_UNSET (cpu_features, name)				\
+-      else								\
+-	CPU_FEATURE_SET_ACTIVE (cpu_features, name)			\
+-      break;								\
+-    }
+-
+ /* Disable a preferred feature NAME.  We don't enable a preferred feature
+    which isn't available.  */
+ #define CHECK_GLIBC_IFUNC_PREFERRED_OFF(f, cpu_features, name, len)	\
+@@ -142,13 +131,11 @@
+ 	    }
+ 	  break;
+ 	case 5:
+-	  {
+-	    CHECK_GLIBC_IFUNC_CPU_BOTH (n, cpu_features, SHSTK, 5);
+-	  }
+ 	  if (n.disable)
+ 	    {
+ 	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, LZCNT, 5);
+ 	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, MOVBE, 5);
++	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SHSTK, 5);
+ 	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, SSSE3, 5);
+ 	      CHECK_GLIBC_IFUNC_CPU_OFF (n, cpu_features, XSAVE, 5);
+ 	    }
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 25a83b1dc6d21..382a1eea076db 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -37,6 +37,7 @@
 , profilingLibraries ? false
 , withGd ? false
 , enableCET ? false
+, enableCETRuntimeDefault ? false
 , extraBuildInputs ? []
 , extraNativeBuildInputs ? []
 , ...
@@ -50,6 +51,7 @@ in
 
 assert withLinuxHeaders -> linuxHeaders != null;
 assert withGd -> gd != null && libpng != null;
+assert enableCET == false -> !enableCETRuntimeDefault;
 
 stdenv.mkDerivation ({
   version = version + patchSuffix;
@@ -114,7 +116,8 @@ stdenv.mkDerivation ({
       lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch
     )
     ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
-    ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;
+    ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch
+    ++ lib.optional enableCETRuntimeDefault ./2.39-revert-cet-default-disable.patch;
 
   postPatch =
     ''
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 96a08178637df..490f29e99cfb1 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -3,6 +3,7 @@
 , profilingLibraries ? false
 , withGd ? false
 , enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false
+, enableCETRuntimeDefault ? false
 , pkgsBuildBuild
 , libgcc
 }:
@@ -16,7 +17,7 @@ let
 in
 
 (callPackage ./common.nix { inherit stdenv; } {
-  inherit withLinuxHeaders withGd profilingLibraries enableCET;
+  inherit withLinuxHeaders withGd profilingLibraries enableCET enableCETRuntimeDefault;
   pname = "glibc" + lib.optionalString withGd "-gd" + lib.optionalString (stdenv.cc.isGNU && libgcc==null) "-nolibgcc";
 }).overrideAttrs(previousAttrs: {
 

From 41cae89e6b8a7f1f6fffd0e965c8db43e3e47db4 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 19 Jun 2024 20:01:41 +0100
Subject: [PATCH 016/342] glibc: enableCETRuntimeDefault for pkgsExtraHardening

---
 pkgs/top-level/stage.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 648b81f95a5c3..fbd7ea458ba9a 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -297,6 +297,10 @@ let
               "trivialautovarinit"
             ]
           ) super'.stdenv;
+          glibc = super'.glibc.override rec {
+            enableCET = if self'.stdenv.hostPlatform.isx86_64 then "permissive" else false;
+            enableCETRuntimeDefault = enableCET != false;
+          };
         })
       ] ++ overlays;
     };

From 09a8a7ddbb43b1a5de1ee4cf934015cb09d4ac9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 18:04:27 +0000
Subject: [PATCH 017/342] waf: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix
index a30c5df8d8511..45ab6f7622db8 100644
--- a/pkgs/by-name/wa/waf/package.nix
+++ b/pkgs/by-name/wa/waf/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waf";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitLab {
     owner = "ita1024";
     repo = "waf";
     rev = "waf-${finalAttrs.version}";
-    hash = "sha256-38u8DJ1KLkb7FfeCr+1e5UBE3Qkx1q2FBsm5HDXnunQ=";
+    hash = "sha256-/7V+GA3YBhdaJkDlZ1k4IUYkgh0yuTG09G+frnnMoIw=";
   };
 
   nativeBuildInputs = [

From 2cc76299592fb976313830db8fd6e7887e492d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 4 Jun 2024 15:15:37 -0400
Subject: [PATCH 018/342] libgit2: 1.7.2 -> 1.8.1

---
 pkgs/development/libraries/libgit2-glib/default.nix | 10 ++++++++++
 pkgs/development/libraries/libgit2/default.nix      | 12 ++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix
index cd2f10d157823..abf15fdec4d87 100644
--- a/pkgs/development/libraries/libgit2-glib/default.nix
+++ b/pkgs/development/libraries/libgit2-glib/default.nix
@@ -13,6 +13,7 @@
 , libgit2
 , glib
 , python3
+, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -26,6 +27,15 @@ stdenv.mkDerivation rec {
     sha256 = "EzHa2oOPTh9ZGyZFnUQSajJd52LcPNJhU6Ma+9/hgZA=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "support-libgit2-1.8.patch";
+      # https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40
+      url = "https://gitlab.gnome.org/GNOME/libgit2-glib/-/commit/a76fdf96c3af9ce9d21a3985c4be8a1aa6eea661.patch";
+      hash = "sha256-ysU8pAixyftensfEC9bE0RUFMPMei0jYT26WKN5uOFE=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix
index 58212e00d89e7..6eac8d210817e 100644
--- a/pkgs/development/libraries/libgit2/default.nix
+++ b/pkgs/development/libraries/libgit2/default.nix
@@ -8,7 +8,6 @@
 , libssh2
 , openssl
 , pcre
-, http-parser
 , libiconv
 , Security
 , staticBuild ? stdenv.hostPlatform.isStatic
@@ -16,11 +15,14 @@
 , libgit2-glib
 , python3Packages
 , gitstatus
+, llhttp
+, withGssapi ? false
+, krb5
 }:
 
 stdenv.mkDerivation rec {
   pname = "libgit2";
-  version = "1.7.2";
+  version = "1.8.1";
   # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
 
   outputs = ["lib" "dev" "out"];
@@ -29,12 +31,13 @@ stdenv.mkDerivation rec {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    hash = "sha256-fVPY/byE2/rxmv/bUykcAbmUFMlF3UZogVuTzjOXJUU=";
+    hash = "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=";
   };
 
   cmakeFlags = [
     "-DUSE_HTTP_PARSER=system"
     "-DUSE_SSH=ON"
+    (lib.cmakeBool "USE_GSSAPI" withGssapi)
     "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}"
   ] ++ lib.optionals stdenv.hostPlatform.isWindows [
     "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool"
@@ -44,7 +47,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake python3 pkg-config ];
 
-  buildInputs = [ zlib libssh2 openssl pcre http-parser ]
+  buildInputs = [ zlib libssh2 openssl pcre llhttp ]
+    ++ lib.optional withGssapi krb5
     ++ lib.optional stdenv.isDarwin Security;
 
   propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;

From 602760ce42b83bf9071f52d97adcbebc046f5fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 4 Jun 2024 15:26:51 -0400
Subject: [PATCH 019/342] libgit2: fix incorrect recursive structure in tests

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

diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix
index 6eac8d210817e..e110ceb67aa8a 100644
--- a/pkgs/development/libraries/libgit2/default.nix
+++ b/pkgs/development/libraries/libgit2/default.nix
@@ -20,7 +20,7 @@
 , krb5
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libgit2";
   version = "1.8.1";
   # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=";
   };
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  passthru.tests = {
+  passthru.tests = lib.mapAttrs (_: v: v.override { libgit2 = finalAttrs.finalPackage; }) {
     inherit libgit2-glib;
     inherit (python3Packages) pygit2;
     inherit gitstatus;
@@ -84,4 +84,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ SuperSandro2000 ];
   };
-}
+})

From 1e8b1425efef8829ea000f2a8da9a4903ff05a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 4 Jun 2024 17:54:05 -0400
Subject: [PATCH 020/342] python312Packages.pygit2: 1.14.1 -> 1.15.0

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

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index c541fe5aac650..475ea02fcf46c 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "1.14.1";
+  version = "1.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7FlYVxuCpjUXhcpkXlOUwxrkXuxThLL6nE4F3eNZetY=";
+    hash = "sha256-pjVSX/x0EoZp3i9jRgqUydVgljSkh1wKr85RD97sF6w=";
   };
 
   preConfigure = lib.optionalString stdenv.isDarwin ''

From e92ee335fa2a6599e18498a404a422993ad27fd4 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 12:18:43 -0700
Subject: [PATCH 021/342] pcre: update gnu config scripts

---
 pkgs/development/libraries/pcre/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 52a4ba32315ee..080256ee440cc 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl, fetchpatch, updateAutotoolsGnuConfigScriptsHook
 , pcre, windows ? null
 , variant ? null
 }:
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # necessary to build on FreeBSD native pending inclusion of
+  # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
+  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
+
   preCheck = ''
     patchShebangs RunGrepTest
   '';

From 97e18621b0be225b24a341b7a8d7d050419cdb2f Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 12:18:33 -0700
Subject: [PATCH 022/342] libpipeline: update gnu config scripts

---
 pkgs/development/libraries/libpipeline/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
index 3630980353a58..3aeb79b46af87 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }:
 
 stdenv.mkDerivation rec {
   pname = "libpipeline";
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
 
   patches = lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
 
+  # necessary to build on FreeBSD native pending inclusion of
+  # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
+  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
+
   meta = with lib; {
     homepage = "http://libpipeline.nongnu.org";
     description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way";

From ef593db9caff6d700c0c72ba03a7ee79a58c9575 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 20 Jul 2024 20:32:57 +0900
Subject: [PATCH 023/342] systemd: re-enable bpf-framework

systemd meson.build apparently didn't check properly that the option was
enabled in all code paths, so it was possible to build systemd such as
--version would have -BPF_FRAMEWORK (properly disabled in config.h) with
-Dbpf-framework=enabled.

Fix the failing check, which was `clang -target bpf` breaking with
zerocallusedregs hardening -- this is apparently a known problem as it's
disabled in quite a few other packages that mention bpf in comment above
the exception...

Link: https://github.com/systemd/systemd/pull/33793
---
 pkgs/os-specific/linux/systemd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 68209a4e2ccbc..7e99fce543ea6 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -412,7 +412,8 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523
     "trivialautovarinit"
-  ];
+    # breaks clang -target bpf; should be fixed to filter target?
+  ] ++ (lib.optional withLibBPF "zerocallusedregs");
 
   nativeBuildInputs =
     [

From cd8e02828ae319868c096c3ad7d27425a68524af Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 10 Jul 2024 23:23:52 +0200
Subject: [PATCH 024/342] meson: 1.4.1 -> 1.5.0

---
 pkgs/by-name/me/meson/package.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index cb5093c2caf49..6c1a9563bf43a 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -21,13 +21,13 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     rev = "refs/tags/${version}";
-    hash = "sha256-RBE4AUF5fymUA87JEDWtpUFXmVPFzdhZgDI7/kscTx4=";
+    hash = "sha256-Y//8fXBNdx+ikpvg+S5Bk2rN3UVS5qo2bnbTSVBb8b8=";
   };
 
   patches = [
@@ -72,14 +72,16 @@ python3.pkgs.buildPythonApplication rec {
     # This edge case is explicitly part of meson but is wrong for nix
     ./007-freebsd-pkgconfig-path.patch
 
-    # Find boost via pkg-config
-    # https://github.com/NixOS/nixpkgs/issues/86131
-    # Already merged upstream PR: https://github.com/mesonbuild/meson/pull/13272
-    # FIXME: Will be in meson 1.5.0
     (fetchpatch {
-      name = "find-boost-pkg-config.patch";
-      url = "https://github.com/mesonbuild/meson/commit/c21b886ba8a60cce7fa56e4be40bd7547129fb00.patch";
-      hash = "sha256-uSilNuSx9yd1cxs0XVLcLw4MOXEd2uIe2g+wk+SBqeU=";
+      name = "tests-skip-framework-recasting-if-CMake-unavailable.patch";
+      url = "https://github.com/mesonbuild/meson/commit/8a8a3a0578fd8d5a8720a7a706f6f3b99e857f9c.patch";
+      hash = "sha256-XkwNQ5eg/fVekhsFg/V2/S2LbIVGz3H0wsSFlUT3ZZE=";
+    })
+
+    (fetchpatch {
+      name = "cross.patch";
+      url = "https://github.com/mesonbuild/meson/pull/13411.patch";
+      hash = "sha256-IHSV0Dfse0lzDtxh/+APc/dzGr/BUbR/WIOqDsm7/8Y=";
     })
   ];
 
@@ -133,6 +135,9 @@ python3.pkgs.buildPythonApplication rec {
     ''test cases/linuxlike/14 static dynamic linkage''
     # Nixpkgs cctools does not have bitcode support.
     ''test cases/osx/7 bitcode''
+  ] ++ lib.optionals stdenv.isDarwin [
+    # requires llvmPackages.openmp, creating cyclic dependency
+    ''test cases/common/184 openmp''
   ] ++ lib.optionals stdenv.isFreeBSD [
     # pch doesn't work quite right on FreeBSD, I think
     ''test cases/common/13 pch''

From feabbe8bc4e0d5b0390c823ee58206d20d05d52e Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 19 Jun 2024 20:15:09 -0700
Subject: [PATCH 025/342] libpsl: make python both a build and runtime
 dependency

Previously, python3 was only provided as a nativeBuildInput. However,
libpsl.bin distributes python scripts. To make them use the right
python, provide python as a buildInput and specify which python to
use at build time with a configure flag.
---
 pkgs/development/libraries/libpsl/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index a8fcd2581caa5..2a8e1ae24abbf 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -10,6 +10,7 @@
 , libxslt
 , pkg-config
 , python3
+, buildPackages
 , valgrind
 , publicsuffix-list
 }:
@@ -33,7 +34,6 @@ stdenv.mkDerivation rec {
     gtk-doc
     lzip
     pkg-config
-    python3
     libxslt
   ];
 
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
     libidn2
     libunistring
     libxslt
+    python3
   ];
 
   propagatedBuildInputs = [
@@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
     "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
     "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
     "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt"
+    "PYTHON=${lib.getExe buildPackages.python3}"
   ];
 
   enableParallelBuilding = true;

From 488bac5e766600c87dca34eeb4c6648a92e4b357 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 22:27:28 -0700
Subject: [PATCH 026/342] w3m: update gnu config scripts

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

diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index acfd83f560867..827202ae38181 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -5,7 +5,7 @@
 , x11Support ? graphicsSupport, libX11
 , mouseSupport ? !stdenv.isDarwin, gpm-ncurses
 , perl, man, pkg-config, buildPackages, w3m
-, testers
+, testers, updateAutotoolsGnuConfigScriptsHook
 }:
 
 let
@@ -53,7 +53,9 @@ in stdenv.mkDerivation rec {
     sed -ie 's!mktable.*:.*!mktable:!' Makefile.in
   '';
 
-  nativeBuildInputs = [ pkg-config gettext ];
+  # updateAutotoolsGnuConfigScriptsHook necessary to build on FreeBSD native pending inclusion of
+  # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
+  nativeBuildInputs = [ pkg-config gettext updateAutotoolsGnuConfigScriptsHook ];
   buildInputs = [ ncurses boehmgc zlib ]
     ++ lib.optional sslSupport openssl
     ++ lib.optional mouseSupport gpm-ncurses

From 538442183767c52b2c40f5e45e3b7fae139a3583 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 22:07:01 -0700
Subject: [PATCH 027/342] freebsd.libstdthreads: init

---
 pkgs/os-specific/bsd/freebsd/pkgs/libstdthreads.nix | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libstdthreads.nix

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libstdthreads.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libstdthreads.nix
new file mode 100644
index 0000000000000..2f5fd7c6afd17
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libstdthreads.nix
@@ -0,0 +1,5 @@
+{ mkDerivation }:
+mkDerivation {
+  path = "lib/libstdthreads";
+  extraPaths = [ "lib/libc/Versions.def" ];
+}

From f24b19390b7717773e1bc6775f99afed184756a8 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 22:08:13 -0700
Subject: [PATCH 028/342] docbook2x: add runtime dependency on iconv binary

This package uses iconv(1), which is provided by pkgs.iconv. This won't
be a problem unless libiconv != iconv, e.g. on FreeBSD.
---
 pkgs/tools/typesetting/docbook2x/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix
index 3fa76f56d0f07..f964f7633d9ec 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, lib, stdenv, texinfo, perlPackages
-, groff, libxml2, libxslt, gnused, libiconv, opensp
+, groff, libxml2, libxslt, gnused, libiconv, iconv, opensp
 , docbook_xml_dtd_43, bash
 , makeWrapper }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   patches = [ ./db2x_texixml-to-stdout.patch ];
 
   nativeBuildInputs = [ makeWrapper perlPackages.perl texinfo libxslt ];
-  buildInputs = [ groff libxml2 opensp libiconv bash ]
+  buildInputs = [ groff libxml2 opensp libiconv iconv bash ]
     ++ (with perlPackages; [ perl XMLSAX XMLParser XMLNamespaceSupport ]);
 
   postConfigure = ''

From 3f15de5959114a7b7b793b2fc9568b6605eb069d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 21 Jul 2024 03:34:30 +0200
Subject: [PATCH 029/342] wayland: don't propagate bin output

This fixes the host platform wayland-scanner binary
leaking into cross builds.
---
 pkgs/development/libraries/wayland/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 5a78a5c993ef0..6a057a9847dde 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -55,6 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "bin" "dev" ] ++ lib.optionals withDocumentation [ "doc" "man" ];
   separateDebugInfo = true;
+  # We don't want `bin` to be propagated, as it'd propagate wayland-scanner, which breaks cross.
+  # See https://github.com/NixOS/nixpkgs/pull/328804
+  propagatedBuildOutputs = [ "out" "dev" ];
 
   mesonFlags = [
     "-Ddocumentation=${lib.boolToString withDocumentation}"

From 2ea2276b3032dc1ae8d21d23fd87b1fc5c3f0f66 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 21 Jul 2024 09:53:17 -0400
Subject: [PATCH 030/342] texinfo: set texinfo_cv_sys_iconv_converts_euc_cn=yes
 when cross compiling version >= 7.1

Reference: https://lists.openembedded.org/g/openembedded-core/message/197071
---
 pkgs/development/tools/misc/texinfo/common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 9b5959d40e47b..a43eab5f00e59 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -101,6 +101,9 @@ stdenv.mkDerivation {
       "--enable-perl-xs=no"
       "TI_AWK=${getBin gawk}/bin/awk"
     ]
+    ++ optionals (crossBuildTools && lib.versionAtLeast version "7.1") [
+      "texinfo_cv_sys_iconv_converts_euc_cn=yes"
+    ]
     ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
 
   installFlags = [ "TEXMF=$(out)/texmf-dist" ];

From 3a6026ad2368c9f214eae6856c0eb7fb013e1577 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 21 Jul 2024 16:15:57 +0200
Subject: [PATCH 031/342] python312Packages.cryptography: 42.0.8 -> 43.0.0

https://cryptography.io/en/latest/changelog/#v43-0-0
---
 .../python-modules/cryptography/default.nix   | 37 ++++++++-----------
 .../python-modules/cryptography/vectors.nix   |  2 +-
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index a440e7e480da4..29076051578e9 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -3,12 +3,12 @@
   stdenv,
   buildPythonPackage,
   callPackage,
-  cargo,
+  setuptools,
+  bcrypt,
   certifi,
   cffi,
   cryptography-vectors ? (callPackage ./vectors.nix { }),
   fetchPypi,
-  fetchpatch2,
   isPyPy,
   libiconv,
   libxcrypt,
@@ -18,39 +18,29 @@
   pytest-xdist,
   pytestCheckHook,
   pythonOlder,
-  rustc,
   rustPlatform,
   Security,
-  setuptoolsRustBuildHook,
 }:
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "42.0.8"; # Also update the hash in vectors.nix
+  version = "43.0.0"; # Also update the hash in vectors.nix
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jQnQVDnOe6qOnpWwfsW2yIb1SN634Pae8l9ks7zoQvI=";
+    hash = "sha256-uIB1raLVGqnxgoNTLJ9g5yFwBBu6iNfzfknLsQJ1KZ4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "${pname}-${version}/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-PgxPcFocEhnQyrsNtCN8YHiMptBmk1PUhEDQFdUR1nU=";
+    hash = "sha256-TEQy8PrIaZshiBFTqR/OJp3e/bVM1USjcmpDYcjPJPM=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # skip overflowing tests on 32 bit; https://github.com/pyca/cryptography/pull/10366
-      url = "https://github.com/pyca/cryptography/commit/d741901dddd731895346636c0d3556c6fa51fbe6.patch";
-      hash = "sha256-eC+MZg5O8Ia5CbjRE4y+JhaFs3Q5c62QtPHr3x9T+zw=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "--benchmark-disable" ""
@@ -58,12 +48,11 @@ buildPythonPackage rec {
 
   cargoRoot = "src/rust";
 
-  nativeBuildInputs = [
+  build-system = [
     rustPlatform.cargoSetupHook
-    setuptoolsRustBuildHook
-    cargo
-    rustc
+    rustPlatform.maturinBuildHook
     pkg-config
+    setuptools
   ] ++ lib.optionals (!isPyPy) [ cffi ];
 
   buildInputs =
@@ -74,7 +63,9 @@ buildPythonPackage rec {
     ]
     ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ];
 
-  propagatedBuildInputs = lib.optionals (!isPyPy) [ cffi ];
+  dependencies = lib.optionals (!isPyPy) [ cffi ];
+
+  optional-dependencies.ssh = [ bcrypt ];
 
   nativeCheckInputs = [
     certifi
@@ -82,7 +73,7 @@ buildPythonPackage rec {
     pretend
     pytestCheckHook
     pytest-xdist
-  ];
+  ] ++ optional-dependencies.ssh;
 
   pytestFlagsArray = [ "--disable-pytest-warnings" ];
 
@@ -91,6 +82,10 @@ buildPythonPackage rec {
     "tests/bench"
   ];
 
+  passthru = {
+    vectors = cryptography-vectors;
+  };
+
   meta = with lib; {
     description = "Package which provides cryptographic recipes and primitives";
     longDescription = ''
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 8d1bb48d623a5..d0f635df8b9e2 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cryptography_vectors";
     inherit version;
-    hash = "sha256-31ZXNnvAqQw3QwnLJhAJosU8rpGkWHgTOaD3JPgZpGo=";
+    hash = "sha256-XJ0JpzLVQzzt4VQqluzXCoDhIq8EfudAS83x88y45wI=";
   };
 
   nativeBuildInputs = [ flit-core ];

From f75d50324faf773abf9c66c04fa1ff1fe2bf0919 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 21 Jul 2024 12:55:04 +0200
Subject: [PATCH 032/342] nodejs: use upstream patch instead of custom one

---
 .../web/nodejs/use-correct-env-in-tests.patch            | 7 -------
 pkgs/development/web/nodejs/v18.nix                      | 9 +++++++++
 pkgs/development/web/nodejs/v20.nix                      | 8 ++++++++
 pkgs/development/web/nodejs/v22.nix                      | 8 ++++++++
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/web/nodejs/use-correct-env-in-tests.patch b/pkgs/development/web/nodejs/use-correct-env-in-tests.patch
index d2fda8d2ceadf..070d0e1ddfc34 100644
--- a/pkgs/development/web/nodejs/use-correct-env-in-tests.patch
+++ b/pkgs/development/web/nodejs/use-correct-env-in-tests.patch
@@ -1,12 +1,5 @@
 `/usr/bin/env` is not available.
 
---- old/test/common/assertSnapshot.js
-+++ new/test/common/assertSnapshot.js
-@@ -81,2 +81,2 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ...
--  const executable = tty ? 'tools/pseudo-tty.py' : process.execPath;
--  const args = tty ? [process.execPath, ...flags, filename] : [...flags, filename];
-+  const executable = tty ? 'python3' : process.execPath;
-+  const args = tty ? ['tools/pseudo-tty.py', process.execPath, ...flags, filename] : [...flags, filename];
 --- old/test/parallel/test-child-process-default-options.js
 +++ new/test/parallel/test-child-process-default-options.js
 @@ -35 +35 @@ if (isWindows) {
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 1101fbdf725d5..ab2edcf5e8c9a 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -37,5 +37,14 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch";
       hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I=";
     })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch";
+      hash = "sha256-JJi8z9aaWnu/y3nZGOSUfeNzNSCYzD9dzoHXaGkeaEA=";
+      includes = ["test/common/assertSnapshot.js"];
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch";
+      hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k=";
+    })
   ] ++ gypPatches;
 }
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index bf0e2f7feffb0..1688eca1d2da8 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -27,5 +27,13 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch";
       hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo=";
     })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch";
+      hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8=";
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch";
+      hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k=";
+    })
   ] ++ gypPatches;
 }
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 44737d2ba8eca..6d34a19072636 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -20,5 +20,13 @@ buildNodejs {
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
     ./bin-sh-node-run-v22.patch
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch";
+      hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8=";
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch";
+      hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k=";
+    })
   ] ++ gypPatches;
 }

From 070791fba6ce4cf0ebb16e490f25397bcc562e59 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 21 Jul 2024 18:23:44 +0200
Subject: [PATCH 033/342] nodejs_22: 22.4.1 -> 22.5.1

---
 pkgs/development/web/nodejs/v22.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 6d34a19072636..9b3fa4fa0d8b7 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -12,18 +12,14 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.4.1";
-  sha256 = "sha256-ZfyFf1qoJWqvyQCzRMARXJrq4loCVB/Vzg29Tf0cX7k=";
+  version = "22.5.1";
+  sha256 = "924f381a32cf26b6bedbe95feedde348450f4fd321283d3bf3f7965aa45ce831";
   patches = [
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
     ./bin-sh-node-run-v22.patch
-    (fetchpatch2 {
-      url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch";
-      hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8=";
-    })
     (fetchpatch2 {
       url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch";
       hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k=";

From dca354dd14e087e22a248fa5f1cee7c4dae2aa82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 12:38:06 +0000
Subject: [PATCH 034/342] xapian: 1.4.25 -> 1.4.26

---
 pkgs/development/libraries/xapian/default.nix             | 2 +-
 pkgs/development/libraries/xapian/tools/omega/default.nix | 2 +-
 pkgs/development/python-modules/xapian/default.nix        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 7a06951f8422f..9a27f1e1dd0cc 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -59,5 +59,5 @@ in {
   # Don't forget to change the hashes in xapian-omega and
   # python3Packages.xapian. They inherit the version from this package, and
   # should always be built with the equivalent xapian version.
-  xapian_1_4 = generic "1.4.25" "sha256-DJnf3YF1cctWibxBKn4CFAeTgxPzjqOnD6O/hkEGCO4=";
+  xapian_1_4 = generic "1.4.26" "sha256-nmp5A4BpZtFs4iC0k3fJyPrWZ8jw/8sjo0QpRiaTY6c=";
 }
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index e8c238a24b115..0bfb9c6326aab 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
-    hash = "sha256-L8C1BeYG1eHc3h8iNitvAjfZ6Ef8m2r1OPmbyavR/Ms=";
+    hash = "sha256-pbI4bhsE34TRFJqenFvPxeRyammmnaZBuGxo15ln2uQ=";
   };
 
   buildInputs = [ xapian perl pcre2 zlib libmagic ];
diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix
index 58981027b3e8c..87f6669963fb2 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/pkgs/development/python-modules/xapian/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
-    hash = "sha256-BoMU/KP1RSRwFJLfQy+lTEhf1OOWE8os0nXhNpZOgak=";
+    hash = "sha256-VQhzVz7gQBGZ+DX+9R3ficp7wm97jRvcylnaZD+zyoE=";
   };
 
   configureFlags = [

From 551928bf932b60163957cd51c19836122c8d9eaa Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 21 Jul 2024 19:44:37 +0100
Subject: [PATCH 035/342] xapian: add (more) key reverse-dependencies to
 passthru.tests

---
 pkgs/development/libraries/xapian/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 9a27f1e1dd0cc..0862fcfe25f6b 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -7,6 +7,9 @@
 
 # tests
 , mu
+, perlPackages
+, python3
+, xapian-omega
 }:
 
 let
@@ -43,7 +46,9 @@ let
     '';
 
     passthru.tests = {
-      inherit mu;
+      inherit mu xapian-omega;
+      inherit (perlPackages) SearchXapian;
+      python-xapian = python3.pkgs.xapian;
     };
 
     meta = with lib; {

From 3cf28607c1403dc63479982796942b5023089e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sun, 21 Jul 2024 17:56:27 -0400
Subject: [PATCH 036/342] pipewire: remove superfluous args

---
 .../libraries/pipewire/default.nix            | 84 ++++++++-----------
 1 file changed, 36 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index c0540e4080fe9..bf8386d544031 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -5,7 +5,6 @@
 , meson
 , ninja
 , systemd
-, enableSystemd ? true
 , pkg-config
 , docutils
 , doxygen
@@ -15,7 +14,6 @@
 , alsa-lib
 , libjack2
 , libusb1
-, udev
 , libsndfile
 , vulkanSupport ? true
 , vulkan-headers
@@ -27,52 +25,35 @@
 , lilv
 , makeFontsConf
 , nixosTests
-, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind
 , valgrind
-, libcameraSupport ? true
 , libcamera
 , libdrm
-, gstreamerSupport ? true
 , gst_all_1
-, ffmpegSupport ? true
 , ffmpeg
-, bluezSupport ? true
 , bluez
 , sbc
 , libfreeaptx
 , liblc3
 , fdk_aac
 , libopus
-, ldacbtSupport ? bluezSupport && lib.meta.availableOn stdenv.hostPlatform ldacbt
 , ldacbt
-, nativeHspSupport ? true
-, nativeHfpSupport ? true
-, nativeModemManagerSupport ? true
 , modemmanager
-, ofonoSupport ? true
-, hsphfpdSupport ? true
-, pulseTunnelSupport ? true
 , libpulseaudio
 , zeroconfSupport ? true
 , avahi
 , raopSupport ? true
 , openssl
-, opusSupport ? true
 , rocSupport ? true
 , roc-toolkit
 , x11Support ? true
 , libcanberra
 , xorg
-, mysofaSupport ? true
 , libmysofa
 , ffadoSupport ? x11Support && lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform
 , ffado
 , libselinux
 }:
 
-# Bluetooth codec only makes sense if general bluetooth enabled
-assert ldacbtSupport -> bluezSupport;
-
 stdenv.mkDerivation(finalAttrs: {
   pname = "pipewire";
   version = "1.2.1";
@@ -115,35 +96,41 @@ stdenv.mkDerivation(finalAttrs: {
 
   buildInputs = [
     alsa-lib
+    bluez
     dbus
+    fdk_aac
+    ffmpeg
     glib
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    libcamera
     libjack2
+    libfreeaptx
+    liblc3
+    libmysofa
+    libopus
+    libpulseaudio
     libusb1
     libselinux
     libsndfile
     lilv
+    modemmanager
     ncurses
     readline
-  ] ++ (if enableSystemd then [ systemd ] else [ udev ])
+    sbc
+    systemd
+  ]
   ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ])
-  ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
-  ++ lib.optionals libcameraSupport [ libcamera ]
-  ++ lib.optional ffmpegSupport ffmpeg
-  ++ lib.optionals bluezSupport [ bluez libfreeaptx liblc3 sbc fdk_aac libopus ]
-  ++ lib.optional ldacbtSupport ldacbt
-  ++ lib.optional nativeModemManagerSupport modemmanager
-  ++ lib.optional opusSupport libopus
-  ++ lib.optional pulseTunnelSupport libpulseaudio
+  ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ldacbt) ldacbt
   ++ lib.optional zeroconfSupport avahi
   ++ lib.optional raopSupport openssl
   ++ lib.optional rocSupport roc-toolkit
   ++ lib.optionals vulkanSupport [ libdrm vulkan-headers vulkan-loader ]
   ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ]
-  ++ lib.optional mysofaSupport libmysofa
   ++ lib.optional ffadoSupport ffado;
 
   # Valgrind binary is required for running one optional test.
-  nativeCheckInputs = lib.optional withValgrind valgrind;
+  nativeCheckInputs =  lib.optional (lib.meta.availableOn stdenv.hostPlatform valgrind) valgrind;
 
   mesonFlags = [
     (lib.mesonEnable "docs" true)
@@ -151,28 +138,29 @@ stdenv.mkDerivation(finalAttrs: {
     (lib.mesonEnable "installed_tests" true)
     (lib.mesonOption "installed_test_prefix" (placeholder "installedTests"))
     (lib.mesonOption "libjack-path" "${placeholder "jack"}/lib")
-    (lib.mesonEnable "libcamera" libcameraSupport)
+    (lib.mesonEnable "libcamera" true)
     (lib.mesonEnable "libffado" ffadoSupport)
     (lib.mesonEnable "roc" rocSupport)
-    (lib.mesonEnable "libpulse" pulseTunnelSupport)
+    (lib.mesonEnable "libpulse" true)
     (lib.mesonEnable "avahi" zeroconfSupport)
-    (lib.mesonEnable "gstreamer" gstreamerSupport)
-    (lib.mesonEnable "systemd" enableSystemd)
-    (lib.mesonEnable "systemd-system-service" enableSystemd)
-    (lib.mesonEnable "udev" (!enableSystemd))
-    (lib.mesonEnable "ffmpeg" ffmpegSupport)
-    (lib.mesonEnable "pw-cat-ffmpeg" ffmpegSupport)
-    (lib.mesonEnable "bluez5" bluezSupport)
-    (lib.mesonEnable "bluez5-backend-hsp-native" nativeHspSupport)
-    (lib.mesonEnable "bluez5-backend-hfp-native" nativeHfpSupport)
-    (lib.mesonEnable "bluez5-backend-native-mm" nativeModemManagerSupport)
-    (lib.mesonEnable "bluez5-backend-ofono" ofonoSupport)
-    (lib.mesonEnable "bluez5-backend-hsphfpd" hsphfpdSupport)
+    (lib.mesonEnable "gstreamer" true)
+    (lib.mesonEnable "gstreamer-device-provider" true)
+    (lib.mesonEnable "systemd" true)
+    (lib.mesonEnable "systemd-system-service" true)
+    (lib.mesonEnable "udev" false)
+    (lib.mesonEnable "ffmpeg" true)
+    (lib.mesonEnable "pw-cat-ffmpeg" true)
+    (lib.mesonEnable "bluez5" true)
+    (lib.mesonEnable "bluez5-backend-hsp-native" true)
+    (lib.mesonEnable "bluez5-backend-hfp-native" true)
+    (lib.mesonEnable "bluez5-backend-native-mm" true)
+    (lib.mesonEnable "bluez5-backend-ofono" true)
+    (lib.mesonEnable "bluez5-backend-hsphfpd" true)
     # source code is not easily obtainable
     (lib.mesonEnable "bluez5-codec-lc3plus" false)
-    (lib.mesonEnable "bluez5-codec-lc3" bluezSupport)
-    (lib.mesonEnable "bluez5-codec-ldac" ldacbtSupport)
-    (lib.mesonEnable "opus" opusSupport)
+    (lib.mesonEnable "bluez5-codec-lc3" true)
+    (lib.mesonEnable "bluez5-codec-ldac" true)
+    (lib.mesonEnable "opus" true)
     (lib.mesonOption "sysconfdir" "/etc")
     (lib.mesonEnable "raop" raopSupport)
     (lib.mesonOption "session-managers" "")
@@ -180,7 +168,7 @@ stdenv.mkDerivation(finalAttrs: {
     (lib.mesonEnable "x11" x11Support)
     (lib.mesonEnable "x11-xfixes" x11Support)
     (lib.mesonEnable "libcanberra" x11Support)
-    (lib.mesonEnable "libmysofa" mysofaSupport)
+    (lib.mesonEnable "libmysofa" true)
     (lib.mesonEnable "sdl2" false) # required only to build examples, causes dependency loop
     (lib.mesonBool "rlimits-install" false) # installs to /etc, we won't use this anyway
     (lib.mesonEnable "compress-offload" true)

From 616637d813b260d397a4bac3fe7202a15e4f3607 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 22:12:52 -0700
Subject: [PATCH 037/342] source-highlight: update gnu config scripts

---
 pkgs/tools/text/source-highlight/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index d20b3692f31c3..07ed74f91c738 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchpatch, fetchurl, boost }:
+{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook }:
 
 stdenv.mkDerivation rec {
   pname = "source-highlight";
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
   '';
 
   strictDeps = true;
+  # necessary to build on FreeBSD native pending inclusion of
+  # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
+  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
   buildInputs = [ boost ];
 
   configureFlags = [

From 488168b7c1d3732831ef9cf03ab28095135fec81 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 22:21:18 -0700
Subject: [PATCH 038/342] mpfr: update gnu config scripts

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

diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index dec33a63d155e..2ba09fc226fda 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -3,6 +3,7 @@
 , fetchurl
 , gmp
 , writeScript
+, updateAutotoolsGnuConfigScriptsHook
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -25,6 +26,9 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "doc" "info" ];
 
   strictDeps = true;
+  # necessary to build on FreeBSD native pending inclusion of
+  # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
+  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
   # mpfr.h requires gmp.h
   propagatedBuildInputs = [ gmp ];
 

From df7a52b48a0c7bdad72f5c81a4b9c0d8442cbfe3 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 22:21:57 -0700
Subject: [PATCH 039/342] libipt: Add libstdthreads dependency on FreeBSD

This lib is part of the FreeBSD base system, but is not included in the
stdenv.
---
 pkgs/development/libraries/libipt/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix
index ed88ed8f28280..61ec0ce67d88e 100644
--- a/pkgs/development/libraries/libipt/default.nix
+++ b/pkgs/development/libraries/libipt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake, freebsd }:
 
 stdenv.mkDerivation rec {
   pname = "libipt";
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
+  buildInputs = lib.optional stdenv.isFreeBSD freebsd.libstdthreads;
 
   meta = with lib; {
     description = "Intel Processor Trace decoder library";

From beb34f1b960494e167c1674e31d0beddf51cd647 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 22:19:55 -0700
Subject: [PATCH 040/342] gdb: mark support for FreeBSD

---
 pkgs/development/tools/misc/gdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 21dafb9bbce74..7f97eebce157a 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
 
     # GDB upstream does not support ARM darwin
-    platforms = with platforms; linux ++ cygwin ++ ["x86_64-darwin"];
+    platforms = with platforms; linux ++ cygwin ++ freebsd ++ ["x86_64-darwin"];
     maintainers = with maintainers; [ pierron globin lsix ];
   };
 }

From c6c7efd88da1f6476ff01e5c8689b648e5939862 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 22 Jul 2024 19:38:47 +0200
Subject: [PATCH 041/342] libwacom: Load config from /etc

This will allow users to install custom quirks.
---
 pkgs/development/libraries/libwacom/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 22aab5c669447..0e9a0d54e178f 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dtests=${if doCheck then "enabled" else "disabled"}"
+    "--sysconfdir=/etc"
   ];
 
   nativeCheckInputs = [

From 2101706acf086f623a132cc288c3a02d444b8d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 02:05:14 -0700
Subject: [PATCH 042/342] python312Packages.pikepdf: 9.0.0 -> 9.1.0

Diff: https://github.com/pikepdf/pikepdf/compare/v9.0.0...v9.1.0

Changelog: https://github.com/pikepdf/pikepdf/blob/v9.1.0/docs/releasenotes/version9.rst
---
 pkgs/development/python-modules/pikepdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 14ae97ea96868..fc105cbe0aa78 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "9.0.0";
+  version = "9.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-dTEYI3dGu3Q/80lijp0ooApveSL1VWVHwLw7covnYYc=";
+    hash = "sha256-rcL4kwF8aBHy/sxZiQsQGvN3i1geiPFyrv8nRSXUZSA=";
   };
 
   patches = [

From 3f547bd512a485877a71f5a9b1f84377fb7629e6 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 23 Jul 2024 20:03:47 +0100
Subject: [PATCH 043/342] libopenmpt: 0.7.8 -> 0.7.9

Changes: https://lib.openmpt.org/libopenmpt/2024/07/21/security-updates-0.7.9-0.6.18-0.5.32-0.4.44/
---
 pkgs/development/libraries/audio/libopenmpt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix
index 8e32ae89502b8..a08b93a9b0e55 100644
--- a/pkgs/development/libraries/audio/libopenmpt/default.nix
+++ b/pkgs/development/libraries/audio/libopenmpt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libopenmpt";
-  version = "0.7.8";
+  version = "0.7.9";
 
   outputs = [ "out" "dev" "bin" ];
 
   src = fetchurl {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
-    hash = "sha256-h3eMgEaiJsbL+xFPTI4+J8Eht7PczOXLfeRYmSUCdMw=";
+    hash = "sha256-A4bpGNddeX551bFO3QhHFl2LNZ6YEe9XZSwKNWot/PQ=";
   };
 
   enableParallelBuilding = true;

From 0b29e62aa1af595290d59c9b046ee8158e4181e8 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 24 Jul 2024 00:07:06 +0200
Subject: [PATCH 044/342] Revert "wayland: don't propagate bin output"

This reverts commit 3f15de5959114a7b7b793b2fc9568b6605eb069d.

As commented in
https://github.com/NixOS/nixpkgs/pull/328804#issuecomment-2245593645,
this broke quite some builds, and some of the interactions between
wayland and its `.pc` file are still uncertain. Revert for now, and
re-roll this later.
---
 pkgs/development/libraries/wayland/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 6a057a9847dde..5a78a5c993ef0 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -55,9 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "bin" "dev" ] ++ lib.optionals withDocumentation [ "doc" "man" ];
   separateDebugInfo = true;
-  # We don't want `bin` to be propagated, as it'd propagate wayland-scanner, which breaks cross.
-  # See https://github.com/NixOS/nixpkgs/pull/328804
-  propagatedBuildOutputs = [ "out" "dev" ];
 
   mesonFlags = [
     "-Ddocumentation=${lib.boolToString withDocumentation}"

From e54753495c34c8fc6df4622fce91ec8370a40e06 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 31 May 2024 14:24:56 +0200
Subject: [PATCH 045/342] linux/common-config: restrict access to dmesg

`SECURITY_DMESG_RESTRICT` is enabled by default by a lot of
other distributions for a quite a while now, NixOS is a bit of an outlier.
The main justification to enable it is that kernel log might leak kernel
pointers which can then be used by exploits to defeat KASLR (NixOS also
enables `kernel.kptr_restrict` by default since 2013).
---
 nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++
 pkgs/os-specific/linux/kernel/common-config.nix   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 350498dfde187..330d76c8ed9cb 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -262,6 +262,9 @@
   The derivation now installs "impl" headers selectively instead of by a wildcard.
   Use `imgui.src` if you just want to access the unpacked sources.
 
+- Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an
+  unrestricted access to it can set `boot.kernel.sysctl."kernel.dmesg_restrict" = false`.
+
 - The `i18n.inputMethod` module introduces two new properties:
   `enable` and `type`, for declaring whether to enable an alternative input method and defining which input method respectfully. The options available in `type` are the same as the existing `enabled` option. `enabled` is now deprecated, and will be removed in a future release.
 
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index bbfb317d67ac8..6fbc10dcecf2e 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -702,6 +702,8 @@ let
       SECURITY_APPARMOR                = yes;
       DEFAULT_SECURITY_APPARMOR        = yes;
 
+      SECURITY_DMESG_RESTRICT          = yes;
+
       RANDOM_TRUST_CPU                 = whenOlder "6.2" yes; # allow RDRAND to seed the RNG
       RANDOM_TRUST_BOOTLOADER          = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG
 

From bf2d040432f7a98c67c124141928d748e3e721bd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Jul 2024 10:43:02 +0200
Subject: [PATCH 046/342] postgresql: 15 -> 16 for 24.11+

Upgrade default postgresql for stateVersion >=24.11.
This also rebuilds all packages linking against `libpq.so` to use
postgresql 16.

After re-reading https://www.postgresql.org/docs/16/release-16.html
I don't see any major risks about doing that.
---
 nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++
 nixos/modules/services/databases/postgresql.nix   | 3 ++-
 pkgs/top-level/all-packages.nix                   | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 350498dfde187..a3925937c3e4c 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -10,6 +10,8 @@
   This also allows configuring runtime settings of AMDVLK and enabling experimental features.
 - The `moonlight-qt` package ([Moonlight game streaming](https://moonlight-stream.org/)) now has HDR support on Linux systems.
 
+- PostgreSQL now defaults to major version 16.
+
 - `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/).
   This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version.
 
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 8a9d8c210b34d..55b3dd282ec47 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -483,7 +483,8 @@ in
 
     services.postgresql.package = let
         mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version.";
-        base = if versionAtLeast config.system.stateVersion "23.11" then pkgs.postgresql_15
+        base = if versionAtLeast config.system.stateVersion "24.11" then pkgs.postgresql_16
+            else if versionAtLeast config.system.stateVersion "23.11" then pkgs.postgresql_15
             else if versionAtLeast config.system.stateVersion "22.05" then pkgs.postgresql_14
             else if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13
             else if versionAtLeast config.system.stateVersion "20.03" then mkThrow "11"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5097136c3a8f0..737f8d6d82ec0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25942,20 +25942,20 @@ with pkgs;
     postgresql_15_jit
     postgresql_16_jit
   ;
-  postgresql = postgresql_15;
-  postgresql_jit = postgresql_15_jit;
+  postgresql = postgresql_16;
+  postgresql_jit = postgresql_16_jit;
   postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
   postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs;
   postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
   postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs;
   postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs;
-  postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs;
+  postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs;
   postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs;
   postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs;
   postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs;
   postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs;
   postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs;
-  postgresql15Packages = postgresqlPackages;
+  postgresql16Packages = postgresqlPackages;
 
   postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
 

From 89b8ad6898068a2c9b78a9936a0fd50833b4cc5a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 24 Jul 2024 13:17:21 +0200
Subject: [PATCH 047/342] curl: 8.8.0 -> 8.9.0

https://curl.se/ch/8.9.0.html
https://curl.se/docs/CVE-2024-6197.html
https://curl.se/docs/CVE-2024-6874.html

Fixes: CVE-2024-6197, CVE-2024-6874
---
 pkgs/tools/networking/curl/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 154156e89463f..bd593be2e1e57 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -49,22 +49,16 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "curl";
-  version = "8.8.0";
+  version = "8.9.0";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz"
       "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz"
     ];
-    hash = "sha256-D1i7lfwzDIpG7rPfVwGw2Qydm/zEK9HNCHkdElUdRAA=";
+    hash = "sha256-/wmyeRylbSX9XD86SSfc58ip3EGCIAxIfKiJ+6H91BI=";
   };
 
-  patches = lib.optionals (lib.versionOlder finalAttrs.version "8.7.2") [
-    # https://github.com/curl/curl/pull/13219
-    # https://github.com/newsboat/newsboat/issues/2728
-    ./8.7.1-compression-fix.patch
-  ];
-
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure
   postPatch = ''
@@ -213,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = with lib; {
-    changelog = "https://curl.se/changes.html#${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    changelog = "https://curl.se/ch/${finalAttrs.version}.html";
     description = "Command line tool for transferring files with URL syntax";
     homepage    = "https://curl.se/";
     license = licenses.curl;

From f951f5e29630c72464662b1fcb7fa432b26b1884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 24 Jul 2024 08:44:44 -0700
Subject: [PATCH 048/342] python312Packages.validators: 0.28.0 -> 0.33.0

Diff: https://github.com/python-validators/validators/compare/refs/tags/0.28.0...0.33.0

Changelog: https://github.com/python-validators/validators/blob/0.33.0/CHANGES.md
---
 .../development/python-modules/validators/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix
index 4a5e2f7df1cfe..1664916710d5b 100644
--- a/pkgs/development/python-modules/validators/default.nix
+++ b/pkgs/development/python-modules/validators/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  eth-hash,
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
@@ -9,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "validators";
-  version = "0.28.0";
+  version = "0.33.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,12 +19,16 @@ buildPythonPackage rec {
     owner = "python-validators";
     repo = "validators";
     rev = "refs/tags/${version}";
-    hash = "sha256-r3SQvt96y8e9odWxz0GjVKH3+Pa0Lqs+tbhryeGaZUU=";
+    hash = "sha256-eLujcm2MD1mPjROrBTg9TfU9wts16Jgb+ouNXFHsFZ0=";
   };
 
   build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  optional-dependencies = {
+    crypto-eth-addresses = [ eth-hash ] ++ eth-hash.optional-dependencies.pycryptodome;
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "validators" ];
 

From 8e14f63b37be18a0e7b7a533235de31b933bc0c8 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 24 Jul 2024 22:20:41 +0100
Subject: [PATCH 049/342] libxml2: 2.13.2 -> 2.13.3

Changes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.13.3
---
 .../development/libraries/libxml2/default.nix | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 60ac5e2ccbe9d..ebac536c4360e 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchurl
-, fetchpatch
 , pkg-config
 , autoreconfHook
 , libintl
@@ -24,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxml2";
-  version = "2.13.2";
+  version = "2.13.3";
 
   outputs = [ "bin" "dev" "out" "devdoc" ]
     ++ lib.optional pythonSupport "py"
@@ -33,28 +32,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz";
-    hash = "sha256-58j14LVUIVng3cQJwiyRZDBLWB6qmTBlOnb7hFsWkmM=";
+    hash = "sha256-CAXXwYDPCcqtcWZsekWKdPBBVhpTKQJFTaUEfYOUgTg=";
   };
 
-  patches = [
-    # Fix XInclude failing too aggresively.
-    # https://gitlab.gnome.org/GNOME/libxml2/-/issues/772
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/a0330b53c8034bb79220e403e8d4ad8c23ef088f.patch";
-      hash = "sha256-iVAgX8qNF0fw8GYUKsWduudjEuRMEOTAENAIFTjyRjU=";
-    })
-    # Fix error handling
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/ed8b4264f65b1ced1e3b13967dd1cf90102cfa40.patch";
-      hash = "sha256-EvxoUcr+VXBbYvK1PBV+KWcWTDk9rMWf+GXCYvXWDMI=";
-    })
-    # Fix more error handling
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/e30cb632e734394ddbd7bd62b57cee3586424352.patch";
-      hash = "sha256-C0ef17wTRC9rH0dKua/LJwwqTRI5W8sKWmvL7JxzT4o=";
-    })
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [

From 3c6127cf0129f8d82e5350ac4b0474db198b3636 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 23 Jul 2024 22:53:06 -0700
Subject: [PATCH 050/342] cc-wrapper: exclude clang flags when cpp

---
 pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
index 51bfeb18f58a1..ecbe3d477fa1a 100644
--- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
+++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
@@ -6,6 +6,6 @@ for p in "${params[@]}"; do
     esac
 done
 
-if $needsTarget; then
+if $needsTarget && [[ $0 != *cpp ]]; then
     extraBefore+=(-target @defaultTarget@ @machineFlags@)
 fi

From 54f2c3cd0d5ea3c8cde91ee78fb15dcabac6924d Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Wed, 24 Jul 2024 20:30:09 -0700
Subject: [PATCH 051/342] xorg.libX11: fix cpp usage under llvm

---
 pkgs/servers/x11/xorg/overrides.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f1e63de72bd5b..a319ff7650969 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -147,7 +147,8 @@ self: super:
   libX11 = super.libX11.overrideAttrs (attrs: {
     outputs = [ "out" "dev" "man" ];
     configureFlags = attrs.configureFlags or []
-      ++ malloc0ReturnsNullCrossFlag;
+      ++ malloc0ReturnsNullCrossFlag
+      ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp";
     depsBuildBuild = [
       buildPackages.stdenv.cc
     ] ++ lib.optionals stdenv.hostPlatform.isStatic [

From 6a163e2a36a27e0e52b098b43342bd8531c9ccd9 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Wed, 24 Jul 2024 22:48:56 -0700
Subject: [PATCH 052/342] rustc: fix building with llvm (#320432)

---
 pkgs/development/compilers/rust/1_79.nix  | 37 +++++++++++++++++++----
 pkgs/development/compilers/rust/rustc.nix | 29 ++++++++++++++----
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/rust/1_79.nix b/pkgs/development/compilers/rust/1_79.nix
index a749e58c16bc5..58577ae025f34 100644
--- a/pkgs/development/compilers/rust/1_79.nix
+++ b/pkgs/development/compilers/rust/1_79.nix
@@ -17,20 +17,45 @@
 , wrapRustcWith
 , llvmPackages_18, llvm_18
 } @ args:
-
+let
+  llvmSharedFor = pkgSet: pkgSet.llvmPackages_18.libllvm.override ({
+    enableSharedLibraries = true;
+  } // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
+    # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
+    stdenv = pkgSet.stdenv.override { allowedRequisites = null; cc = pkgSet.llvmPackages_18.clangUseLLVM; };
+  });
+in
 import ./default.nix {
   rustcVersion = "1.79.0";
   rustcSha256 = "sha256-Fy7PPH0fnZ+xbNKmKIaXgmcEFt7QEp5SSoZ1H5YUSMA=";
 
-  llvmSharedForBuild = pkgsBuildBuild.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
-  llvmSharedForHost = pkgsBuildHost.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
-  llvmSharedForTarget = pkgsBuildTarget.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
+  llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
+  llvmSharedForHost = llvmSharedFor pkgsBuildHost;
+  llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
 
   # For use at runtime
-  llvmShared = llvm_18.override { enableSharedLibraries = true; };
+  llvmShared = llvmSharedFor { inherit llvmPackages_18 stdenv; };
 
   # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
-  llvmPackages = llvmPackages_18;
+  llvmPackages = if (stdenv.targetPlatform.useLLVM or false) then (let
+    setStdenv = pkg: pkg.override {
+      stdenv = stdenv.override { allowedRequisites = null; cc = llvmPackages_18.clangUseLLVM; };
+    };
+  in rec {
+    libunwind = setStdenv llvmPackages_18.libunwind;
+    llvm = setStdenv llvmPackages_18.llvm;
+
+    libcxx = llvmPackages_18.libcxx.override {
+      stdenv = stdenv.override {
+        allowedRequisites = null;
+        cc = llvmPackages_18.clangNoLibcxx;
+        hostPlatform = stdenv.hostPlatform // {
+          useLLVM = !stdenv.isDarwin;
+        };
+      };
+      inherit libunwind;
+    };
+  }) else llvmPackages_18;
 
   # Note: the version MUST be one version prior to the version we're
   # building
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 487de452b01c3..ef7b92efc535e 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages
 , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
-, fetchurl, file, python3
+, runCommandLocal, fetchurl, file, python3
 , darwin, cargo, cmake, rustc, rustfmt
 , pkg-config, openssl, xz
 , libiconv
@@ -24,6 +24,7 @@
 let
   inherit (lib) optionals optional optionalString concatStringsSep;
   inherit (darwin.apple_sdk.frameworks) Security;
+  useLLVM = stdenv.targetPlatform.useLLVM or false;
 in stdenv.mkDerivation (finalAttrs: {
   pname = "${targetPackages.stdenv.cc.targetPrefix}rustc";
   inherit version;
@@ -66,14 +67,16 @@ in stdenv.mkDerivation (finalAttrs: {
        # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
        # This doesn't apply to cross-building for FreeBSD because the host
        # uses libstdc++, but the target (used for building std) uses libc++
-       optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) "--push-state --as-needed -lstdc++ --pop-state"
+      optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && !useLLVM)
+        "--push-state --as-needed -lstdc++ --pop-state"
+    ++ optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD && useLLVM)
+        "--push-state --as-needed -L${llvmPackages.libcxx}/lib -lc++ -lc++abi -lLLVM-${lib.versions.major llvmPackages.llvm.version} --pop-state"
     ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi"
     ++ optional stdenv.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib"
-    ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib");
+    ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost.lib}/lib");
 
   # Increase codegen units to introduce parallelism within the compiler.
   RUSTFLAGS = "-Ccodegen-units=10";
-
   RUSTDOCFLAGS = "-A rustdoc::broken-intra-doc-links";
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -152,7 +155,7 @@ in stdenv.mkDerivation (finalAttrs: {
     # Since fastCross only builds std, it doesn't make sense (and
     # doesn't work) to build a linker.
     "--disable-llvm-bitcode-linker"
-  ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [
+  ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox && !(stdenv.targetPlatform.useLLVM or false)) [
     "--enable-profiler" # build libprofiler_builtins
   ] ++ optionals stdenv.buildPlatform.isMusl [
     "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}"
@@ -165,6 +168,10 @@ in stdenv.mkDerivation (finalAttrs: {
   ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [
     # https://github.com/rust-lang/rust/issues/92173
     "--set rust.jemalloc"
+  ] ++ optionals useLLVM [
+    # https://github.com/NixOS/nixpkgs/issues/311930
+    "--llvm-libunwind=${if withBundledLLVM then "in-tree" else "system"}"
+    "--enable-use-libcxx"
   ];
 
   # if we already have a rust compiler for build just compile the target std
@@ -189,6 +196,7 @@ in stdenv.mkDerivation (finalAttrs: {
     python ./x.py --keep-stage=0 --stage=1 install library/std
     mkdir -v $out/bin $doc $man
     ln -s ${rustc.unwrapped}/bin/{rustc,rustdoc} $out/bin
+    rm -rf -v $out/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec}
     ln -s ${rustc.unwrapped}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/
     echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components
     lndir ${rustc.doc} $doc
@@ -248,7 +256,16 @@ in stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ openssl ]
     ++ optionals stdenv.isDarwin [ libiconv Security ]
-    ++ optional (!withBundledLLVM) llvmShared;
+    ++ optional (!withBundledLLVM) llvmShared.lib
+    ++ optional (useLLVM && !withBundledLLVM) [
+      llvmPackages.libunwind
+      # Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284
+      (runCommandLocal "libunwind-libgcc" {} ''
+        mkdir -p $out/lib
+        ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so
+        ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so.1
+      '')
+    ];
 
   outputs = [ "out" "man" "doc" ];
   setOutputFlags = false;

From be8112b3e2a7025b0e79c70fc13ad39c086f71cb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 25 Jul 2024 07:54:15 +0200
Subject: [PATCH 053/342] protobuf: 25.3 -> 25.4

Diff: https://github.com/protocolbuffers/protobuf/compare/v25.3...v25.4

Changelog:
https://github.com/protocolbuffers/protobuf/releases/tag/v25.4
---
 pkgs/development/libraries/protobuf/25.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix
index 782906d0b5b71..a5a6a3419b5f0 100644
--- a/pkgs/development/libraries/protobuf/25.nix
+++ b/pkgs/development/libraries/protobuf/25.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix ({
-  version = "25.3";
-  hash = "sha256-N/mO9a6NyC0GwxY3/u1fbFbkfH7NTkyuIti6L3bc+7k=";
+  version = "25.4";
+  hash = "sha256-dIouv6QaX6Tlahjrdz250DJkKjZ74/EwoQjTs3vBS/U=";
 } // args)

From b2d88d41e70c93a4cf8fbe8ab20834a854a7a58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 25 Jul 2024 15:20:38 -0600
Subject: [PATCH 054/342] vala: remove unconditional work around for clang 16
 function pointer errors

Hook accumulates the flag over sereval executions as observed in:

- https://github.com/NixOS/nixpkgs/issues/301592
- https://github.com/NixOS/nixpkgs/pull/252484#issuecomment-2089095268

Since this has been committed, gcc started emitting a warning on
`-Wno-incompatible-function-poniter-types` being an unrecognized flag
and additionally upstream vala added its own meassure to reduce these
new pointer errors to warnings in its generated sources.

https://gitlab.gnome.org/GNOME/vala/-/commit/23ec71b1a5c4cead3d1bdac82e184d0a63fa7b79

Which is part of the current release
branch (https://gitlab.gnome.org/GNOME/vala/-/commits/0.56?ref_type=heads)
and released on 0.56.15

```
Vala 0.56.15
============
 * Various improvements and bug fixes:
  - codegen:
...
    + Emit diagnostic pragmas for GCC 14, Clang 16 compatibility [#1408]
```

https://gitlab.gnome.org/GNOME/vala/-/merge_requests/369
---
 pkgs/development/compilers/vala/setup-hook.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/compilers/vala/setup-hook.sh b/pkgs/development/compilers/vala/setup-hook.sh
index 53976e5cd0db4..5e7bc352718fd 100644
--- a/pkgs/development/compilers/vala/setup-hook.sh
+++ b/pkgs/development/compilers/vala/setup-hook.sh
@@ -7,15 +7,6 @@ make_vala_find_vapi_files() {
 
 addEnvHooks "$targetOffset" make_vala_find_vapi_files
 
-disable_incompabile_pointer_conversion_warning() {
-    # Work around incompatible function pointer conversion errors with clang 16
-    # by setting ``-Wno-incompatible-function-pointer-types` in an env hook.
-    # See https://gitlab.gnome.org/GNOME/vala/-/issues/1413.
-    NIX_CFLAGS_COMPILE+=" -Wno-incompatible-function-pointer-types"
-}
-
-addEnvHooks "$hostOffset" disable_incompabile_pointer_conversion_warning
-
 _multioutMoveVapiDirs() {
   moveToOutput share/vala/vapi "${!outputDev}"
   moveToOutput share/vala-@apiVersion@/vapi "${!outputDev}"

From 9852a4bb24dd28b24d549a4c346026e182b2ebf9 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 3 Jul 2024 19:04:55 -0300
Subject: [PATCH 055/342] gdbm: migrate to by-name

---
 .../libraries/gdbm/default.nix => by-name/gd/gdbm/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/gdbm/default.nix => by-name/gd/gdbm/package.nix} (100%)

diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/by-name/gd/gdbm/package.nix
similarity index 100%
rename from pkgs/development/libraries/gdbm/default.nix
rename to pkgs/by-name/gd/gdbm/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cfae1d26550b..51c4df3b8c5ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20493,8 +20493,6 @@ with pkgs;
 
   gdome2 = callPackage ../development/libraries/gdome2 { };
 
-  gdbm = callPackage ../development/libraries/gdbm { };
-
   gecode_3 = callPackage ../development/libraries/gecode/3.nix { };
   gecode_6 = qt5.callPackage ../development/libraries/gecode { };
   gecode = gecode_6;

From 68b4bf305cd7ea614cb6d77f447613a7a5a0d192 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 3 Jul 2024 19:52:01 -0300
Subject: [PATCH 056/342] gdbm: rework

- finalAttrs
- get rid of ${pname}
- split outputs
- strictDeps
- testVersion
- get rid of nested with
---
 pkgs/by-name/gd/gdbm/package.nix | 110 ++++++++++++++++++-------------
 1 file changed, 64 insertions(+), 46 deletions(-)

diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix
index d6ed7d32e7016..fab0c3f9d1288 100644
--- a/pkgs/by-name/gd/gdbm/package.nix
+++ b/pkgs/by-name/gd/gdbm/package.nix
@@ -1,69 +1,87 @@
-{ stdenv, lib, fetchurl, updateAutotoolsGnuConfigScriptsHook }:
+{
+  lib,
+  fetchurl,
+  stdenv,
+  testers,
+  updateAutotoolsGnuConfigScriptsHook,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gdbm";
   version = "1.23";
 
   src = fetchurl {
-    url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz";
-    sha256 = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0=";
+    url = "mirror://gnu/gdbm/gdbm-${finalAttrs.version}.tar.gz";
+    hash = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0=";
   };
 
-  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
+  nativeBuildInputs = [
+    updateAutotoolsGnuConfigScriptsHook
+  ];
 
-  doCheck = true; # not cross;
+  configureFlags = [
+    (lib.enableFeature true "libgdbm-compat")
+  ];
 
-  # Linking static stubs on cygwin requires correct ordering.
-  # Consider upstreaming this.
+  outputs = [ "out" "dev" "info" "lib" "man" ];
 
-  # Disable dbmfetch03.at test because it depends on unlink()
-  # failing on a link in a chmod -w directory, which cygwin
-  # apparently allows.
-  postPatch = lib.optionalString stdenv.buildPlatform.isCygwin ''
-      substituteInPlace tests/Makefile.in --replace \
-        '_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la' \
-        '_LDADD = ../compat/libgdbm_compat.la ../src/libgdbm.la'
-      substituteInPlace tests/testsuite.at --replace \
-        'm4_include([dbmfetch03.at])' ""
-  '';
+  doCheck = true;
 
   enableParallelBuilding = true;
-  configureFlags = [ "--enable-libgdbm-compat" ];
+
+  # 1. Linking static stubs on cygwin requires correct ordering. Consider
+  #    upstreaming this.
+  #
+  # 2. Disable dbmfetch03.at test because it depends on unlink() failing on a
+  #    link in a chmod -w directory, which cygwin apparently allows.
+  postPatch = lib.optionalString stdenv.buildPlatform.isCygwin ''
+    substituteInPlace tests/Makefile.in \
+      --replace-fail '_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la' \
+                     '_LDADD = ../compat/libgdbm_compat.la ../src/libgdbm.la'
+    substituteInPlace tests/testsuite.at
+      --replace-fail 'm4_include([dbmfetch03.at])' ""
+  '';
 
   # create symlinks for compatibility
   postInstall = ''
-    install -dm755 $out/include/gdbm
-    (
-      cd $out/include/gdbm
-      ln -s ../gdbm.h gdbm.h
-      ln -s ../ndbm.h ndbm.h
-      ln -s ../dbm.h  dbm.h
-    )
+    install -dm755 ''${!outputDev}/include/gdbm
+    pushd ''${!outputDev}/include/gdbm
+    ln -s ../dbm.h dbm.h
+    ln -s ../gdbm.h gdbm.h
+    ln -s ../ndbm.h ndbm.h
+    popd
   '';
 
-  meta = with lib; {
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "gdbmtool --version";
+    };
+  };
+
+  meta = {
+    homepage = "https://www.gnu.org/software/gdbm/";
     description = "GNU dbm key/value database library";
     longDescription = ''
-       GNU dbm (or GDBM, for short) is a library of database functions that
-       use extensible hashing and work similar to the standard UNIX dbm.
-       These routines are provided to a programmer needing to create and
-       manipulate a hashed database.
+      GNU dbm (or GDBM, for short) is a library of database functions that use
+      extensible hashing and work similar to the standard UNIX dbm. These
+      routines are provided to a programmer needing to create and manipulate a
+      hashed database.
 
-       The basic use of GDBM is to store key/data pairs in a data file.
-       Each key must be unique and each key is paired with only one data
-       item.
+      The basic use of GDBM is to store key/data pairs in a data file. Each
+      key must be unique and each key is paired with only one data item.
 
-       The library provides primitives for storing key/data pairs,
-       searching and retrieving the data by its key and deleting a key
-       along with its data.  It also support sequential iteration over all
-       key/data pairs in a database.
+      The library provides primitives for storing key/data pairs, searching and
+      retrieving the data by its key and deleting a key along with its data.
+      It also support sequential iteration over all key/data pairs in a
+      database.
 
-       For compatibility with programs using old UNIX dbm function, the
-       package also provides traditional dbm and ndbm interfaces.
-      '';
-    homepage = "https://www.gnu.org/software/gdbm/";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = [ maintainers.vrthra ];
+      For compatibility with programs using old UNIX dbm function, the package
+      also provides traditional dbm and ndbm interfaces.
+    '';
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "gdbmtool";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.all;
   };
-}
+})

From bdbc71bf3907be2c2a70d53db974a7e562a60b82 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Thu, 25 Jul 2024 22:56:42 -0300
Subject: [PATCH 057/342] gdbm: nixfmt-rfc-style

---
 pkgs/by-name/gd/gdbm/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix
index fab0c3f9d1288..ad17365e7d959 100644
--- a/pkgs/by-name/gd/gdbm/package.nix
+++ b/pkgs/by-name/gd/gdbm/package.nix
@@ -15,15 +15,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0=";
   };
 
-  nativeBuildInputs = [
-    updateAutotoolsGnuConfigScriptsHook
-  ];
+  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
-  configureFlags = [
-    (lib.enableFeature true "libgdbm-compat")
-  ];
+  configureFlags = [ (lib.enableFeature true "libgdbm-compat") ];
 
-  outputs = [ "out" "dev" "info" "lib" "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "info"
+    "lib"
+    "man"
+  ];
 
   doCheck = true;
 

From 9cbf7192e110d6b7bb9eb2e46f5f49d79453c696 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 3 Jul 2024 20:13:43 -0300
Subject: [PATCH 058/342] gdbm: 1.23 -> 1.24

Why is this triggering infinite recursion wheh hashing is empty?
---
 pkgs/by-name/gd/gdbm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix
index ad17365e7d959..91271e71d1295 100644
--- a/pkgs/by-name/gd/gdbm/package.nix
+++ b/pkgs/by-name/gd/gdbm/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdbm";
-  version = "1.23";
+  version = "1.24";
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/gdbm-${finalAttrs.version}.tar.gz";
-    hash = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0=";
+    hash = "sha256-aV6YJ/33Y1E/EzkQvH5s/bkYeUOk/slD5XRJcj0rjb8=";
   };
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];

From 6149730abeadc8ec6d739d4da648d954ff11e4c1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 25 Jul 2024 13:07:25 +0300
Subject: [PATCH 059/342] kdePackages: fix build under real strictDeps

---
 pkgs/development/libraries/qt-6/modules/qtwayland.nix | 1 +
 pkgs/kde/frameworks/kcodecs/default.nix               | 3 +--
 pkgs/kde/frameworks/kdoctools/default.nix             | 3 ++-
 pkgs/kde/frameworks/ki18n/default.nix                 | 5 ++++-
 pkgs/kde/gear/akonadi-mime/default.nix                | 3 ++-
 pkgs/kde/gear/kdenlive/default.nix                    | 3 ++-
 pkgs/kde/gear/kdepim-runtime/default.nix              | 5 +++--
 pkgs/kde/gear/knotes/default.nix                      | 7 ++++++-
 pkgs/kde/gear/konversation/default.nix                | 4 +++-
 pkgs/kde/gear/mailcommon/default.nix                  | 2 ++
 pkgs/kde/gear/pimcommon/default.nix                   | 2 ++
 pkgs/kde/plasma/kscreenlocker/default.nix             | 2 ++
 pkgs/kde/plasma/libkscreen/default.nix                | 3 ++-
 13 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
index 512b084a0bf58..8d2fad7cf9da5 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@@ -10,6 +10,7 @@
 qtModule {
   pname = "qtwayland";
   propagatedBuildInputs = [ qtbase qtdeclarative ];
+  propagatedNativeBuildInputs = [ wayland ];
   buildInputs = [ wayland libdrm ];
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix
index 409666658ddf7..be91267120559 100644
--- a/pkgs/kde/frameworks/kcodecs/default.nix
+++ b/pkgs/kde/frameworks/kcodecs/default.nix
@@ -6,6 +6,5 @@
 mkKdeDerivation {
   pname = "kcodecs";
 
-  extraNativeBuildInputs = [qttools];
-  extraBuildInputs = [gperf];
+  extraNativeBuildInputs = [qttools gperf];
 }
diff --git a/pkgs/kde/frameworks/kdoctools/default.nix b/pkgs/kde/frameworks/kdoctools/default.nix
index 996e75c885389..2de9ed21d9c88 100644
--- a/pkgs/kde/frameworks/kdoctools/default.nix
+++ b/pkgs/kde/frameworks/kdoctools/default.nix
@@ -4,12 +4,13 @@
   docbook-xsl-nons,
   perl,
   perlPackages,
+  libxml2,
 }:
 mkKdeDerivation {
   pname = "kdoctools";
 
   # Perl could be used both at build time and at runtime.
-  extraNativeBuildInputs = [perl perlPackages.URI];
+  extraNativeBuildInputs = [perl perlPackages.URI libxml2];
   extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons];
   extraPropagatedBuildInputs = [perl perlPackages.URI];
 }
diff --git a/pkgs/kde/frameworks/ki18n/default.nix b/pkgs/kde/frameworks/ki18n/default.nix
index 02b03f875ffb4..9c3bef7852981 100644
--- a/pkgs/kde/frameworks/ki18n/default.nix
+++ b/pkgs/kde/frameworks/ki18n/default.nix
@@ -2,9 +2,12 @@
   mkKdeDerivation,
   qtdeclarative,
   python3,
+  gettext,
 }:
 mkKdeDerivation {
   pname = "ki18n";
 
-  extraBuildInputs = [qtdeclarative python3];
+  extraNativeBuildInputs = [python3];
+  propagatedNativeBuildInputs = [gettext];
+  extraBuildInputs = [qtdeclarative];
 }
diff --git a/pkgs/kde/gear/akonadi-mime/default.nix b/pkgs/kde/gear/akonadi-mime/default.nix
index 8796f72201342..9db5272e6b4b2 100644
--- a/pkgs/kde/gear/akonadi-mime/default.nix
+++ b/pkgs/kde/gear/akonadi-mime/default.nix
@@ -1,9 +1,10 @@
 {
   mkKdeDerivation,
   shared-mime-info,
+  libxslt,
 }:
 mkKdeDerivation {
   pname = "akonadi-mime";
 
-  extraNativeBuildInputs = [shared-mime-info];
+  extraNativeBuildInputs = [shared-mime-info libxslt];
 }
diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix
index 059ed9456f188..35ce1d590af75 100644
--- a/pkgs/kde/gear/kdenlive/default.nix
+++ b/pkgs/kde/gear/kdenlive/default.nix
@@ -26,6 +26,8 @@ mkKdeDerivation {
     )
   ];
 
+  extraNativeBuildInputs = [ shared-mime-info ];
+
   extraBuildInputs = [
     qtsvg
     qtmultimedia
@@ -34,7 +36,6 @@ mkKdeDerivation {
     qqc2-desktop-style
 
     mlt
-    shared-mime-info
     libv4l
     glaxnimate
   ];
diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix
index bbbe74e07fdbb..5937f43822e8b 100644
--- a/pkgs/kde/gear/kdepim-runtime/default.nix
+++ b/pkgs/kde/gear/kdepim-runtime/default.nix
@@ -6,12 +6,13 @@
   qtwebengine,
   cyrus_sasl,
   lib,
-  libkgapi
+  libkgapi,
+  libxslt,
 }:
 mkKdeDerivation {
   pname = "kdepim-runtime";
 
-  extraNativeBuildInputs = [shared-mime-info];
+  extraNativeBuildInputs = [shared-mime-info libxslt];
   # FIXME: libkolabxml, libetebase
   extraBuildInputs = [qtnetworkauth qtspeech qtwebengine cyrus_sasl];
 
diff --git a/pkgs/kde/gear/knotes/default.nix b/pkgs/kde/gear/knotes/default.nix
index bca10fcf13da9..913e7a8b85b4a 100644
--- a/pkgs/kde/gear/knotes/default.nix
+++ b/pkgs/kde/gear/knotes/default.nix
@@ -1,4 +1,9 @@
-{mkKdeDerivation}:
+{
+  mkKdeDerivation,
+  libxslt,
+}:
 mkKdeDerivation {
   pname = "knotes";
+
+  extraNativeBuildInputs = [libxslt];
 }
diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix
index 952b98fff6498..ba58215e3093e 100644
--- a/pkgs/kde/gear/konversation/default.nix
+++ b/pkgs/kde/gear/konversation/default.nix
@@ -7,6 +7,8 @@
 mkKdeDerivation {
   pname = "konversation";
 
-  extraBuildInputs = [qtmultimedia qt5compat qttools];
+  extraBuildInputs = [qt5compat];
+  extraNativeBuildInputs = [qtmultimedia qttools];
+
   meta.mainProgram = "konversation";
 }
diff --git a/pkgs/kde/gear/mailcommon/default.nix b/pkgs/kde/gear/mailcommon/default.nix
index 44b2b283896e1..a82e6adb266c5 100644
--- a/pkgs/kde/gear/mailcommon/default.nix
+++ b/pkgs/kde/gear/mailcommon/default.nix
@@ -2,9 +2,11 @@
   mkKdeDerivation,
   qtwebengine,
   qttools,
+  libxslt,
 }:
 mkKdeDerivation {
   pname = "mailcommon";
 
+  extraNativeBuildInputs = [libxslt];
   extraBuildInputs = [qtwebengine qttools];
 }
diff --git a/pkgs/kde/gear/pimcommon/default.nix b/pkgs/kde/gear/pimcommon/default.nix
index ddb467638c65a..9ef947dde6fed 100644
--- a/pkgs/kde/gear/pimcommon/default.nix
+++ b/pkgs/kde/gear/pimcommon/default.nix
@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
   qttools,
+  libxslt,
 }:
 mkKdeDerivation {
   pname = "pimcommon";
 
   extraBuildInputs = [qttools];
+  extraNativeBuildInputs = [libxslt];
 }
diff --git a/pkgs/kde/plasma/kscreenlocker/default.nix b/pkgs/kde/plasma/kscreenlocker/default.nix
index e7ee0a18b8e5f..f7321990f0c36 100644
--- a/pkgs/kde/plasma/kscreenlocker/default.nix
+++ b/pkgs/kde/plasma/kscreenlocker/default.nix
@@ -1,10 +1,12 @@
 {
   mkKdeDerivation,
   pam,
+  wayland,
   qqc2-breeze-style,
 }:
 mkKdeDerivation {
   pname = "kscreenlocker";
 
+  extraNativeBuildInputs = [wayland];
   extraBuildInputs = [pam qqc2-breeze-style];
 }
diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix
index 7f7e5d488d9fb..ccd11318e2be2 100644
--- a/pkgs/kde/plasma/libkscreen/default.nix
+++ b/pkgs/kde/plasma/libkscreen/default.nix
@@ -3,11 +3,12 @@
   qtwayland,
   qttools,
   jq,
+  wayland,
 }:
 mkKdeDerivation {
   pname = "libkscreen";
 
-  extraNativeBuildInputs = [qttools qtwayland jq];
+  extraNativeBuildInputs = [qttools qtwayland jq wayland];
   extraBuildInputs = [qtwayland];
   meta.mainProgram = "kscreen-doctor";
 }

From 64a8601822413526cbdaafea37eea21e4775e8a5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 26 Jul 2024 10:08:50 +0200
Subject: [PATCH 060/342] python312Packages.inflect: add missing dependency +
 cleaning

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
(cherry picked from commit c2f0f66a64c5fa14cbd12e3d08c525617348d583)
---
 .../python-modules/inflect/default.nix        | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index 36e0d96f97828..50d7deb1660bb 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -3,10 +3,17 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  more-itertools,
+
+  # build-system
+  setuptools,
   setuptools-scm,
-  pytestCheckHook,
+
+  # dependencies
+  more-itertools,
   typeguard,
+
+  # checks
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -23,7 +30,10 @@ buildPythonPackage rec {
     hash = "sha256-J0XgSKPzZIt/7WnMGARXpyYzagBGiqRiuNmNnGKDBrs=";
   };
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     more-itertools
@@ -39,11 +49,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "inflect" ];
 
-  meta = with lib; {
+  meta = {
     description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles";
     homepage = "https://github.com/jaraco/inflect";
     changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst";
-    license = licenses.mit;
-    maintainers = teams.tts.members;
+    license = lib.licenses.mit;
+    maintainers = lib.teams.tts.members;
   };
 }

From 8bee2ceda23703e976581190bae98465c65253b1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 23 Jul 2024 21:10:19 +0200
Subject: [PATCH 061/342] python3Packages.email-validator: 2.1.2 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix
index 735496b676457..78463781f75da 100644
--- a/pkgs/development/python-modules/email-validator/default.nix
+++ b/pkgs/development/python-modules/email-validator/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "email-validator";
-  version = "2.1.2";
+  version = "2.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -18,10 +18,10 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "email_validator";
     inherit version;
-    hash = "sha256-FMDz00PEvto3QAQhs5+kEbvjOnXfIIJd9zrVPgap8Ew=";
+    hash = "sha256-y2kPNExhenFPIuZq53FEWhzrRoIRUt+OFlxfmjZFgrc=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     dnspython
     idna
   ];

From 29c0170563e90b23f87e613d90dee37e31b8da0f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 23 Jul 2024 20:06:56 +0200
Subject: [PATCH 062/342] python3Packages.pydantic-core: 2.18.4 -> 2.20.1

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

diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix
index b0a84ed3fbdbe..48e8f7188bce9 100644
--- a/pkgs/development/python-modules/pydantic-core/default.nix
+++ b/pkgs/development/python-modules/pydantic-core/default.nix
@@ -18,14 +18,14 @@
 let
   pydantic-core = buildPythonPackage rec {
     pname = "pydantic-core";
-    version = "2.18.4";
+    version = "2.20.1";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "pydantic";
       repo = "pydantic-core";
       rev = "refs/tags/v${version}";
-      hash = "sha256-wt6HG2jQU09Zxhxhzb49HvNnxahfSk2xvNApVZkqqbw=";
+      hash = "sha256-iFyCFkFzvTL6es3L96pyq/s6SS7h1mn+bS0SPcsxXxA=";
     };
 
     patches = [ ./01-remove-benchmark-flags.patch ];
@@ -33,7 +33,7 @@ let
     cargoDeps = rustPlatform.fetchCargoTarball {
       inherit src;
       name = "${pname}-${version}";
-      hash = "sha256-m0xP4fIFgInkUeAy4HqfTKHEiqmWpYO8CgKzxg+WXiU=";
+      hash = "sha256-4v4g9/8ZsQUqkwA29/S/BXn2Ea4eSOnMhEbhDvsGuQU=";
     };
 
     nativeBuildInputs = [

From 14efd3de2c6d387cfad6ae7771fc98818ae24e77 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 23 Jul 2024 20:07:19 +0200
Subject: [PATCH 063/342] python3Packages.pydantic: 2.7.4 -> 2.8.2

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

diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index f47c028ac54c0..5d8895c9deaf0 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -25,11 +25,12 @@
   pytestCheckHook,
   pytest-mock,
   eval-type-backport,
+  rich,
 }:
 
 buildPythonPackage rec {
   pname = "pydantic";
-  version = "2.7.4";
+  version = "2.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +39,7 @@ buildPythonPackage rec {
     owner = "pydantic";
     repo = "pydantic";
     rev = "refs/tags/v${version}";
-    hash = "sha256-S4FZUnOsKC8J0xyTeXhMmCACCma+VfCSmrE6sYAnpok=";
+    hash = "sha256-9Tbm5Y1wSPa3lTdI8y95csYHua7nKUIYAfxSn+3J5zI=";
   };
 
   buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ];
@@ -54,7 +55,7 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     email = [ email-validator ];
   };
 
@@ -65,8 +66,9 @@ buildPythonPackage rec {
       faker
       pytest-mock
       pytestCheckHook
+      rich
     ]
-    ++ lib.flatten (lib.attrValues passthru.optional-dependencies)
+    ++ lib.flatten (lib.attrValues optional-dependencies)
     ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ];
 
   preCheck = ''

From 59c3e5ecf8513fa4c6b7c0b77620166bde061757 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 23 Jul 2024 20:25:56 +0200
Subject: [PATCH 064/342] python3Packages.pydantic-settings: 2.3.2 -> 2.3.4

---
 .../python-modules/pydantic-settings/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix
index 2d158699724a9..b3734a58e0720 100644
--- a/pkgs/development/python-modules/pydantic-settings/default.nix
+++ b/pkgs/development/python-modules/pydantic-settings/default.nix
@@ -14,7 +14,7 @@
 let
   self = buildPythonPackage rec {
     pname = "pydantic-settings";
-    version = "2.3.2";
+    version = "2.3.4";
     pyproject = true;
 
     disabled = pythonOlder "3.8";
@@ -23,12 +23,12 @@ let
       owner = "pydantic";
       repo = "pydantic-settings";
       rev = "refs/tags/v${version}";
-      hash = "sha256-1wnTAoF9xi1xLgSWl0FhtIddWPpHgDJPxJlsctJvFQo=";
+      hash = "sha256-tLF7LvsXryhbThaNl6koM0bGM8EOaA+aH2fGqzR8GKE=";
     };
 
-    nativeBuildInputs = [ hatchling ];
+    build-system = [ hatchling ];
 
-    propagatedBuildInputs = [
+    dependencies = [
       pydantic
       python-dotenv
     ];

From 0acf0b1b2bcfe3be0d736de8f5335cd218c3a4c3 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 23 Jul 2024 20:27:46 +0200
Subject: [PATCH 065/342] python3Packages.pydantic-extra-types: 2.8.2 -> 2.9.0

---
 .../pydantic-extra-types/default.nix           | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix
index 6a9cfaaeb29f5..9f60c56b59b06 100644
--- a/pkgs/development/python-modules/pydantic-extra-types/default.nix
+++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix
@@ -4,41 +4,47 @@
   fetchFromGitHub,
   hatchling,
   pydantic,
+  semver,
   pendulum,
   phonenumbers,
   pycountry,
   python-ulid,
+  pytz,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pydantic-extra-types";
-  version = "2.8.2";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-extra-types";
     rev = "refs/tags/v${version}";
-    hash = "sha256-YNr3eKwlPmLpYp0Z4WAOmWNMjta22ZZMuSlONkONxZU=";
+    hash = "sha256-PgytBSue3disJifnpTl1DGNMZkp93cJEIDm8wgKMHFo=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [ pydantic ];
+  dependencies = [
+    pydantic
+    semver
+  ];
 
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     all = [
       pendulum
       phonenumbers
       pycountry
       python-ulid
+      pytz
     ];
   };
 
   pythonImportsCheck = [ "pydantic_extra_types" ];
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all;
+  nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all;
 
   meta = with lib; {
     changelog = "https://github.com/pydantic/pydantic-extra-types/blob/${src.rev}/HISTORY.md";

From d131ecd6285146d8c99405505e5a685b97a1573c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 26 Jul 2024 09:34:11 +0300
Subject: [PATCH 066/342] libavif: propagate the newly-required dependencies

---
 pkgs/development/libraries/libavif/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index ec2c22a247c0e..8e7ebeb0a2519 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -48,11 +48,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gdk-pixbuf
-    libaom
     zlib
     libpng
     libjpeg
+  ];
+
+  propagatedBuildInputs = [
     dav1d
+    libaom
     libyuv
   ];
 

From 7a01a1bd6b382c7baef0e0a5526010dd02a57dfe Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 26 Jul 2024 19:22:59 +0300
Subject: [PATCH 067/342] Revert "kdePackages.kimageformats: explicitly add
 libavif dependencies"

This reverts commit c3943851a180f0036da85eb3631fdbfc32171914.

Proper fix in previous commit.
---
 pkgs/kde/frameworks/kimageformats/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix
index e15c863003a8b..21c84cb569927 100644
--- a/pkgs/kde/frameworks/kimageformats/default.nix
+++ b/pkgs/kde/frameworks/kimageformats/default.nix
@@ -4,9 +4,6 @@
   libheif,
   libjxl,
   libavif,
-  dav1d,
-  libaom,
-  libyuv,
   libraw,
   openexr_3,
 }:
@@ -15,5 +12,5 @@ mkKdeDerivation {
 
   extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"];
   extraNativeBuildInputs = [pkg-config];
-  extraBuildInputs = [libheif libjxl libavif dav1d libaom libyuv libraw openexr_3];
+  extraBuildInputs = [libheif libjxl libavif libraw openexr_3];
 }

From daa97965e10084840e428d6e1db258c2567aefa3 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Tue, 23 Jul 2024 18:51:24 -0400
Subject: [PATCH 068/342] Revert "haskell-builder.nix: work around
 useSystemCoreFoundationFramework hook"

This reverts commit e14e9647d7f929d9d63c4cb69bea39010a2d4d76.
---
 .../haskell-modules/generic-builder.nix       | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index f3439e19bdd41..6c60efe1bce50 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -150,35 +150,6 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false;
 
 let
 
-  # This is a workaround for the 2024-07-20 staging-next cycle to avoid causing mass rebuilds.
-  # todo(@reckenrode) Remove this workaround and remove `NIX_COREFOUNDATION_RPATH`, the related hooks, and ld-wrapper support.
-  nixCoreFoundationRpathWorkaround = stdenv.mkDerivation {
-    name = "nix-corefoundation-rpath-workaround";
-    buildCommand = ''
-      mkdir -p "$out/nix-support"
-      cat <<-EOF > "$out/nix-support/setup-hook"
-      removeUseSystemCoreFoundationFrameworkHook() {
-        unset NIX_COREFOUNDATION_RPATH
-        local _hook
-        for _hook in envBuildBuildHooks envBuildHostHooks envBuildTargetHooks envHostHostHooks envHostTargetHooks envTargetTargetHooks; do
-          local _index=0
-          local _var="\$_hook[@]"
-          for _var in "\''${!_var}"; do
-            if [ "\$_var" = "useSystemCoreFoundationFramework" ]; then
-              unset "\$_hook[\$_index]"
-            fi
-            ((++_index))
-          done
-          unset _index
-          unset _var
-        done
-        unset _hook
-      }
-      addEnvHooks "\$hostOffset" removeUseSystemCoreFoundationFrameworkHook
-      EOF
-    '';
-  };
-
   inherit (lib) optional optionals optionalString versionAtLeast
                        concatStringsSep enableFeature optionalAttrs;
 
@@ -459,8 +430,7 @@ stdenv.mkDerivation ({
   inherit depsBuildBuild nativeBuildInputs;
   buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs
     # For patchShebangsAuto in fixupPhase
-    ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ]
-    ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ nixCoreFoundationRpathWorkaround ];
+    ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ];
   propagatedBuildInputs = optionals isLibrary propagatedBuildInputs;
 
   LANG = "en_US.UTF-8";         # GHC needs the locale configured during the Haddock phase.

From e88f0cf2f292f1ff0d0b89eea2411939336fd01f Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 25 Jul 2024 19:16:07 -0400
Subject: [PATCH 069/342] Revert "ruby_3_3: work around
 useSystemCoreFoundationFramework"

This reverts commit b03ca962b01a28d1bf9a084372dad1528918dae7.
---
 pkgs/development/interpreters/ruby/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index c2a6604cf29d2..2a7115fd27df3 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -173,14 +173,6 @@ let
           export HOME=$TMPDIR
         '';
 
-        # Work around useSystemCoreFoundationFramework hook causing issues with the ld64 upgrade.
-        # This will be fixed on staging in https://github.com/NixOS/nixpkgs/pull/329529
-        preBuild =
-          if lib.versionAtLeast ver.majMin "3.3" && stdenv.isDarwin && stdenv.isx86_64 then
-            "unset NIX_COREFOUNDATION_RPATH"
-          else
-            null;
-
         # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
         # mostly TZ- and patch-related tests
         # TZ- failures are caused by nix sandboxing, I didn't investigate others

From 2c549528478664ab79c0819660bda95ade102826 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Tue, 23 Jul 2024 18:59:27 -0400
Subject: [PATCH 070/342] darwin.apple_sdk.frameworks: remove
 NIX_COREFOUNDATION_RPATH hook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Darwin no longer supports switching between CoreFoundation implementations as of https://github.com/NixOS/nixpkgs/pull/265102. The setup hook is vestigial and was mostly harmless until https://github.com/NixOS/nixpkgs/pull/329526 was necessitated to fix build failures on staging-next https://github.com/NixOS/nixpkgs/pull/328673.

The correct fix is to remove the hook. It’s not used by the 11.0 or 12.3 SDKs. This makes the 10.12 SDK a bit more like the other SDKs.
---
 .../bintools-wrapper/ld-wrapper.sh            |  6 ---
 pkgs/development/libraries/glibc/default.nix  |  3 --
 pkgs/os-specific/darwin/apple-sdk/default.nix | 11 -----
 .../darwin/apple-sdk/framework-setup-hook.sh  | 42 -------------------
 .../darwin/swift-corelibs/corefoundation.nix  |  1 -
 .../pure-corefoundation-hook.sh               |  7 ----
 6 files changed, 70 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
 delete mode 100644 pkgs/os-specific/darwin/swift-corelibs/pure-corefoundation-hook.sh

diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
index 3bd9c68f23366..7e00d02b03742 100644
--- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
@@ -226,12 +226,6 @@ if [[ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 && "$linkType" != static-pie ]]; t
 
 fi
 
-# This is outside the DONT_SET_RPATH branch because it's more targeted and we
-# usually want it (on Darwin) even if DONT_SET_RPATH is set.
-if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then
-  extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH)
-fi
-
 # Only add --build-id if this is a final link. FIXME: should build gcc
 # with --enable-linker-build-id instead?
 #
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 96a08178637df..b57312e63a2de 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -41,9 +41,6 @@ in
 
       # Apparently --bindir is not respected.
       makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
-    '' + lib.optionalString stdenv.buildPlatform.isDarwin ''
-      # ld-wrapper will otherwise attempt to inject CoreFoundation into ld-linux's RUNPATH
-      export NIX_COREFOUNDATION_RPATH=
     '';
 
     # The pie, stackprotector and fortify hardening flags are autodetected by
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 30081c8243784..1cd5afe193016 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -163,17 +163,6 @@ let
 
     propagatedBuildInputs = builtins.attrValues deps;
 
-    # don't use pure CF for dylibs that depend on frameworks
-    setupHook = ./framework-setup-hook.sh;
-
-    # Not going to be more specific than this for now
-    __propagatedImpureHostDeps = lib.optionals (name != "Kernel") [
-      # The setup-hook ensures that everyone uses the impure CoreFoundation who uses these SDK frameworks, so let's expose it
-      "/System/Library/Frameworks/CoreFoundation.framework"
-      "/System/Library/Frameworks/${name}.framework"
-      "/System/Library/Frameworks/${name}.framework/${name}"
-    ];
-
     meta = with lib; {
       description = "Apple SDK framework ${name}";
       maintainers = with maintainers; [ copumpkin ];
diff --git a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
deleted file mode 100644
index b0d5915fc1fcf..0000000000000
--- a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-# On macOS, frameworks are linked to the system CoreFoundation but
-# dynamic libraries built with nix use a pure version of CF this
-# causes segfaults for binaries that depend on it at runtime.  This
-# can be solved in two ways.
-# 1. Rewrite references to the pure CF using this setup hook, this
-# works for the simple case but this can still cause problems if other
-# dependencies (eg. python) use the pure CF.
-# 2. Create a wrapper for the binary that sets DYLD_FRAMEWORK_PATH to
-# /System/Library/Frameworks.  This will make everything load the
-# system's CoreFoundation framework while still keeping the
-# dependencies pure for other packages.
-
-fixupOutputHooks+=('fixDarwinFrameworksIn $prefix')
-
-fixDarwinFrameworks() {
-    local systemPrefix='/System/Library/Frameworks'
-
-    for fn in "$@"; do
-        if [ -L "$fn" ]; then continue; fi
-        echo "$fn: fixing dylib"
-
-        for framework in $(otool -L "$fn" | awk '/CoreFoundation\.framework/ {print $1}'); do
-          install_name_tool -change "$framework" "$systemPrefix/CoreFoundation.framework/Versions/A/CoreFoundation" "$fn" >&2
-        done
-    done
-}
-
-fixDarwinFrameworksIn() {
-    local dir="$1"
-    fixDarwinFrameworks $(find "$dir" -name "*.dylib")
-}
-
-
-# This configures the stdenv to use /System/Library/Frameworks/CoreFoundation.framework
-# instead of the nix version by including the system frameworks path
-# as an rpath entry when creating binaries.
-
-useSystemCoreFoundationFramework () {
-  export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks
-}
-
-addEnvHooks "$hostOffset" useSystemCoreFoundationFramework
diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
index 5c593b1488e29..0b7c85b588f20 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
+++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
@@ -86,6 +86,5 @@ stdenv.mkDerivation {
       "$out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
 
     mkdir -p "$out/nix-support"
-    substituteAll ${./pure-corefoundation-hook.sh} "$out/nix-support/setup-hook"
   '';
 }
diff --git a/pkgs/os-specific/darwin/swift-corelibs/pure-corefoundation-hook.sh b/pkgs/os-specific/darwin/swift-corelibs/pure-corefoundation-hook.sh
deleted file mode 100644
index d5539f50861a4..0000000000000
--- a/pkgs/os-specific/darwin/swift-corelibs/pure-corefoundation-hook.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-usePureCoreFoundation() {
-# Avoid overriding value set by the impure CF
-    if [ -z "${NIX_COREFOUNDATION_RPATH:-}" ]; then
-        export NIX_COREFOUNDATION_RPATH=@out@/Library/Frameworks
-    fi
-}
-addEnvHooks "$hostOffset" usePureCoreFoundation

From bc32f013360a79114bbfbe597be5894ab3e4a791 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Fri, 5 Apr 2024 09:07:28 -0400
Subject: [PATCH 071/342] meson: fix extraframework dependencies on
 case-sensitive APFS

---
 .../me/meson/007-case-sensitive-fs.patch      | 87 +++++++++++++++++++
 pkgs/by-name/me/meson/package.nix             |  4 +
 2 files changed, 91 insertions(+)
 create mode 100644 pkgs/by-name/me/meson/007-case-sensitive-fs.patch

diff --git a/pkgs/by-name/me/meson/007-case-sensitive-fs.patch b/pkgs/by-name/me/meson/007-case-sensitive-fs.patch
new file mode 100644
index 0000000000000..54d07d85585c2
--- /dev/null
+++ b/pkgs/by-name/me/meson/007-case-sensitive-fs.patch
@@ -0,0 +1,87 @@
+From a6fb2c165cda4bbf315424c96165ec9cc7052363 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Wed, 3 Apr 2024 17:35:56 -0400
+Subject: [PATCH] dependencies: find extraframeworks on case-sensitive
+ filesystems
+
+Fixes a test failure on case-sensitive filesystems when a CMake
+dependency is turned into an Apple framework.
+---
+ mesonbuild/dependencies/framework.py              | 9 +++++++--
+ test cases/osx/11 case sensitive apfs/meson.build | 5 +++++
+ test cases/osx/11 case sensitive apfs/prog.c      | 3 +++
+ test cases/osx/11 case sensitive apfs/test.json   | 5 +++++
+ 4 files changed, 20 insertions(+), 2 deletions(-)
+ create mode 100644 test cases/osx/11 case sensitive apfs/meson.build
+ create mode 100644 test cases/osx/11 case sensitive apfs/prog.c
+ create mode 100644 test cases/osx/11 case sensitive apfs/test.json
+
+diff --git a/mesonbuild/dependencies/framework.py b/mesonbuild/dependencies/framework.py
+index 3c880c7430af..1fbd628235ba 100644
+--- a/mesonbuild/dependencies/framework.py
++++ b/mesonbuild/dependencies/framework.py
+@@ -47,6 +47,7 @@ def detect(self, name: str, paths: T.List[str]) -> None:
+             framework_path = self._get_framework_path(p, name)
+             if framework_path is None:
+                 continue
++            framework_name = framework_path.stem
+             # We want to prefer the specified paths (in order) over the system
+             # paths since these are "extra" frameworks.
+             # For example, Python2's framework is in /System/Library/Frameworks and
+@@ -54,11 +55,15 @@ def detect(self, name: str, paths: T.List[str]) -> None:
+             # Python.framework. We need to know for sure that the framework was
+             # found in the path we expect.
+             allow_system = p in self.system_framework_paths
+-            args = self.clib_compiler.find_framework(name, self.env, [p], allow_system)
++            args = self.clib_compiler.find_framework(framework_name, self.env, [p], allow_system)
+             if args is None:
+                 continue
+             self.link_args = args
+             self.framework_path = framework_path.as_posix()
++            # The search is done case-insensitively, so the found name may differ
++            # from the one that was requested. Setting the name ensures the correct
++            # one is used when linking on case-sensitive filesystems.
++            self.name = framework_name
+             self.compile_args = ['-F' + self.framework_path]
+             # We need to also add -I includes to the framework because all
+             # cross-platform projects such as OpenGL, Python, Qt, GStreamer,
+@@ -74,7 +79,7 @@ def _get_framework_path(self, path: str, name: str) -> T.Optional[Path]:
+         p = Path(path)
+         lname = name.lower()
+         for d in p.glob('*.framework/'):
+-            if lname == d.name.rsplit('.', 1)[0].lower():
++            if lname == d.stem.lower():
+                 return d
+         return None
+ 
+diff --git a/test cases/osx/11 case sensitive apfs/meson.build b/test cases/osx/11 case sensitive apfs/meson.build
+new file mode 100644
+index 000000000000..dd566b185f28
+--- /dev/null
++++ b/test cases/osx/11 case sensitive apfs/meson.build	
+@@ -0,0 +1,5 @@
++project('case-sensitive APFS with extra frameworks test', 'c')
++
++dep = dependency('FoUnDaTiOn')
++
++exe = executable('prog', 'prog.c', install : true, dependencies: dep)
+diff --git a/test cases/osx/11 case sensitive apfs/prog.c b/test cases/osx/11 case sensitive apfs/prog.c
+new file mode 100644
+index 000000000000..9b6bdc2ec2f0
+--- /dev/null
++++ b/test cases/osx/11 case sensitive apfs/prog.c	
+@@ -0,0 +1,3 @@
++int main(void) {
++    return 0;
++}
+diff --git a/test cases/osx/11 case sensitive apfs/test.json b/test cases/osx/11 case sensitive apfs/test.json
+new file mode 100644
+index 000000000000..a883714eaa27
+--- /dev/null
++++ b/test cases/osx/11 case sensitive apfs/test.json	
+@@ -0,0 +1,5 @@
++{
++  "installed": [
++    {"type": "file", "file": "usr/bin/prog"}
++  ]
++}
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 6c1a9563bf43a..962c80489c664 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -83,6 +83,10 @@ python3.pkgs.buildPythonApplication rec {
       url = "https://github.com/mesonbuild/meson/pull/13411.patch";
       hash = "sha256-IHSV0Dfse0lzDtxh/+APc/dzGr/BUbR/WIOqDsm7/8Y=";
     })
+
+    # Fix extraframework lookup on case-sensitive APFS.
+    # https://github.com/mesonbuild/meson/pull/13038
+    ./007-case-sensitive-fs.patch
   ];
 
   buildInputs = lib.optionals (python3.pythonOlder "3.9") [

From 59a69abc4d96c7fe2741467455ec2e5bb2e8c3dd Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 25 Jul 2024 23:25:56 +0200
Subject: [PATCH 072/342] python312Packages.sure: drop nose dependency

fix
---
 pkgs/development/python-modules/sure/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index a0aff938ab03d..b07aeccb49f18 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -2,11 +2,10 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  nose,
+  pytestCheckHook,
   mock,
   six,
   isPyPy,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -23,7 +22,8 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.cfg \
-      --replace "rednose = 1" ""
+      --replace "rednose = 1" "" \
+      --replace-fail "--cov=sure" ""
   '';
 
   propagatedBuildInputs = [
@@ -31,9 +31,11 @@ buildPythonPackage rec {
     six
   ];
 
-  doCheck = pythonOlder "3.12"; # nose requires imp module
+  nativeCheckInputs = [ pytestCheckHook ];
 
-  nativeCheckInputs = [ nose ];
+  disabledTestPaths = [
+    "tests/test_old_api.py" # require nose
+  ];
 
   pythonImportsCheck = [ "sure" ];
 

From 9a5faca25fb60414bea972ed5c8ce95b500441f5 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 27 Jul 2024 02:04:34 +0200
Subject: [PATCH 073/342] python312Packages.sure: add sigmanificient to
 maintainers

---
 pkgs/development/python-modules/sure/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index b07aeccb49f18..c22d892705838 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://sure.readthedocs.io/";
     changelog = "https://github.com/gabrielfalcao/sure/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ sigmanificient ];
   };
 }

From 3b6f64bb88bd0ac8ce31b85068e5df19add2296a Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 27 Jul 2024 02:04:08 +0200
Subject: [PATCH 074/342] python312Packages.sure: migrate to pyproject

fix
---
 pkgs/development/python-modules/sure/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index c22d892705838..62c0a3e09ccd8 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   pytestCheckHook,
   mock,
   six,
@@ -11,7 +12,7 @@
 buildPythonPackage rec {
   pname = "sure";
   version = "2.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = isPyPy;
 
@@ -26,13 +27,14 @@ buildPythonPackage rec {
       --replace-fail "--cov=sure" ""
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+  dependencies = [ six ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
     mock
-    six
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
   disabledTestPaths = [
     "tests/test_old_api.py" # require nose
   ];

From ce10eed7c883529fd70d61f8c0c64984a9d22468 Mon Sep 17 00:00:00 2001
From: Florian Agbuya <fa@m-labs.ph>
Date: Fri, 26 Jul 2024 15:23:33 +0800
Subject: [PATCH 075/342] python3Packages.passlib: fix bcrypt version
 compatibility issue

---
 pkgs/development/python-modules/passlib/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 786cfc618d5b2..bce17807d8196 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -28,6 +28,13 @@ buildPythonPackage rec {
     totp = [ cryptography ];
   };
 
+  # Fix for https://foss.heptapod.net/python-libs/passlib/-/issues/190
+  postPatch = ''
+    substituteInPlace passlib/handlers/bcrypt.py \
+      --replace-fail "version = _bcrypt.__about__.__version__" \
+      "version = getattr(getattr(_bcrypt, '__about__', _bcrypt), '__version__', '<unknown>')"
+  '';
+
   nativeCheckInputs =
     [
       pytestCheckHook

From c62608da31e6cd2f52ac3885123a57d25e19aa2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jul 2024 12:47:03 +0000
Subject: [PATCH 076/342] libjodycode: 3.1 -> 3.1.1

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

diff --git a/pkgs/development/libraries/libjodycode/default.nix b/pkgs/development/libraries/libjodycode/default.nix
index 2a99ed5feca3c..4e5c272ba8d87 100644
--- a/pkgs/development/libraries/libjodycode/default.nix
+++ b/pkgs/development/libraries/libjodycode/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libjodycode";
-  version = "3.1";
+  version = "3.1.1";
 
   outputs = [ "out" "man" "dev" ];
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "jbruchon";
     repo = "libjodycode";
     rev = "v${version}";
-    hash = "sha256-uhWQh5YwLwYRm34nY5HvcEepqlTSDt9s3PSoD403kQM=";
+    hash = "sha256-sVEa2gNvgRJK1Ycmv4inbViTBPQFjzcZ8XHlAdsNzOk=";
   };
 
   env.PREFIX = placeholder "out";

From 00cb5c8fc429437faae24eea9d859850a6f9c3ce Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Sat, 27 Jul 2024 18:35:35 +0000
Subject: [PATCH 077/342] cmake: use addToSearchPath

---
 pkgs/by-name/cm/cmake/setup-hook.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index 29b72ddda4351..1a8c9b0f16739 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -151,22 +151,22 @@ makeCmakeFindLibs(){
   for flag in ${NIX_CFLAGS_COMPILE-} ${NIX_LDFLAGS-}; do
     if test -n "$isystem_seen" && test -d "$flag"; then
       isystem_seen=
-      export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH-}${CMAKE_INCLUDE_PATH:+:}${flag}"
+      addToSearchPath CMAKE_INCLUDE_PATH "${flag}"
     elif test -n "$iframework_seen" && test -d "$flag"; then
       iframework_seen=
-      export CMAKE_FRAMEWORK_PATH="${CMAKE_FRAMEWORK_PATH-}${CMAKE_FRAMEWORK_PATH:+:}${flag}"
+      addToSearchPath CMAKE_FRAMEWORK_PATH "${flag}"
     else
       isystem_seen=
       iframework_seen=
       case $flag in
         -I*)
-          export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH-}${CMAKE_INCLUDE_PATH:+:}${flag:2}"
+          addToSearchPath CMAKE_INCLUDE_PATH "${flag:2}"
           ;;
         -L*)
-          export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH-}${CMAKE_LIBRARY_PATH:+:}${flag:2}"
+          addToSearchPath CMAKE_LIBRARY_PATH "${flag:2}"
           ;;
         -F*)
-          export CMAKE_FRAMEWORK_PATH="${CMAKE_FRAMEWORK_PATH-}${CMAKE_FRAMEWORK_PATH:+:}${flag:2}"
+          addToSearchPath CMAKE_FRAMEWORK_PATH "${flag:2}"
           ;;
         -isystem)
           isystem_seen=1

From f9a7cf528b2369337b1c3f47bd2ecd56d34aa3be Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Sat, 27 Jul 2024 12:41:55 +0000
Subject: [PATCH 078/342] meson: add support for NIXPKGS_CMAKE_PREFIX_PATH

nixpkgs cmake uses NIXPKGS_CMAKE_PREFIX_PATH rather than
CMAKE_PREFIX_PATH env to specify module search paths. Add the env
variable to meson to allow finding modules via cmake to work.
---
 .../me/meson/000-nixpkgs-cmake-prefix-path.patch     | 12 ++++++++++++
 pkgs/by-name/me/meson/package.nix                    |  3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/by-name/me/meson/000-nixpkgs-cmake-prefix-path.patch

diff --git a/pkgs/by-name/me/meson/000-nixpkgs-cmake-prefix-path.patch b/pkgs/by-name/me/meson/000-nixpkgs-cmake-prefix-path.patch
new file mode 100644
index 0000000000000..c45106c4f9d17
--- /dev/null
+++ b/pkgs/by-name/me/meson/000-nixpkgs-cmake-prefix-path.patch
@@ -0,0 +1,12 @@
+diff --git a/mesonbuild/dependencies/data/CMakePathInfo.txt b/mesonbuild/dependencies/data/CMakePathInfo.txt
+index 662ec58..4d5f4e4 100644
+--- a/mesonbuild/dependencies/data/CMakePathInfo.txt
++++ b/mesonbuild/dependencies/data/CMakePathInfo.txt
+@@ -5,6 +5,7 @@ list(APPEND TMP_PATHS_LIST ${CMAKE_PREFIX_PATH})
+ list(APPEND TMP_PATHS_LIST ${CMAKE_FRAMEWORK_PATH})
+ list(APPEND TMP_PATHS_LIST ${CMAKE_APPBUNDLE_PATH})
+ list(APPEND TMP_PATHS_LIST $ENV{CMAKE_PREFIX_PATH})
++list(APPEND TMP_PATHS_LIST $ENV{NIXPKGS_CMAKE_PREFIX_PATH})
+ list(APPEND TMP_PATHS_LIST $ENV{CMAKE_FRAMEWORK_PATH})
+ list(APPEND TMP_PATHS_LIST $ENV{CMAKE_APPBUNDLE_PATH})
+ list(APPEND TMP_PATHS_LIST ${CMAKE_SYSTEM_PREFIX_PATH})
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 6c1a9563bf43a..820433b51978c 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -31,6 +31,9 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   patches = [
+    # Nixpkgs cmake uses NIXPKGS_CMAKE_PREFIX_PATH for the search path
+    ./000-nixpkgs-cmake-prefix-path.patch
+
     # In typical distributions, RPATH is only needed for internal libraries so
     # meson removes everything else. With Nix, the locations of libraries
     # are not as predictable, therefore we need to keep them in the RPATH.

From 8c9c8ade2f88a85ccdd4858cc802d7b7d6c48fe0 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Sat, 8 Jun 2024 07:41:56 +0000
Subject: [PATCH 079/342] cmake: fix strictDeps

patch cmake to implement a NIXPKGS_CMAKE_PREFIX_PATH env variable which
is similar to CMAKE_PREFIX_PATH except it is not searched for programs.

This is required because cmake will search CMAKE_PREFIX_PATH for
programs before PATH which is problematic as that means buildInputs gets
searched before nativeBuildInputs which can break things when the
binaries in PATH are covered or the order re-arranged.
---
 .../cmake/000-nixpkgs-cmake-prefix-path.diff  | 28 +++++++++++++++++++
 pkgs/by-name/cm/cmake/package.nix             |  3 ++
 pkgs/by-name/cm/cmake/setup-hook.sh           |  4 ++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff

diff --git a/pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff b/pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff
new file mode 100644
index 0000000000000..4ebdcced055c2
--- /dev/null
+++ b/pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff
@@ -0,0 +1,28 @@
+diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
+index 8840cdcb..c34b7ee9 100644
+--- a/Source/cmFindBase.cxx
++++ b/Source/cmFindBase.cxx
+@@ -280,6 +280,11 @@ void cmFindBase::FillCMakeEnvironmentPath()
+   // Add CMAKE_*_PATH environment variables
+   std::string var = cmStrCat("CMAKE_", this->CMakePathName, "_PATH");
+   paths.AddEnvPrefixPath("CMAKE_PREFIX_PATH");
++  if (this->CMakePathName != "PROGRAM") {
++    // Like CMAKE_PREFIX_PATH except when searching for programs. Programs need
++    // to be located via PATH
++    paths.AddEnvPrefixPath("NIXPKGS_CMAKE_PREFIX_PATH");
++  }
+   paths.AddEnvPath(var);
+ 
+   if (this->CMakePathName == "PROGRAM") {
+diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
+index 9b51b1ad..6acc676c 100644
+--- a/Source/cmFindPackageCommand.cxx
++++ b/Source/cmFindPackageCommand.cxx
+@@ -2039,6 +2039,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment()
+ 
+   // And now the general CMake environment variables
+   paths.AddEnvPath("CMAKE_PREFIX_PATH");
++  paths.AddEnvPath("NIXPKGS_CMAKE_PREFIX_PATH");
+   if (this->DebugMode) {
+     debugBuffer = cmStrCat(debugBuffer,
+                            "CMAKE_PREFIX_PATH env variable "
diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix
index c03c1055f7244..ca0f1789a1107 100644
--- a/pkgs/by-name/cm/cmake/package.nix
+++ b/pkgs/by-name/cm/cmake/package.nix
@@ -56,6 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
+    # Add NIXPKGS_CMAKE_PREFIX_PATH to cmake which is like CMAKE_PREFIX_PATH
+    # except it is not searched for programs
+    ./000-nixpkgs-cmake-prefix-path.diff
     # Don't search in non-Nix locations such as /usr, but do search in our libc.
     ./001-search-path.diff
     # Don't depend on frameworks.
diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index 1a8c9b0f16739..9ca4a6abeebc2 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -1,5 +1,7 @@
 addCMakeParams() {
-    addToSearchPath CMAKE_PREFIX_PATH $1
+    # NIXPKGS_CMAKE_PREFIX_PATH is like CMAKE_PREFIX_PATH except cmake
+    # will not search it for programs
+    addToSearchPath NIXPKGS_CMAKE_PREFIX_PATH $1
 }
 
 fixCmakeFiles() {

From 7b9761cb23db85024b08b60887cc3b39179705f1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 16 Jun 2024 21:09:26 +0100
Subject: [PATCH 080/342] lksctp-tools: 1.0.17 -> 1.0.19

Changes: https://github.com/sctp/lksctp-tools/blob/master/ChangeLog
---
 .../os-specific/linux/lksctp-tools/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix
index f6a91c663a05d..5ddf19c96e861 100644
--- a/pkgs/os-specific/linux/lksctp-tools/default.nix
+++ b/pkgs/os-specific/linux/lksctp-tools/default.nix
@@ -1,17 +1,23 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "lksctp-tools";
-  version = "1.0.17";
+  version = "1.0.19";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lksctp/lksctp-tools-${version}.tar.gz";
-    sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs";
+  src = fetchFromGitHub {
+    owner = "sctp";
+    repo = "lksctp-tools";
+    rev = "v${version}";
+    hash = "sha256-QEgk9OPFCI5WknUDkqfswApCFeOF+620frQWMyQq2Mk=";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "Linux Kernel Stream Control Transmission Protocol Tools";
-    homepage = "https://lksctp.sourceforge.net/";
+    homepage = "https://github.com/sctp/lksctp-tools/wiki";
     license = with licenses; [ gpl2Plus lgpl21 ]; # library is lgpl21
     platforms = platforms.linux;
   };

From 23de357949b5f9a3ac31aaa95b00a9b428108575 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 25 Jul 2024 01:22:09 +0200
Subject: [PATCH 081/342] nss: 3.101.1 -> 3.101.2

https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/DFuJA6A3nLQ
---
 pkgs/development/libraries/nss/esr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix
index 2473ee1dd4d81..f1b8c6df4acf1 100644
--- a/pkgs/development/libraries/nss/esr.nix
+++ b/pkgs/development/libraries/nss/esr.nix
@@ -1,4 +1,4 @@
 import ./generic.nix {
-  version = "3.101.1";
-  hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4=";
+  version = "3.101.2";
+  hash = "sha256-i5K47pzQYOiD4vFHBN6VeqXEdPBOM7U1oSK0qSi2M2Y=";
 }

From 65c81d4eaec6dc8acf7c5b84caf55fc029442f45 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 7 Jun 2024 07:46:36 -0700
Subject: [PATCH 082/342] zig: add cc wrapper

---
 .../compilers/zig/0.10/default.nix            |  3 ++
 .../compilers/zig/0.11/default.nix            |  3 ++
 .../compilers/zig/0.12/default.nix            |  3 ++
 .../development/compilers/zig/0.9/default.nix |  3 ++
 pkgs/development/compilers/zig/cc.nix         | 42 +++++++++++++++++++
 pkgs/development/compilers/zig/generic.nix    |  3 ++
 6 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/compilers/zig/cc.nix

diff --git a/pkgs/development/compilers/zig/0.10/default.nix b/pkgs/development/compilers/zig/0.10/default.nix
index 170edafa819cf..a889c3cde23bd 100644
--- a/pkgs/development/compilers/zig/0.10/default.nix
+++ b/pkgs/development/compilers/zig/0.10/default.nix
@@ -89,6 +89,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
+    cc = callPackage ../cc.nix {
+      zig = finalAttrs.finalPackage;
+    };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/0.11/default.nix b/pkgs/development/compilers/zig/0.11/default.nix
index 0f19f455cbb0f..c131adbe56b01 100644
--- a/pkgs/development/compilers/zig/0.11/default.nix
+++ b/pkgs/development/compilers/zig/0.11/default.nix
@@ -83,6 +83,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
+    cc = callPackage ../cc.nix {
+      zig = finalAttrs.finalPackage;
+    };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix
index 88bb0169dd8a6..93d7303ce3a8d 100644
--- a/pkgs/development/compilers/zig/0.12/default.nix
+++ b/pkgs/development/compilers/zig/0.12/default.nix
@@ -95,6 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
+    cc = callPackage ../cc.nix {
+      zig = finalAttrs.finalPackage;
+    };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/0.9/default.nix b/pkgs/development/compilers/zig/0.9/default.nix
index 079773f00e88c..07529476fb114 100644
--- a/pkgs/development/compilers/zig/0.9/default.nix
+++ b/pkgs/development/compilers/zig/0.9/default.nix
@@ -91,6 +91,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
+    cc = callPackage ../cc.nix {
+      zig = finalAttrs.finalPackage;
+    };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/cc.nix b/pkgs/development/compilers/zig/cc.nix
new file mode 100644
index 0000000000000..dc94e918814d6
--- /dev/null
+++ b/pkgs/development/compilers/zig/cc.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  wrapCCWith,
+  makeWrapper,
+  runCommand,
+  targetPlatform,
+  targetPackages,
+  zig,
+}:
+wrapCCWith {
+  cc =
+    runCommand "zig-cc-${zig.version}"
+      {
+        pname = "zig-cc";
+        inherit (zig) version meta;
+
+        nativeBuildInputs = [ makeWrapper ];
+
+        passthru.isZig = true;
+        inherit zig;
+      }
+      ''
+        mkdir -p $out/bin
+        for tool in ar cc c++ objcopy; do
+          makeWrapper "$zig/bin/zig" "$out/bin/$tool" \
+            --add-flags "$tool" \
+            --run "export ZIG_GLOBAL_CACHE_DIR=\$(mktemp -d)"
+        done
+
+        mv $out/bin/c++ $out/bin/clang++
+        mv $out/bin/cc $out/bin/clang
+      '';
+
+  nixSupport.cc-cflags =
+    [
+      "-target"
+      "${targetPlatform.parsed.cpu.name}-${targetPlatform.parsed.kernel.name}-${targetPlatform.parsed.abi.name}"
+    ]
+    ++ lib.optional (
+      targetPlatform.isLinux && !(targetPackages.isStatic or false)
+    ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}";
+}
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 3369f5d40c2c1..71b961fbc81d9 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -71,6 +71,9 @@ stdenv.mkDerivation (finalAttrs: {
     hook = callPackage ./hook.nix {
       zig = finalAttrs.finalPackage;
     };
+    cc = callPackage ./cc.nix {
+      zig = finalAttrs.finalPackage;
+    };
   };
 
   meta = {

From e9fb54b256fb4b63436a617345879953c885a4bd Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 7 Jun 2024 07:57:29 -0700
Subject: [PATCH 083/342] cc-wrapper: add zig

---
 pkgs/build-support/cc-wrapper/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix           | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d842f3fc70909..d206e2cca1a8f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -15,7 +15,8 @@
 , propagateDoc ? cc != null && cc ? man
 , extraTools ? [], extraPackages ? [], extraBuildCommands ? ""
 , nixSupport ? {}
-, isGNU ? false, isClang ? cc.isClang or false, isCcache ? cc.isCcache or false, gnugrep ? null
+, isGNU ? false, isClang ? cc.isClang or false, isZig ? cc.isZig or false, isCcache ? cc.isCcache or false
+, gnugrep ? null
 , expand-response-params
 , libcxx ? null
 
@@ -311,7 +312,7 @@ stdenvNoCC.mkDerivation {
     # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
     # unused middle-ground name that evokes both.
     inherit bintools;
-    inherit cc libc libcxx nativeTools nativeLibc nativePrefix isGNU isClang;
+    inherit cc libc libcxx nativeTools nativeLibc nativePrefix isGNU isClang isZig;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd307dc66c90e..a753831a9be72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16662,6 +16662,7 @@ with pkgs;
 
     isGNU = cc.isGNU or false;
     isClang = cc.isClang or false;
+    isZig = cc.isZig or false;
 
     inherit cc bintools libc libcxx extraPackages nixSupport zlib;
   } // extraArgs; in self);

From c472b840a3a637b09b0ade8287a987a6cbe49639 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 7 Jun 2024 07:58:39 -0700
Subject: [PATCH 084/342] pkgs/stdenv/cross: add zig

---
 pkgs/stdenv/cross/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 1cbbfeb6d2025..2b3ca5f03728f 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -75,6 +75,8 @@ in lib.init bootStages ++ [
                then buildPackages.llvmPackages.libcxxClang
              else if crossSystem.useLLVM or false
                then buildPackages.llvmPackages.clang
+             else if crossSystem.useZig or false
+               then buildPackages.zig.cc
              else buildPackages.gcc;
 
         extraNativeBuildInputs = old.extraNativeBuildInputs

From 945426bccc502f0b93956c0a41361d325dbf0712 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 7 Jun 2024 08:04:47 -0700
Subject: [PATCH 085/342] zig: add stdenv

---
 pkgs/development/compilers/zig/0.10/default.nix | 5 ++---
 pkgs/development/compilers/zig/0.11/default.nix | 5 ++---
 pkgs/development/compilers/zig/0.12/default.nix | 5 ++---
 pkgs/development/compilers/zig/0.13/default.nix | 2 ++
 pkgs/development/compilers/zig/0.9/default.nix  | 5 ++---
 pkgs/development/compilers/zig/generic.nix      | 3 +++
 pkgs/development/compilers/zig/stdenv.nix       | 6 ++++++
 pkgs/top-level/all-packages.nix                 | 2 ++
 8 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/compilers/zig/stdenv.nix

diff --git a/pkgs/development/compilers/zig/0.10/default.nix b/pkgs/development/compilers/zig/0.10/default.nix
index a889c3cde23bd..5c01521f08fd9 100644
--- a/pkgs/development/compilers/zig/0.10/default.nix
+++ b/pkgs/development/compilers/zig/0.10/default.nix
@@ -89,9 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
-    cc = callPackage ../cc.nix {
-      zig = finalAttrs.finalPackage;
-    };
+    cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
+    stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/0.11/default.nix b/pkgs/development/compilers/zig/0.11/default.nix
index c131adbe56b01..91e753dbf0fed 100644
--- a/pkgs/development/compilers/zig/0.11/default.nix
+++ b/pkgs/development/compilers/zig/0.11/default.nix
@@ -83,9 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
-    cc = callPackage ../cc.nix {
-      zig = finalAttrs.finalPackage;
-    };
+    cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
+    stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix
index 93d7303ce3a8d..1a730d4c0ce78 100644
--- a/pkgs/development/compilers/zig/0.12/default.nix
+++ b/pkgs/development/compilers/zig/0.12/default.nix
@@ -95,9 +95,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
-    cc = callPackage ../cc.nix {
-      zig = finalAttrs.finalPackage;
-    };
+    cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
+    stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/0.13/default.nix b/pkgs/development/compilers/zig/0.13/default.nix
index 0c72b459facf8..43093c822f027 100644
--- a/pkgs/development/compilers/zig/0.13/default.nix
+++ b/pkgs/development/compilers/zig/0.13/default.nix
@@ -95,6 +95,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
+    cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
+    stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/0.9/default.nix b/pkgs/development/compilers/zig/0.9/default.nix
index 07529476fb114..72e05c879a59a 100644
--- a/pkgs/development/compilers/zig/0.9/default.nix
+++ b/pkgs/development/compilers/zig/0.9/default.nix
@@ -91,9 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; };
-    cc = callPackage ../cc.nix {
-      zig = finalAttrs.finalPackage;
-    };
+    cc = callPackage ../cc.nix { zig = finalAttrs.finalPackage; };
+    stdenv = callPackage ../stdenv.nix { zig = finalAttrs.finalPackage; };
     tests = {
       version = testers.testVersion {
         package = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index 71b961fbc81d9..cde1a61e35833 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -74,6 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
     cc = callPackage ./cc.nix {
       zig = finalAttrs.finalPackage;
     };
+    stdenv = callPackage ./stdenv.nix {
+      zig = finalAttrs.finalPackage;
+    };
   };
 
   meta = {
diff --git a/pkgs/development/compilers/zig/stdenv.nix b/pkgs/development/compilers/zig/stdenv.nix
new file mode 100644
index 0000000000000..e8b29a7c8aba2
--- /dev/null
+++ b/pkgs/development/compilers/zig/stdenv.nix
@@ -0,0 +1,6 @@
+{
+  stdenv,
+  overrideCC,
+  zig,
+}:
+overrideCC stdenv zig.cc
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a753831a9be72..b8312ef42ccda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24696,6 +24696,8 @@ with pkgs;
   };
   zig = zig_0_13;
 
+  zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv;
+
   zimlib = callPackage ../development/libraries/zimlib { };
 
   zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };

From 2d4c9e69663fd844c7d7b944588c1bfd00ad0413 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 7 Jun 2024 07:58:58 -0700
Subject: [PATCH 086/342] pkgs/top-level/{release,stage}.nix: add zig package
 set

---
 pkgs/top-level/release.nix |  1 +
 pkgs/top-level/stage.nix   | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5800376c91534..4b559456d43e9 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -291,6 +291,7 @@ let
       agdaPackages = packagePlatforms pkgs.agdaPackages;
 
       pkgsLLVM.stdenv = [ "x86_64-linux" "aarch64-linux" ];
+      pkgsZig.stdenv = [ "x86_64-linux" "aarch64-linux" ];
       pkgsMusl.stdenv = [ "x86_64-linux" "aarch64-linux" ];
       pkgsStatic.stdenv = [ "x86_64-linux" "aarch64-linux" ];
 
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index b0c7ec03827b4..ea1719f7dfc14 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -203,6 +203,21 @@ let
       };
     };
 
+    pkgsZig = nixpkgsFun {
+      overlays = [
+        (self': super': {
+          pkgsZig = super';
+        })
+      ] ++ overlays;
+      # Bootstrap a cross stdenv using the Zig toolchain.
+      # This is currently not possible when compiling natively,
+      # so we don't need to check hostPlatform != buildPlatform.
+      crossSystem = stdenv.hostPlatform // {
+        useZig = true;
+        linker = "lld";
+      };
+    };
+
     # All packages built with the Musl libc. This will override the
     # default GNU libc on Linux systems. Non-Linux systems are not
     # supported. 32-bit is also not supported.

From f822fae2bea397be89ec825238cdde084a7ec35f Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 7 Jun 2024 08:29:44 -0700
Subject: [PATCH 087/342] meson: include patch for zig cc

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

diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 79ffae36a98fd..60f4375569d74 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -90,6 +90,14 @@ python3.pkgs.buildPythonApplication rec {
     # Fix extraframework lookup on case-sensitive APFS.
     # https://github.com/mesonbuild/meson/pull/13038
     ./007-case-sensitive-fs.patch
+
+    # Fix meson's detection for zig's linker
+    # https://github.com/mesonbuild/meson/pull/12293
+    (fetchpatch {
+      name = "linker-support-zig-cc.patch";
+      url = "https://github.com/mesonbuild/meson/pull/12293/commits/2baae244c995794d9addfe6ed924dfa72f01be82.patch";
+      hash = "sha256-dDOmSRBKl/gs7I3kmLXIyQk3zsOdlaYov72pPSel4+I=";
+    })
   ];
 
   buildInputs = lib.optionals (python3.pythonOlder "3.9") [

From 8045879c8876fc0dcf8219a93b8e6a6b21e71bb6 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 25 Jun 2024 19:52:15 -0700
Subject: [PATCH 088/342] sqlite: fix build issue with zig cc

---
 pkgs/development/libraries/sqlite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index f2de9320ce857..27b2e4c993fd9 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     fi
 
     # Necessary for FTS5 on Linux
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lm"
+    export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lm"
 
     echo ""
     echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"

From 9f589ea3a088fd2cdca91a14c0f59fb2331f972f Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 30 Jun 2024 19:01:07 -0700
Subject: [PATCH 089/342] arocc: init at 0-unstable-06-01

---
 pkgs/build-support/cc-wrapper/add-flags.sh   |  7 +++-
 pkgs/build-support/cc-wrapper/cc-wrapper.sh  |  5 +++
 pkgs/build-support/cc-wrapper/default.nix    | 29 ++++++++-----
 pkgs/development/compilers/arocc/default.nix | 44 ++++++++++++++++++++
 pkgs/development/compilers/arocc/package.nix | 33 +++++++++++++++
 pkgs/stdenv/cross/default.nix                |  2 +
 pkgs/top-level/all-packages.nix              |  6 +++
 pkgs/top-level/release.nix                   |  1 +
 pkgs/top-level/stage.nix                     | 15 +++++++
 9 files changed, 130 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/compilers/arocc/default.nix
 create mode 100644 pkgs/development/compilers/arocc/package.nix

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index c59118d6c09eb..3f2b0ccf0a6b0 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -27,8 +27,11 @@ for var in "${var_templates_bool[@]}"; do
     mangleVarBool "$var" ${role_suffixes[@]+"${role_suffixes[@]}"}
 done
 
-# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
-NIX_CFLAGS_COMPILE_@suffixSalt@="-B@out@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@"
+# Arocc does not support "-B"
+if [[ -z "@isArocc@" ]]; then
+    # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
+    NIX_CFLAGS_COMPILE_@suffixSalt@="-B@out@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@"
+fi
 
 # Export and assign separately in order that a failing $(..) will fail
 # the script.
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index b8d170df01b73..4cc661721f449 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -79,6 +79,11 @@ if [ "$nonFlagArgs" = 0 ]; then
     dontLink=1
 fi
 
+# Arocc does not link
+if [ "@isArocc@" = 1 ]; then
+    dontLink=1
+fi
+
 # Optionally filter out paths not refering to the store.
 if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then
     kept=()
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d206e2cca1a8f..542accd8fa11d 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -15,7 +15,8 @@
 , propagateDoc ? cc != null && cc ? man
 , extraTools ? [], extraPackages ? [], extraBuildCommands ? ""
 , nixSupport ? {}
-, isGNU ? false, isClang ? cc.isClang or false, isZig ? cc.isZig or false, isCcache ? cc.isCcache or false
+, isGNU ? false, isClang ? cc.isClang or false, isZig ? cc.isZig or false
+, isArocc ? cc.isArocc or false, isCcache ? cc.isCcache or false
 , gnugrep ? null
 , expand-response-params
 , libcxx ? null
@@ -305,6 +306,9 @@ stdenvNoCC.mkDerivation {
 
   outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];
 
+  # Cannot be in "passthru" due to "substituteAll"
+  inherit isArocc;
+
   passthru = {
     inherit targetPrefix suffixSalt;
     # "cc" is the generic name for a C compiler, but there is no one for package
@@ -392,6 +396,10 @@ stdenvNoCC.mkDerivation {
         ln -s ${targetPrefix}clang $out/bin/${targetPrefix}cc
         export named_cc=${targetPrefix}clang
         export named_cxx=${targetPrefix}clang++
+      elif [ -e $ccPath/arocc ]; then
+        wrap ${targetPrefix}arocc $wrapper $ccPath/arocc
+        ln -s ${targetPrefix}arocc $out/bin/${targetPrefix}cc
+        export named_cc=${targetPrefix}arocc
       fi
 
       if [ -e $ccPath/${targetPrefix}g++ ]; then
@@ -476,7 +484,7 @@ stdenvNoCC.mkDerivation {
     #
     # TODO(@Ericson2314): Remove this after stable release and force
     # everyone to refer to bintools-wrapper directly.
-    + ''
+    + optionalString (!isArocc) ''
       if [[ -f "$bintools/nix-support/dynamic-linker" ]]; then
         ln -s "$bintools/nix-support/dynamic-linker" "$out/nix-support"
       fi
@@ -492,7 +500,7 @@ stdenvNoCC.mkDerivation {
 
       echo "-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-cflags
     ''
-    + optionalString useGccForLibs ''
+    + optionalString (useGccForLibs && !isArocc) ''
       echo "-L${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-ldflags
       echo "-L${gccForLibs_solib}/lib" >> $out/nix-support/cc-ldflags
     ''
@@ -518,9 +526,9 @@ stdenvNoCC.mkDerivation {
     ''
     # this ensures that when clang passes -lgcc_s to lld (as it does
     # when building e.g. firefox), lld is able to find libgcc_s.so
-    + concatMapStrings (libgcc: ''
+    + optionals (!isArocc) (concatMapStrings (libgcc: ''
       echo "-L${libgcc}/lib" >> $out/nix-support/cc-ldflags
-    '') (toList (gccForLibs.libgcc or [])))
+    '') (toList (gccForLibs.libgcc or []))))
 
     ##
     ## General libc support
@@ -540,9 +548,10 @@ stdenvNoCC.mkDerivation {
     + optionalString (libc != null) (''
       touch "$out/nix-support/libc-cflags"
       touch "$out/nix-support/libc-ldflags"
+    '' + optionalString (!isArocc) ''
       echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags
     '' + optionalString (!(cc.langD or false)) ''
-      echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
+      echo "-${if isArocc then "I" else "idirafter"} ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
     '' + optionalString (isGNU && (!(cc.langD or false))) ''
       for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
         echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags
@@ -598,7 +607,7 @@ stdenvNoCC.mkDerivation {
     # ${cc_solib}/lib64 (even though it does actually search there...)..
     # This confuses libtool.  So add it to the compiler tool search
     # path explicitly.
-    + optionalString (!nativeTools) ''
+    + optionalString (!nativeTools && !isArocc) ''
       if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
         ccLDFlags+=" -L${cc_solib}/lib64"
         ccCFlags+=" -B${cc_solib}/lib64"
@@ -606,7 +615,7 @@ stdenvNoCC.mkDerivation {
       ccLDFlags+=" -L${cc_solib}/lib"
       ccCFlags+=" -B${cc_solib}/lib"
 
-    '' + optionalString cc.langAda or false ''
+    '' + optionalString (cc.langAda or false && !isArocc) ''
       touch "$out/nix-support/gnat-cflags"
       touch "$out/nix-support/gnat-ldflags"
       basePath=$(echo $cc/lib/*/*/*)
@@ -627,7 +636,7 @@ stdenvNoCC.mkDerivation {
     + optionalString propagateDoc ''
       ln -s ${cc.man} $man
       ln -s ${cc.info} $info
-    '' + optionalString (cc.langD or cc.langJava or false) ''
+    '' + optionalString (cc.langD or cc.langJava or false && !isArocc) ''
       echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
     ''
 
@@ -668,7 +677,7 @@ stdenvNoCC.mkDerivation {
       hardening_unsupported_flags+=" stackprotector"
     ''
 
-    + optionalString (libc != null && targetPlatform.isAvr) ''
+    + optionalString (libc != null && targetPlatform.isAvr && !isArocc) ''
       for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
         echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-crt1-cflags
       done
diff --git a/pkgs/development/compilers/arocc/default.nix b/pkgs/development/compilers/arocc/default.nix
new file mode 100644
index 0000000000000..6d73c2d3562d3
--- /dev/null
+++ b/pkgs/development/compilers/arocc/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  fetchFromGitHub,
+  callPackage,
+  zig_0_13,
+}:
+let
+  versions = [
+    {
+      zig = zig_0_13;
+      version = "0-unstable-06-01";
+      src = fetchFromGitHub {
+        owner = "Vexu";
+        repo = "arocc";
+        rev = "55cb6d1b682b83f75ad4f60e34c6fcd2336e8531";
+        hash = "sha256-xs3zNQIC5drrQYT4nxL7Q69xSEdbdMv5+3hQpsX3q5A=";
+      };
+    }
+  ];
+
+  mkPackage =
+    {
+      zig,
+      version,
+      src,
+    }:
+    callPackage ./package.nix { inherit zig version src; };
+
+  pkgsList = lib.map mkPackage versions;
+
+  pkgsAttrsUnwrapped = lib.listToAttrs (
+    lib.map (pkg: lib.nameValuePair "${pkg.version}-unwrapped" pkg) pkgsList
+  );
+  pkgsAttrsWrapped = lib.listToAttrs (
+    lib.map (pkg: lib.nameValuePair pkg.version pkg.wrapped) pkgsList
+  );
+
+  pkgsAttrs = pkgsAttrsWrapped // pkgsAttrsUnwrapped;
+in
+{
+  latest-unwrapped = lib.last pkgsList;
+  latest = (lib.last pkgsList).wrapped;
+}
+// pkgsAttrs
diff --git a/pkgs/development/compilers/arocc/package.nix b/pkgs/development/compilers/arocc/package.nix
new file mode 100644
index 0000000000000..edd3316fa6389
--- /dev/null
+++ b/pkgs/development/compilers/arocc/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenv,
+  wrapCCWith,
+  overrideCC,
+  zig,
+  version,
+  src,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "arocc";
+  inherit version src;
+
+  nativeBuildInputs = [ zig.hook ];
+
+  passthru = {
+    inherit zig;
+    isArocc = true;
+    wrapped = wrapCCWith { cc = finalAttrs.finalPackage; };
+    stdenv = overrideCC stdenv finalAttrs.passthru.wrapped;
+  };
+
+  meta = {
+    description = "C compiler written in Zig.";
+    homepage = "http://aro.vexu.eu/";
+    license = with lib.licenses; [
+      mit
+      unicode-30
+    ];
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    mainProgram = "arocc";
+  };
+})
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 2b3ca5f03728f..62ecc0261ca07 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -77,6 +77,8 @@ in lib.init bootStages ++ [
                then buildPackages.llvmPackages.clang
              else if crossSystem.useZig or false
                then buildPackages.zig.cc
+             else if crossSystem.useArocc or false
+               then buildPackages.arocc
              else buildPackages.gcc;
 
         extraNativeBuildInputs = old.extraNativeBuildInputs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8312ef42ccda..c391293372564 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16662,6 +16662,7 @@ with pkgs;
 
     isGNU = cc.isGNU or false;
     isClang = cc.isClang or false;
+    isArocc = cc.isArocc or false;
     isZig = cc.isZig or false;
 
     inherit cc bintools libc libcxx extraPackages nixSupport zlib;
@@ -24698,6 +24699,11 @@ with pkgs;
 
   zigStdenv = if stdenv.cc.isZig then stdenv else lowPrio zig.passthru.stdenv;
 
+  aroccPackages = recurseIntoAttrs (callPackage ../development/compilers/arocc {});
+  arocc = aroccPackages.latest;
+
+  aroccStdenv = if stdenv.cc.isArocc then stdenv else lowPrio arocc.cc.passthru.stdenv;
+
   zimlib = callPackage ../development/libraries/zimlib { };
 
   zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 4b559456d43e9..0f5974d83cb84 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -291,6 +291,7 @@ let
       agdaPackages = packagePlatforms pkgs.agdaPackages;
 
       pkgsLLVM.stdenv = [ "x86_64-linux" "aarch64-linux" ];
+      pkgsArocc.stdenv = [ "x86_64-linux" "aarch64-linux" ];
       pkgsZig.stdenv = [ "x86_64-linux" "aarch64-linux" ];
       pkgsMusl.stdenv = [ "x86_64-linux" "aarch64-linux" ];
       pkgsStatic.stdenv = [ "x86_64-linux" "aarch64-linux" ];
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index ea1719f7dfc14..3c1574f6f2ac3 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -203,6 +203,21 @@ let
       };
     };
 
+    pkgsArocc = nixpkgsFun {
+      overlays = [
+        (self': super': {
+          pkgsArocc = super';
+        })
+      ] ++ overlays;
+      # Bootstrap a cross stdenv using the Aro C compiler.
+      # This is currently not possible when compiling natively,
+      # so we don't need to check hostPlatform != buildPlatform.
+      crossSystem = stdenv.hostPlatform // {
+        useArocc = true;
+        linker = "lld";
+      };
+    };
+
     pkgsZig = nixpkgsFun {
       overlays = [
         (self': super': {

From 5ce990eb576e6539fee662b510adf93bd1cc22ee Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 13 Jul 2024 13:44:12 +0100
Subject: [PATCH 090/342] doc/stdenv: add section on shadowstack hardening flag

---
 doc/stdenv/stdenv.chapter.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index a2c69ba6bd14d..f219b9eb4185a 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -1538,6 +1538,16 @@ Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Execut
 Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option.
 If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`.
 
+#### `shadowstack` {#shadowstack}
+
+Adds the `-fcf-protection=return` compiler option. This enables the Shadow Stack feature supported by some newer processors, which maintains a user-inaccessible copy of the program's stack containing only return-addresses. When returning from a function, the processor compares the return-address value on the two stacks and throws an error if they do not match, considering it a sign of corruption and possible tampering. This should significantly increase the difficulty of ROP attacks.
+
+For the Shadow Stack to be enabled at runtime, all code linked into a process must be built with Shadow Stack enabled, so this is probably only useful to enable on a wide scale, so that all of a packages dependencies also have the feature enabled.
+
+This is currently only supported on some newer Intel and AMD processors as part of the Intel CET set of features. However, the generated code should continue to work on older processors which will simply omit any of this checking.
+
+This breaks some code that does advanced stack management or exception handling. If enabling this hardening flag it is important to test the result on a system that has known working and enabled CET support, so that any such breakage can be discovered.
+
 #### `trivialautovarinit` {#trivialautovarinit}
 
 Adds the `-ftrivial-auto-var-init=pattern` compiler option. This causes "trivially-initializable" uninitialized stack variables to be forcibly initialized with a nonzero value that is likely to cause a crash (and therefore be noticed). Uninitialized variables generally take on their values based on fragments of previous program state, and attackers can carefully manipulate that state to craft malicious initial values for these variables.

From a30f794865e77b6fc3a9a6474970173b18356b45 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 14 Jul 2024 12:54:44 +0100
Subject: [PATCH 091/342] pcre: expose enableJit argument, disable shadowstack
 when enabled

---
 pkgs/development/libraries/pcre/default.nix | 9 ++++++---
 pkgs/top-level/stage.nix                    | 5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 52a4ba32315ee..4ba68535c08d4 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,5 +1,7 @@
 { lib, stdenv, fetchurl, fetchpatch
 , pcre, windows ? null
+  # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
+, enableJit ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
 , variant ? null
 }:
 
@@ -18,11 +20,12 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "doc" "man" ];
 
-  # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
-  configureFlags = lib.optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [
+  hardeningDisable = lib.optional enableJit "shadowstack";
+
+  configureFlags = [
     "--enable-unicode-properties"
     "--disable-cpp"
-  ]
+  ] ++ lib.optional enableJit "--enable-jit=auto"
     ++ lib.optional (variant != null) "--enable-${variant}";
 
   patches = [
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index fbd7ea458ba9a..72b055c0ec82e 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -301,6 +301,11 @@ let
             enableCET = if self'.stdenv.hostPlatform.isx86_64 then "permissive" else false;
             enableCETRuntimeDefault = enableCET != false;
           };
+        } // lib.optionalAttrs (with super'.stdenv.hostPlatform; isx86_64 && isLinux) {
+          # causes shadowstack disablement
+          pcre = super'.pcre.override { enableJit = false; };
+          pcre-cpp = super'.pcre-cpp.override { enableJit = false; };
+          pcre16 = super'.pcre16.override { enableJit = false; };
         })
       ] ++ overlays;
     };

From 7a4736e1ef32baa85208cd08bf2a146f15659142 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 14 Jul 2024 21:26:50 +0100
Subject: [PATCH 092/342] llvm: disable shadowstack hardening flag

---
 pkgs/development/compilers/llvm/common/llvm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index a59c704ebbcb8..2043c9b7e9e2f 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation (rec {
 
   hardeningDisable = [
     "trivialautovarinit"
+    "shadowstack"
   ];
 
   nativeBuildInputs = [ cmake ]

From b84da125d0021cb350b486b254a1649093a17e71 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 17 Jul 2024 23:25:29 +0100
Subject: [PATCH 093/342] lix: disable shadowstack hardening flag

---
 pkgs/tools/package-management/lix/common.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix
index b01b381d14911..203ff91ba449f 100644
--- a/pkgs/tools/package-management/lix/common.nix
+++ b/pkgs/tools/package-management/lix/common.nix
@@ -245,8 +245,11 @@ stdenv.mkDerivation {
     meson test --no-rebuild "''${flagsArray[@]}"
     runHook postInstallCheck
   '';
-  # strictoverflow is disabled because we trap on signed overflow instead
-  hardeningDisable = [ "strictoverflow" ] ++ lib.optional stdenv.hostPlatform.isStatic "pie";
+  hardeningDisable = [
+    "shadowstack"
+    # strictoverflow is disabled because we trap on signed overflow instead
+    "strictoverflow"
+  ] ++ lib.optional stdenv.hostPlatform.isStatic "pie";
   # hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ];
   # hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "fortify";
   separateDebugInfo = stdenv.isLinux && !enableStatic;

From 0dacfda0af4dfcad051341e6e2dd47b3bbd4407b Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 20 Jul 2024 11:45:48 +0100
Subject: [PATCH 094/342] nix: disable shadowstack hardening flag

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

diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index e98371a1e757e..50874fef5c6cf 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -101,7 +101,9 @@ self = stdenv.mkDerivation {
 
   hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ];
 
-  hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "fortify";
+  hardeningDisable = [
+    "shadowstack"
+  ] ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
 
   nativeBuildInputs = [
     pkg-config

From 48bde3a18998965707d7243ff976095f964ba987 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 8 Jun 2024 15:58:54 +0100
Subject: [PATCH 095/342] cc-wrapper: add support for pacret hardening flag on
 aarch64

---
 nixos/doc/manual/release-notes/rl-2411.section.md        | 2 ++
 pkgs/build-support/cc-wrapper/add-hardening.sh           | 6 +++++-
 pkgs/development/compilers/gcc/default.nix               | 1 +
 pkgs/development/compilers/llvm/common/clang/default.nix | 5 +++++
 pkgs/stdenv/generic/make-derivation.nix                  | 1 +
 pkgs/stdenv/linux/bootstrap-tools/default.nix            | 1 +
 pkgs/top-level/stage.nix                                 | 1 +
 7 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index f50ac2e908e2a..3185137f971fd 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -265,6 +265,8 @@
 
 - The `stackclashprotection` hardening flag has been added, though disabled by default.
 
+- The `pacret` hardening flag has been added, though disabled by default.
+
 - `cargoSha256` in `rustPlatform.buildRustPackage` has been deprecated in favor
   of `cargoHash` which supports SRI hashes. See
   [buildRustPackage: Compiling Rust applications with Cargo](https://nixos.org/manual/nixpkgs/unstable/#compiling-rust-applications-with-cargo)
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index fc457ed0134aa..4440d99ccabaf 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -32,7 +32,7 @@ if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then
 fi
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
-  declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection pie pic strictoverflow format trivialautovarinit zerocallusedregs)
+  declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection pacret pie pic strictoverflow format trivialautovarinit zerocallusedregs)
   declare -A hardeningDisableMap=()
 
   # Determine which flags were effectively disabled so we can report below.
@@ -79,6 +79,10 @@ for flag in "${!hardeningEnableMap[@]}"; do
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling shadowstack >&2; fi
       hardeningCFlagsBefore+=('-fcf-protection=return')
       ;;
+    pacret)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pacret >&2; fi
+      hardeningCFlagsBefore+=('-mbranch-protection=pac-ret')
+      ;;
     stackprotector)
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
       hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 53d0bf1159f3a..fb9e97b15a9aa 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -437,6 +437,7 @@ pipe ((callFile ./common/builder.nix {}) ({
         && targetPlatform.isx86_64
         && targetPlatform.libc == "glibc"
       )) "shadowstack"
+      ++ optional (!(atLeast9 && targetPlatform.isLinux && targetPlatform.isAarch64)) "pacret"
       ++ optionals (langFortran) [ "fortify" "format" ];
   };
 
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 862c5cbb11782..659d29d1c5643 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -143,6 +143,11 @@ let
           || !targetPlatform.isLinux
           || !targetPlatform.isx86_64
         ) "shadowstack"
+        ++ lib.optional (
+          (lib.versionOlder release_version "8")
+          || !targetPlatform.isAarch64
+          || !targetPlatform.isLinux
+        ) "pacret"
         ++ lib.optional (
           (lib.versionOlder release_version "11")
           || (targetPlatform.isAarch64 && (lib.versionOlder release_version "18.1"))
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index bda0060900dd7..7da4f4ac8740b 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -116,6 +116,7 @@ let
     "fortify"
     "fortify3"
     "shadowstack"
+    "pacret"
     "pic"
     "pie"
     "relro"
diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix
index 3b69f7c531941..6064f76938346 100644
--- a/pkgs/stdenv/linux/bootstrap-tools/default.nix
+++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix
@@ -18,6 +18,7 @@ derivation ({
   hardeningUnsupportedFlags = [
     "fortify3"
     "shadowstack"
+    "pacret"
     "stackclashprotection"
     "trivialautovarinit"
     "zerocallusedregs"
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 363f5fd0de141..b19559dd7f1fb 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -323,6 +323,7 @@ let
           stdenv = super'.withDefaultHardeningFlags (
             super'.stdenv.cc.defaultHardeningFlags ++ [
               "shadowstack"
+              "pacret"
               "stackclashprotection"
               "trivialautovarinit"
             ]

From 745046d26650d11880d1a6612dab1d1a711487ad Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 3 Jul 2024 23:12:27 +0100
Subject: [PATCH 096/342] doc/stdenv: hardening flags: add section on pacret
 hardening flag

---
 doc/stdenv/stdenv.chapter.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index f219b9eb4185a..35330305f1891 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -1564,6 +1564,14 @@ sorry, unimplemented: __builtin_clear_padding not supported for variable length
 
 This flag adds the `-fstack-clash-protection` compiler option, which causes growth of a program's stack to access each successive page in order. This should force the guard page to be accessed and cause an attempt to "jump over" this guard page to crash.
 
+#### `pacret` {#pacret}
+
+This flag adds the `-mbranch-protection=pac-ret` compiler option on aarch64-linux targets. This uses ARM v8.3's Pointer Authentication feature to sign function return pointers before adding them to the stack. The pointer's authenticity is then validated before returning to its destination. This dramatically increases the difficulty of ROP exploitation techniques.
+
+This may cause problems with code that does advanced stack manipulation, and debugging/stack-unwinding tools need to be pac-ret aware to work correctly when these features are in operation.
+
+Pre-ARM v8.3 processors will ignore Pointer Authentication instructions, so code built with this flag will continue to work on older processors, though without any of the intended protections. If enabling this flag, it is recommended to ensure the resultant packages are tested against an ARM v8.3+ linux system with known-working Pointer Authentication support so that any breakage caused by this feature is actually detected.
+
 [^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation.
 [^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`.
 [^footnote-stdenv-propagated-dependencies]: Nix itself already takes a package’s transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like [setup hooks](#ssec-setup-hooks) also are run as if it were a propagated dependency.

From 97c400a0e8f9703f398d48218229bd5955c345f5 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nixpkgs@sourcephile.fr>
Date: Tue, 4 Jun 2024 16:35:49 +0200
Subject: [PATCH 097/342] cc-wrapper: fix -Bprefix to not confuse lib/libc++.so
 and bin/c++

Before this commit, `pkgs/build-support/cc-wrapper/add-flags.sh`
was using `-B@out@/bin` instead of `-B@bintools@/bin`
to force `cc` to use `ld-wrapper.sh` when calling `ld`.
That was confusing `cc` when asked to print
the location of a library precisely named `c++`
because `-B` prefixes are also used by `cc` to find libraries,
see https://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#index-B

Indeed, instead of having `cc --print-file-name c++`
failing to found a `c++` library and just returning the given `c++` string
to let a linker resolve it thereafter,
it was finding that `@out@/bin/c++` executable,
mistaking it for a library and returning its absolute path,
forcing the linker to load an executable as a library.

Before this commit:

```console
$ nix run -f . stdenv.cc -- --print-file-name c++
/nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/c++
```

After this commit:

```console
$ nix run -f . stdenv.cc -- --print-file-name c++
c++
```

Fixes https://gitlab.haskell.org/ghc/ghc/-/issues/23138#note_567034
where this behavior was breaking GHC on Darwin.

[Confirmed by @414owen](https://github.com/NixOS/nixpkgs/pull/317224#issuecomment-2171276177):

> This fixed all our haskell builds on Arm64 darwin, which were trying
> to link in clang++...
---
 pkgs/build-support/cc-wrapper/add-flags.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 3f2b0ccf0a6b0..2c3dc8884023b 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -29,8 +29,8 @@ done
 
 # Arocc does not support "-B"
 if [[ -z "@isArocc@" ]]; then
-    # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
-    NIX_CFLAGS_COMPILE_@suffixSalt@="-B@out@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@"
+    # `-B@bintools@/bin' forces cc to use ld-wrapper.sh when calling ld.
+    NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@"
 fi
 
 # Export and assign separately in order that a failing $(..) will fail

From 317929b849a8171ba6f85425afd96a074a15de29 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 28 Jul 2024 21:45:41 +0200
Subject: [PATCH 098/342] libjodycode: add jdupes as reverse dependency

---
 pkgs/development/libraries/libjodycode/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libjodycode/default.nix b/pkgs/development/libraries/libjodycode/default.nix
index 4e5c272ba8d87..656e0e3da7c2a 100644
--- a/pkgs/development/libraries/libjodycode/default.nix
+++ b/pkgs/development/libraries/libjodycode/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitea
+, jdupes
 }:
 
 stdenv.mkDerivation rec {
@@ -19,6 +20,10 @@ stdenv.mkDerivation rec {
 
   env.PREFIX = placeholder "out";
 
+  passthru.tests = {
+    inherit jdupes;
+  };
+
   meta = with lib; {
     description = "Shared code used by several utilities written by Jody Bruchon";
     homepage = "https://github.com/jbruchon/libjodycode";

From d8c8ee0c11f95a550a315cfecb449f2e028af812 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 28 Jul 2024 21:46:20 +0200
Subject: [PATCH 099/342] libjodycode: nixfmt

---
 .../development/libraries/libjodycode/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libjodycode/default.nix b/pkgs/development/libraries/libjodycode/default.nix
index 656e0e3da7c2a..b2ce994dc5b92 100644
--- a/pkgs/development/libraries/libjodycode/default.nix
+++ b/pkgs/development/libraries/libjodycode/default.nix
@@ -1,14 +1,19 @@
-{ lib
-, stdenv
-, fetchFromGitea
-, jdupes
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  jdupes,
 }:
 
 stdenv.mkDerivation rec {
   pname = "libjodycode";
   version = "3.1.1";
 
-  outputs = [ "out" "man" "dev" ];
+  outputs = [
+    "out"
+    "man"
+    "dev"
+  ];
 
   src = fetchFromGitea {
     domain = "codeberg.org";

From 193b98084a08ed2b8b55880f77f0525ed915e16e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 25 Jul 2024 20:28:46 -0400
Subject: [PATCH 100/342] ffmpeg-headless: enable additional encoders by
 default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds some extremely helpful and popular encoders in by default:
* openjpeg
* celt
* libwebp
* libaom

On the `master` branch, closure size for ffmpeg-headless went up 18.5 MiB.
```
$ nix store diff-closures nixpkgs#ffmpeg-headless^bin .#ffmpeg-headless^bin
celt: ∅ → 0.11.3, +168.4 KiB
ffmpeg-headless: +70.0 KiB
giflib: ∅ → 5.2.2, +398.7 KiB
lcms2: ∅ → 2.16, +466.2 KiB
lerc: ∅ → 4.0.0, +840.2 KiB
libaom: ∅ → 3.9.0, +8047.8 KiB
libdeflate: ∅ → 1.20, +427.0 KiB
libtiff: ∅ → 4.6.0, +655.9 KiB
libvmaf: ∅ → 3.0.0, +2665.0 KiB
libwebp: ∅ → 1.4.0, +2559.7 KiB
openjpeg: ∅ → 2.5.2, +1525.1 KiB
zstd: ∅ → 1.5.6, +1158.0 KiB

$ nvd diff $(nix build nixpkgs#ffmpeg-headless^bin --print-out-paths --no-link) $(nix build .#ffmpeg-headless^bin --print-out-paths --no-link)
<<< /nix/store/4n60lnj3zkjpasd4c56bzhpx2m8lc1sx-ffmpeg-headless-6.1.1-bin
>>> /nix/store/884f487w5hac6rs94jq6hq5zqkxdv666-ffmpeg-headless-6.1.1-bin
Added packages:
[A.]  #01  celt        0.11.3
[A.]  #02  giflib      5.2.2
[A.]  #03  lcms2       2.16
[A.]  #04  lerc        4.0.0
[A.]  #05  libaom      3.9.0
[A.]  #06  libdeflate  1.20
[A.]  #07  libtiff     4.6.0
[A.]  #08  libvmaf     3.0.0
[A.]  #09  libwebp     1.4.0 x2
[A.]  #10  openjpeg    2.5.2
[A.]  #11  zstd        1.5.6
Closure size: 66 -> 78 (15 paths added, 3 paths removed, delta +12, disk usage +18.5MiB).
```
---
 pkgs/development/libraries/ffmpeg/generic.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 32e9b9d895fd8..4f2be05fc5228 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -34,7 +34,7 @@
 
   # Feature flags
 , withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT
-, withAom ? withFullDeps # AV1 reference encoder
+, withAom ? withHeadlessDeps # AV1 reference encoder
 , withAppKit ? withHeadlessDeps && stdenv.isDarwin # Apple AppKit framework
 , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer
 , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering
@@ -45,7 +45,7 @@
 , withBs2b ? withFullDeps # bs2b DSP library
 , withBzlib ? withHeadlessDeps
 , withCaca ? withFullDeps # Textual display (ASCII art)
-, withCelt ? withFullDeps # CELT decoder
+, withCelt ? withHeadlessDeps # CELT decoder
 , withChromaprint ? withFullDeps # Audio fingerprinting
 , withCodec2 ? withFullDeps # codec2 en/decoding
 , withCoreImage ? withHeadlessDeps && stdenv.isDarwin # Apple CoreImage framework
@@ -88,7 +88,7 @@
 , withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder
 , withOpengl ? withFullDeps && !stdenv.isDarwin # OpenGL rendering
 , withOpenh264 ? withFullDeps # H.264/AVC encoder
-, withOpenjpeg ? withFullDeps # JPEG 2000 de/encoder
+, withOpenjpeg ? withHeadlessDeps # JPEG 2000 de/encoder
 , withOpenmpt ? withFullDeps # Tracked music files decoder
 , withOpus ? withHeadlessDeps # Opus de/encoder
 , withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library
@@ -121,7 +121,7 @@
 , withVpl ? false # Hardware acceleration via intel libvpl
 , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding
 , withVulkan ? withSmallDeps && !stdenv.isDarwin
-, withWebp ? withFullDeps # WebP encoder
+, withWebp ? withHeadlessDeps # WebP encoder
 , withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder
 , withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder
 , withXavs ? withFullDeps && withGPL # AVS encoder

From 7cb636da6721b6c99342e8a8a9017b39f50040f6 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 28 Jul 2024 18:52:23 -0700
Subject: [PATCH 101/342] rustc: wrap llvmPackages when using LLVM with
 callPackage

---
 pkgs/development/compilers/rust/1_79.nix | 178 +++++++++++++++--------
 1 file changed, 115 insertions(+), 63 deletions(-)

diff --git a/pkgs/development/compilers/rust/1_79.nix b/pkgs/development/compilers/rust/1_79.nix
index 58577ae025f34..71f4b0beffa72 100644
--- a/pkgs/development/compilers/rust/1_79.nix
+++ b/pkgs/development/compilers/rust/1_79.nix
@@ -9,77 +9,129 @@
 #    https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
 # 3. Firefox and Thunderbird should still build on x86_64-linux.
 
-{ stdenv, lib
-, newScope, callPackage
-, CoreFoundation, Security, SystemConfiguration
-, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget
-, makeRustPlatform
-, wrapRustcWith
-, llvmPackages_18, llvm_18
-} @ args:
+{
+  stdenv,
+  lib,
+  newScope,
+  callPackage,
+  CoreFoundation,
+  Security,
+  SystemConfiguration,
+  pkgsBuildTarget,
+  pkgsBuildBuild,
+  pkgsBuildHost,
+  pkgsTargetTarget,
+  makeRustPlatform,
+  wrapRustcWith,
+  llvmPackages_18,
+  llvm_18,
+  wrapCCWith,
+  overrideCC,
+}@args:
 let
-  llvmSharedFor = pkgSet: pkgSet.llvmPackages_18.libllvm.override ({
-    enableSharedLibraries = true;
-  } // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
-    # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
-    stdenv = pkgSet.stdenv.override { allowedRequisites = null; cc = pkgSet.llvmPackages_18.clangUseLLVM; };
-  });
+  llvmSharedFor =
+    pkgSet:
+    pkgSet.llvmPackages_18.libllvm.override (
+      {
+        enableSharedLibraries = true;
+      }
+      // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
+        # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
+        stdenv = pkgSet.stdenv.override {
+          allowedRequisites = null;
+          cc = pkgSet.llvmPackages_18.clangUseLLVM;
+        };
+      }
+    );
 in
-import ./default.nix {
-  rustcVersion = "1.79.0";
-  rustcSha256 = "sha256-Fy7PPH0fnZ+xbNKmKIaXgmcEFt7QEp5SSoZ1H5YUSMA=";
+import ./default.nix
+  {
+    rustcVersion = "1.79.0";
+    rustcSha256 = "sha256-Fy7PPH0fnZ+xbNKmKIaXgmcEFt7QEp5SSoZ1H5YUSMA=";
 
-  llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
-  llvmSharedForHost = llvmSharedFor pkgsBuildHost;
-  llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
+    llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
+    llvmSharedForHost = llvmSharedFor pkgsBuildHost;
+    llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
 
-  # For use at runtime
-  llvmShared = llvmSharedFor { inherit llvmPackages_18 stdenv; };
+    # For use at runtime
+    llvmShared = llvmSharedFor { inherit llvmPackages_18 stdenv; };
 
-  # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
-  llvmPackages = if (stdenv.targetPlatform.useLLVM or false) then (let
-    setStdenv = pkg: pkg.override {
-      stdenv = stdenv.override { allowedRequisites = null; cc = llvmPackages_18.clangUseLLVM; };
-    };
-  in rec {
-    libunwind = setStdenv llvmPackages_18.libunwind;
-    llvm = setStdenv llvmPackages_18.llvm;
+    # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
+    llvmPackages =
+      if (stdenv.targetPlatform.useLLVM or false) then
+        callPackage (
+          {
+            pkgs,
+            bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
+            bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
+          }:
+          let
+            llvmPackages = llvmPackages_18;
 
-    libcxx = llvmPackages_18.libcxx.override {
-      stdenv = stdenv.override {
-        allowedRequisites = null;
-        cc = llvmPackages_18.clangNoLibcxx;
-        hostPlatform = stdenv.hostPlatform // {
-          useLLVM = !stdenv.isDarwin;
-        };
-      };
-      inherit libunwind;
-    };
-  }) else llvmPackages_18;
+            setStdenv =
+              pkg:
+              pkg.override {
+                stdenv = stdenv.override {
+                  allowedRequisites = null;
+                  cc = llvmPackages.clangUseLLVM;
+                };
+              };
+          in
+          rec {
+            inherit (llvmPackages) bintools;
+
+            libunwind = setStdenv llvmPackages.libunwind;
+            llvm = setStdenv llvmPackages.llvm;
 
-  # Note: the version MUST be one version prior to the version we're
-  # building
-  bootstrapVersion = "1.78.0";
+            libcxx = llvmPackages.libcxx.override {
+              stdenv = stdenv.override {
+                allowedRequisites = null;
+                cc = llvmPackages.clangNoLibcxx;
+                hostPlatform = stdenv.hostPlatform // {
+                  useLLVM = !stdenv.isDarwin;
+                };
+              };
+              inherit libunwind;
+            };
 
-  # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
-  bootstrapHashes = {
-    i686-unknown-linux-gnu = "8f3f5d2ab7b609ab30d584cfb5cecc3d8b16d2620fffb7643383c8a0a3881e21";
-    x86_64-unknown-linux-gnu = "1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87";
-    x86_64-unknown-linux-musl = "c11ab908cbffbe98097d99ed62f5db00aa98496520b1e09583a151d36df7fca4";
-    arm-unknown-linux-gnueabihf = "2a2b1cf93b31e429624380e5b0d2bcce327274f8593b63657b863e38831f6421";
-    armv7-unknown-linux-gnueabihf = "fcce5ddb4f55bbdc9a1359a4cb6e65f2ff790d59ad228102cd472112ea65d3fe";
-    aarch64-unknown-linux-gnu = "131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af";
-    aarch64-unknown-linux-musl = "f328bcf109bf3eae01559b53939a9afbdb70ef30429f95109f7ea21030d60dfa";
-    x86_64-apple-darwin = "6c91ed3bd90253961fcb4a2991b8b22e042e2aaa9aba9f389f1e17008171d898";
-    aarch64-apple-darwin = "3be74c31ee8dc4f1d49e2f2888228de374138eaeca1876d0c1b1a61df6023b3b";
-    powerpc64le-unknown-linux-gnu = "c5aedb12c552daa18072e386697205fb7b91cef1e8791fe6fb74834723851388";
-    riscv64gc-unknown-linux-gnu = "847a925ace172d4c0a8d3da8d755b8678071ef73e659886128a3103bb896dcd9";
-    x86_64-unknown-freebsd = "b9cc84c60deb8da08a6c876426f8721758f4c7e7c553b4554385752ad37c63df";
-  };
+            clangUseLLVM = llvmPackages.clangUseLLVM.override { inherit libcxx; };
+
+            stdenv = overrideCC args.stdenv clangUseLLVM;
+          }
+        ) { }
+      else
+        llvmPackages_18;
+
+    # Note: the version MUST be one version prior to the version we're
+    # building
+    bootstrapVersion = "1.78.0";
+
+    # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
+    bootstrapHashes = {
+      i686-unknown-linux-gnu = "8f3f5d2ab7b609ab30d584cfb5cecc3d8b16d2620fffb7643383c8a0a3881e21";
+      x86_64-unknown-linux-gnu = "1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87";
+      x86_64-unknown-linux-musl = "c11ab908cbffbe98097d99ed62f5db00aa98496520b1e09583a151d36df7fca4";
+      arm-unknown-linux-gnueabihf = "2a2b1cf93b31e429624380e5b0d2bcce327274f8593b63657b863e38831f6421";
+      armv7-unknown-linux-gnueabihf = "fcce5ddb4f55bbdc9a1359a4cb6e65f2ff790d59ad228102cd472112ea65d3fe";
+      aarch64-unknown-linux-gnu = "131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af";
+      aarch64-unknown-linux-musl = "f328bcf109bf3eae01559b53939a9afbdb70ef30429f95109f7ea21030d60dfa";
+      x86_64-apple-darwin = "6c91ed3bd90253961fcb4a2991b8b22e042e2aaa9aba9f389f1e17008171d898";
+      aarch64-apple-darwin = "3be74c31ee8dc4f1d49e2f2888228de374138eaeca1876d0c1b1a61df6023b3b";
+      powerpc64le-unknown-linux-gnu = "c5aedb12c552daa18072e386697205fb7b91cef1e8791fe6fb74834723851388";
+      riscv64gc-unknown-linux-gnu = "847a925ace172d4c0a8d3da8d755b8678071ef73e659886128a3103bb896dcd9";
+      x86_64-unknown-freebsd = "b9cc84c60deb8da08a6c876426f8721758f4c7e7c553b4554385752ad37c63df";
+    };
 
-  selectRustPackage = pkgs: pkgs.rust_1_79;
+    selectRustPackage = pkgs: pkgs.rust_1_79;
 
-  rustcPatches = [ ];
-}
+    rustcPatches = [ ];
+  }
 
-(builtins.removeAttrs args [ "llvmPackages_18" "llvm_18"])
+  (
+    builtins.removeAttrs args [
+      "llvmPackages_18"
+      "llvm_18"
+      "wrapCCWith"
+      "overrideCC"
+    ]
+  )

From 332946ab2fc75123b65f7b0c5ec66a44da084462 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 29 Jul 2024 11:25:02 +0200
Subject: [PATCH 102/342] meson: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 60f4375569d74..4b11594720980 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -21,13 +21,13 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     rev = "refs/tags/${version}";
-    hash = "sha256-Y//8fXBNdx+ikpvg+S5Bk2rN3UVS5qo2bnbTSVBb8b8=";
+    hash = "sha256-BqsEO1a93a8d7/UH232buSPBt+WSNJbw1DGYA2nm9rs=";
   };
 
   patches = [
@@ -81,12 +81,6 @@ python3.pkgs.buildPythonApplication rec {
       hash = "sha256-XkwNQ5eg/fVekhsFg/V2/S2LbIVGz3H0wsSFlUT3ZZE=";
     })
 
-    (fetchpatch {
-      name = "cross.patch";
-      url = "https://github.com/mesonbuild/meson/pull/13411.patch";
-      hash = "sha256-IHSV0Dfse0lzDtxh/+APc/dzGr/BUbR/WIOqDsm7/8Y=";
-    })
-
     # Fix extraframework lookup on case-sensitive APFS.
     # https://github.com/mesonbuild/meson/pull/13038
     ./007-case-sensitive-fs.patch

From bd872b4a778d36c3f1fdd8dd123673c84b68fe36 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Mon, 29 Jul 2024 11:30:40 +0300
Subject: [PATCH 103/342] stdenv: fix unbound NIX_LOG_FD in `nix develop`

When running `nix develop` for a package, Nix records the stdenv
environment with NIX_LOG_FD set. That is, when the actual development
shell runs, it uses the functions that attempt to log to NIX_LOG_FD, but
this variable is not actually set.

As a workaround, check whether NIX_LOG_FD is set at runtime.

Example (before this change):
```console
$ nix develop --file . bash
$ echo "${NIX_LOG_FD-unset}"
unset
$ runPhase unpackPhase
bash: "$NIX_LOG_FD": Bad file descriptor
Running phase: unpackPhase
unpacking source archive /nix/store/v28dv6l0qk3j382kp40bksa1v6h7dx9p-bash-5.2.tar.gz
bash: "$NIX_LOG_FD": Bad file descriptor
source root is bash-5.2
bash: "$NIX_LOG_FD": Bad file descriptor
setting SOURCE_DATE_EPOCH to timestamp 1663942708 of file bash-5.2/y.tab.h
```

After this change:
```console
$ nix develop --file . bash
$ runPhase unpackPhase
Running phase: unpackPhase
unpacking source archive /nix/store/v28dv6l0qk3j382kp40bksa1v6h7dx9p-bash-5.2.tar.gz
source root is bash-5.2
setting SOURCE_DATE_EPOCH to timestamp 1663942708 of file bash-5.2/y.tab.h
```
---
 pkgs/stdenv/generic/setup.sh | 102 +++++++++++++++++------------------
 1 file changed, 48 insertions(+), 54 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 40bf6554183c6..c1de5b97d2d6a 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -47,63 +47,57 @@ getAllOutputNames() {
     fi
 }
 
-if [[ -n "${NIX_LOG_FD:-}" ]]; then
-    # Logs arguments to $NIX_LOG_FD, if it exists, no-op if it does not.
-    nixLog() {
-        echo "$@" >&"$NIX_LOG_FD"
-    }
+# Logs arguments to $NIX_LOG_FD, if it exists, no-op if it does not.
+nixLog() {
+    if [[ -z ${NIX_LOG_FD-} ]]; then
+        return
+    fi
+    echo "$@" >&"$NIX_LOG_FD"
+}
 
-    # Log a hook, to be run before the hook is actually called.
-    # logging for "implicit" hooks -- the ones specified directly
-    # in derivation's arguments -- is done in _callImplicitHook instead.
-    _logHook() {
-        local hookKind="$1"
-        local hookExpr="$2"
-        shift 2
-
-        if declare -F "$hookExpr" > /dev/null 2>&1; then
-            nixLog "calling '$hookKind' function hook '$hookExpr'" "$@"
-        elif type -p "$hookExpr" > /dev/null; then
-            nixLog "sourcing '$hookKind' script hook '$hookExpr'"
-        elif [[ "$hookExpr" != "_callImplicitHook"* ]]; then
-            # Here we have a string hook to eval.
-            # Join lines onto one with literal \n characters unless NIX_DEBUG >= 2.
-            local exprToOutput
-            if (( "${NIX_DEBUG:-0}" >= 2 )); then
-                exprToOutput="$hookExpr"
-            else
-                # We have `r'\n'.join([line.lstrip() for lines in text.split('\n')])` at home.
-                local hookExprLine
-                while IFS= read -r hookExprLine; do
-                    # These lines often have indentation,
-                    # so let's remove leading whitespace.
-                    hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}"
-                    # If this line wasn't entirely whitespace,
-                    # then add it to our output
-                    if [[ -n "$hookExprLine" ]]; then
-                        exprToOutput+="$hookExprLine\\n "
-                    fi
-                done <<< "$hookExpr"
+# Log a hook, to be run before the hook is actually called.
+# logging for "implicit" hooks -- the ones specified directly
+# in derivation's arguments -- is done in _callImplicitHook instead.
+_logHook() {
+    # Fast path in case nixLog is no-op.
+    if [[ -z ${NIX_LOG_FD-} ]]; then
+        return
+    fi
 
-                # And then remove the final, unnecessary, \n
-                exprToOutput="${exprToOutput%%\\n }"
-            fi
-            nixLog "evaling '$hookKind' string hook '$exprToOutput'"
-        fi
-    }
-else
-    nixLog() {
-        # Stub.
-        # Note: because bash syntax, this colon is load bearing. Removing it
-        # will turn this function into a syntax error.
-        :
-    }
+    local hookKind="$1"
+    local hookExpr="$2"
+    shift 2
 
-    _logHook() {
-        # Load-bearing colon; same as above.
-        :
-    }
-fi
+    if declare -F "$hookExpr" > /dev/null 2>&1; then
+        nixLog "calling '$hookKind' function hook '$hookExpr'" "$@"
+    elif type -p "$hookExpr" > /dev/null; then
+        nixLog "sourcing '$hookKind' script hook '$hookExpr'"
+    elif [[ "$hookExpr" != "_callImplicitHook"* ]]; then
+        # Here we have a string hook to eval.
+        # Join lines onto one with literal \n characters unless NIX_DEBUG >= 2.
+        local exprToOutput
+        if (( "${NIX_DEBUG:-0}" >= 2 )); then
+            exprToOutput="$hookExpr"
+        else
+            # We have `r'\n'.join([line.lstrip() for lines in text.split('\n')])` at home.
+            local hookExprLine
+            while IFS= read -r hookExprLine; do
+                # These lines often have indentation,
+                # so let's remove leading whitespace.
+                hookExprLine="${hookExprLine#"${hookExprLine%%[![:space:]]*}"}"
+                # If this line wasn't entirely whitespace,
+                # then add it to our output
+                if [[ -n "$hookExprLine" ]]; then
+                    exprToOutput+="$hookExprLine\\n "
+                fi
+            done <<< "$hookExpr"
+
+            # And then remove the final, unnecessary, \n
+            exprToOutput="${exprToOutput%%\\n }"
+        fi
+        nixLog "evaling '$hookKind' string hook '$exprToOutput'"
+    fi
+}
 
 ######################################################################
 # Hook handling.

From af6f4306abc61dda69aca9b827db8c40748b34e6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 29 Jul 2024 17:39:56 +0300
Subject: [PATCH 104/342] Revert "libsForQt5.kimageformats: provide dav1d,
 libaom and libyuv"

This reverts commit b4edb67e84a89beb039f4c52625a2184d9ca517d.

Properly solved in libavif now.
---
 pkgs/development/libraries/kde-frameworks/kimageformats.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index d516081da2d75..5954d56e6cca6 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ilmbase, karchive, openexr, dav1d, libaom, libavif, libheif, libjxl, libraw, libyuv, qtbase
+  ilmbase, karchive, openexr, libavif, libheif, libjxl, libraw, qtbase
 }:
 
 let inherit (lib) getDev; in
@@ -10,7 +10,7 @@ mkDerivation {
   pname = "kimageformats";
 
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive openexr libaom libavif dav1d libheif libjxl libraw libyuv qtbase ];
+  buildInputs = [ karchive openexr libavif libheif libjxl libraw qtbase ];
   outputs = [ "out" ]; # plugins only
   CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR";
   cmakeFlags = [

From 1014f47bcbf98eba33cee9f36f95c60d4f593dfa Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 29 Jul 2024 22:08:09 +0100
Subject: [PATCH 105/342] xorg.libX11: 1.8.9 -> 1.8.10

Changes: https://lists.x.org/archives/xorg-announce/2024-July/003521.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8566c8c61749a..2338e6ce184bf 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1118,11 +1118,11 @@ self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans, testers }: stdenv.mkDerivation (finalAttrs: {
     pname = "libX11";
-    version = "1.8.9";
+    version = "1.8.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/lib/libX11-1.8.9.tar.xz";
-      sha256 = "0qijpp9l6hhwwx22hncrzjpmb5ffcakj6pxa5lzgjkhl3l8qz7bp";
+      url = "mirror://xorg/individual/lib/libX11-1.8.10.tar.xz";
+      sha256 = "0lywvwsz92j7isglvw2227g3na4ghyspvsvblpf43ns7jfnksfrb";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8305e15740409..fa9f0d33753a0 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -173,7 +173,7 @@ mirror://xorg/individual/lib/libICE-1.1.1.tar.xz
 mirror://xorg/individual/lib/libpciaccess-0.18.1.tar.xz
 mirror://xorg/individual/lib/libSM-1.2.4.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.8.9.tar.xz
+mirror://xorg/individual/lib/libX11-1.8.10.tar.xz
 mirror://xorg/individual/lib/libXau-1.0.11.tar.xz
 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz
 mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz

From 5f2e83c77747e3eaa3b66854d0d697c42ab740bf Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 19 Jun 2024 22:05:03 +0100
Subject: [PATCH 106/342] xmlto: 0.0.28 -> 0.0.29

---
 pkgs/tools/typesetting/xmlto/default.nix | 30 +++++++-----------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index 848b72eee0876..a29ef2aaed69d 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -1,11 +1,11 @@
 {
+  autoreconfHook,
   bash,
   coreutils,
   docbook_xml_dtd_45,
   docbook_xsl,
   docbook-xsl-ns,
-  fetchpatch,
-  fetchurl,
+  fetchgit,
   findutils,
   flex,
   getopt,
@@ -22,32 +22,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xmlto";
-  version = "0.0.28";
+  version = "0.0.29";
 
-  src = fetchurl {
-    url = "https://releases.pagure.org/xmlto/xmlto-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-ETDfOnlX659vDSnkqhx1cyp9+21jm+AThZtcfsVCEnY=";
+  src = fetchgit {
+    url = "https://pagure.io/xmlto.git";
+    rev = finalAttrs.version;
+    hash = "sha256-wttag8J1t9cBPBHNY7me2H0IPOzS8IjfCLIHNWq67Do=";
   };
 
-  # Note: These patches modify `xmlif/xmlif.l`, which requires `flex` to be rerun.
-  patches = [
-    # Fixes implicit `int` on `main`, which is an error with clang 16.
-    (fetchpatch {
-      url = "https://pagure.io/xmlto/c/8e34f087bf410bcc5fe445933d6ad9bae54f24b5.patch";
-      hash = "sha256-z5riDBZBVuFeBcjI++dAl3nTIgOPau4Gag0MJbYt+cc=";
-    })
-    # Fixes implicit `int` on `ifsense`, which is also an error with clang 16.
-    (fetchpatch {
-      url = "https://pagure.io/xmlto/c/1375e2df75530cd198bd16ac3de38e2b0d126276.patch";
-      hash = "sha256-fM6ZdTigrcC9cbXiKu6oa5Hs71mrREockB1wRlw6nDk=";
-    })
-  ];
-
   postPatch = ''
     patchShebangs xmlif/test/run-test
 
     substituteInPlace "xmlto.in" \
-      --replace-fail "@BASH@" "${bash}/bin/bash" \
+      --replace-fail "@XMLTO_BASH_PATH@" "${bash}/bin/bash" \
       --replace-fail "@FIND@" "${findutils}/bin/find" \
       --replace-fail "@GETOPT@" "${getopt}/bin/getopt" \
       --replace-fail "@GREP@" "${gnugrep}/bin/grep" \
@@ -64,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   # `libxml2' provides `xmllint', needed at build-time and run-time.
   # `libxslt' provides `xsltproc', used by `xmlto' at run-time.
   nativeBuildInputs = [
+    autoreconfHook
     makeWrapper
     flex
     getopt

From cd23e5ec5ebb56e0dd633ebb1028b0ce5fdf928e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 29 Jul 2024 15:28:14 -0700
Subject: [PATCH 107/342] python312Packages.pydantic: tests don't depend on
 faker

It's only used in benchmarks.
---
 pkgs/development/python-modules/pydantic/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix
index f47c028ac54c0..f3858f4febc73 100644
--- a/pkgs/development/python-modules/pydantic/default.nix
+++ b/pkgs/development/python-modules/pydantic/default.nix
@@ -21,7 +21,6 @@
   cloudpickle,
   email-validator,
   dirty-equals,
-  faker,
   pytestCheckHook,
   pytest-mock,
   eval-type-backport,
@@ -62,7 +61,6 @@ buildPythonPackage rec {
     [
       cloudpickle
       dirty-equals
-      faker
       pytest-mock
       pytestCheckHook
     ]

From 331fbac69c39a060a26b32a36d3d5bd81dcec9e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 30 Jul 2024 07:01:52 -0700
Subject: [PATCH 108/342] python312Packages.pymemcache: modernize

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

diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix
index 829d3863f304d..c80f512e74982 100644
--- a/pkgs/development/python-modules/pymemcache/default.nix
+++ b/pkgs/development/python-modules/pymemcache/default.nix
@@ -4,10 +4,10 @@
   faker,
   fetchFromGitHub,
   mock,
-  six,
   pytestCheckHook,
   python-memcached,
   pythonOlder,
+  setuptools,
   zstd,
   stdenv,
 }:
@@ -15,18 +15,18 @@
 buildPythonPackage rec {
   pname = "pymemcache";
   version = "4.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "pinterest";
-    repo = pname;
+    repo = "pymemcache";
     rev = "v${version}";
     hash = "sha256-WgtHhp7lE6StoOBfSy9+v3ODe/+zUC7lGrc2S4M68+M=";
   };
 
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [
     faker
@@ -50,6 +50,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pymemcache" ];
 
   meta = with lib; {
+    changelog = "https://github.com/pinterest/pymemcache/blob/${src.rev}/ChangeLog.rst";
     description = "Python memcached client";
     homepage = "https://pymemcache.readthedocs.io/";
     license = with licenses; [ asl20 ];

From 53daf0d29ff4cef99e08852f3d1711bb3c9d1e7a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 30 Jul 2024 19:41:39 +0100
Subject: [PATCH 109/342] SDL2: apply formatting

---
 pkgs/development/libraries/SDL2/default.nix | 190 ++++++++++++--------
 1 file changed, 116 insertions(+), 74 deletions(-)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 0f87b46e5a179..2a6a5864d25e4 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -1,56 +1,57 @@
-{ lib
-, stdenv
-, config
-, fetchFromGitHub
-, nix-update-script
-, pkg-config
-, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
-, openglSupport ? libGLSupported
-, libGL
-, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
-, alsa-lib
-, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid
-, libX11
-, xorgproto
-, libICE
-, libXi
-, libXScrnSaver
-, libXcursor
-, libXinerama
-, libXext
-, libXxf86vm
-, libXrandr
-, waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
-, wayland
-, wayland-protocols
-, wayland-scanner
-, drmSupport ? false
-, libdrm
-, mesa
-, libxkbcommon
-, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
-, dbus
-, udevSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
-, udev
-, ibusSupport ? false
-, ibus
-, libdecorSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
-, libdecor
-, pipewireSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
-, pipewire # NOTE: must be built with SDL2 without pipewire support
-, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid
-, libpulseaudio
-, AudioUnit
-, Cocoa
-, CoreAudio
-, CoreServices
-, ForceFeedback
-, OpenGL
-, audiofile
-, libiconv
-, withStatic ? stdenv.hostPlatform.isMinGW
+{
+  lib,
+  stdenv,
+  config,
+  fetchFromGitHub,
+  nix-update-script,
+  pkg-config,
+  libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms,
+  openglSupport ? libGLSupported,
+  libGL,
+  alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid,
+  alsa-lib,
+  x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid,
+  libX11,
+  xorgproto,
+  libICE,
+  libXi,
+  libXScrnSaver,
+  libXcursor,
+  libXinerama,
+  libXext,
+  libXxf86vm,
+  libXrandr,
+  waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  drmSupport ? false,
+  libdrm,
+  mesa,
+  libxkbcommon,
+  dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid,
+  dbus,
+  udevSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid,
+  udev,
+  ibusSupport ? false,
+  ibus,
+  libdecorSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid,
+  libdecor,
+  pipewireSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid,
+  pipewire, # NOTE: must be built with SDL2 without pipewire support
+  pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid,
+  libpulseaudio,
+  AudioUnit,
+  Cocoa,
+  CoreAudio,
+  CoreServices,
+  ForceFeedback,
+  OpenGL,
+  audiofile,
+  libiconv,
+  withStatic ? stdenv.hostPlatform.isMinGW,
   # passthru.tests
-, testers
+  testers,
 }:
 
 # NOTE: When editing this expression see if the same change applies to
@@ -67,7 +68,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZonlvXAAWCTfDYf/w5RxP1Av67v89kex4H43xkbPYEA=";
   };
   dontDisableStatic = if withStatic then 1 else 0;
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
   outputBin = "dev"; # sdl-config
 
   patches = [
@@ -89,41 +93,74 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = [ pkg-config ];
 
-  nativeBuildInputs = [ pkg-config ] ++ lib.optionals waylandSupport [ wayland wayland-scanner ];
+  nativeBuildInputs =
+    [ pkg-config ]
+    ++ lib.optionals waylandSupport [
+      wayland
+      wayland-scanner
+    ];
 
-  dlopenPropagatedBuildInputs = [ ]
+  dlopenPropagatedBuildInputs =
+    [ ]
     # Propagated for #include <GLES/gl.h> in SDL_opengles.h.
     ++ lib.optional (openglSupport && !stdenv.isDarwin) libGL
     # Propagated for #include <X11/Xlib.h> and <X11/Xatom.h> in SDL_syswm.h.
     ++ lib.optionals x11Support [ libX11 ];
 
-  propagatedBuildInputs = lib.optionals x11Support [ xorgproto ]
-    ++ finalAttrs.dlopenPropagatedBuildInputs;
+  propagatedBuildInputs =
+    lib.optionals x11Support [ xorgproto ] ++ finalAttrs.dlopenPropagatedBuildInputs;
 
-  dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ]
+  dlopenBuildInputs =
+    lib.optionals alsaSupport [
+      alsa-lib
+      audiofile
+    ]
     ++ lib.optional dbusSupport dbus
     ++ lib.optional libdecorSupport libdecor
     ++ lib.optional pipewireSupport pipewire
     ++ lib.optional pulseaudioSupport libpulseaudio
     ++ lib.optional udevSupport udev
-    ++ lib.optionals waylandSupport [ wayland libxkbcommon ]
-    ++ lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]
-    ++ lib.optionals drmSupport [ libdrm mesa ];
-
-  buildInputs = [ libiconv ]
+    ++ lib.optionals waylandSupport [
+      wayland
+      libxkbcommon
+    ]
+    ++ lib.optionals x11Support [
+      libICE
+      libXi
+      libXScrnSaver
+      libXcursor
+      libXinerama
+      libXext
+      libXrandr
+      libXxf86vm
+    ]
+    ++ lib.optionals drmSupport [
+      libdrm
+      mesa
+    ];
+
+  buildInputs =
+    [ libiconv ]
     ++ finalAttrs.dlopenBuildInputs
     ++ lib.optional ibusSupport ibus
     ++ lib.optionals waylandSupport [ wayland-protocols ]
-    ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
+    ++ lib.optionals stdenv.isDarwin [
+      AudioUnit
+      Cocoa
+      CoreAudio
+      CoreServices
+      ForceFeedback
+      OpenGL
+    ];
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    "--disable-oss"
-  ] ++ lib.optional (!x11Support) "--without-x"
-  ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
-  ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles"
-  ++ lib.optional stdenv.isDarwin "--disable-sdltest";
+  configureFlags =
+    [ "--disable-oss" ]
+    ++ lib.optional (!x11Support) "--without-x"
+    ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
+    ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles"
+    ++ lib.optional stdenv.isDarwin "--disable-sdltest";
 
   # We remove libtool .la files when static libs are requested,
   # because they make the builds of downstream libs like `SDL_tff`
@@ -158,7 +195,9 @@ stdenv.mkDerivation (finalAttrs: {
   # list the symbols used in this way.
   postFixup =
     let
-      rpath = lib.makeLibraryPath (finalAttrs.dlopenPropagatedBuildInputs ++ finalAttrs.dlopenBuildInputs);
+      rpath = lib.makeLibraryPath (
+        finalAttrs.dlopenPropagatedBuildInputs ++ finalAttrs.dlopenBuildInputs
+      );
     in
     lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") ''
       for lib in $out/lib/*.so* ; do
@@ -172,10 +211,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     inherit openglSupport;
-    updateScript = nix-update-script { extraArgs = [ "--version-regex" "release-(.*)" ]; };
-    tests.pkg-config = testers.hasPkgConfigModules {
-      package = finalAttrs.finalPackage;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "release-(.*)"
+      ];
     };
+    tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
   };
 
   meta = with lib; {

From 1e5b7660b2327b2c66bcdf05a53d9433b6748d49 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Wed, 31 Jul 2024 07:49:05 +1000
Subject: [PATCH 110/342] postgresql: fix postgis

nixosTests.postgis is failing due to libxml2 update
---
 pkgs/servers/sql/postgresql/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 907646dc722bc..1a252f5888e99 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -62,7 +62,7 @@ let
       zlib
       readline
       openssl
-      libxml2
+      (libxml2.override {enableHttp = true;})
       icu
     ]
       ++ lib.optionals (olderThan "13") [ libxcrypt ]

From 424415e7564eeb62350fae24a0c3c4c020708e30 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 30 Jul 2024 22:04:14 -0400
Subject: [PATCH 111/342] nixos/systemd-boot: Fix 'bootctl update' regression

https://github.com/systemd/systemd/issues/33392
---
 nixos/tests/systemd-boot.nix               | 29 ++++++++++++++++------
 pkgs/os-specific/linux/systemd/default.nix | 10 +++++---
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix
index 93efd128bfcb3..79b3d8602e1d7 100644
--- a/nixos/tests/systemd-boot.nix
+++ b/nixos/tests/systemd-boot.nix
@@ -227,18 +227,31 @@ rec {
     testScript = ''
       machine.succeed("mount -o remount,rw /boot")
 
-      # Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c
-      machine.succeed(
-          """
-        find /boot -iname '*boot*.efi' -print0 | \
-        xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}'
-      """
-      )
+      def switch():
+          # Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c
+          machine.succeed(
+            """
+            find /boot -iname '*boot*.efi' -print0 | \
+            xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}'
+            """
+          )
+          return machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1")
 
-      output = machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1")
+      output = switch()
       assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message"
       assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi"
       assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI"
+
+      with subtest("Test that updating works with lowercase bootx64.efi"):
+          machine.succeed(
+              # Move to tmp file name first, otherwise mv complains the new location is the same
+              "mv /boot/EFI/BOOT/BOOTX64.EFI /boot/EFI/BOOT/bootx64.efi.new",
+              "mv /boot/EFI/BOOT/bootx64.efi.new /boot/EFI/BOOT/bootx64.efi",
+          )
+          output = switch()
+          assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message"
+          assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi"
+          assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI"
     '';
   };
 
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index aab2d44c99da9..e3ac4101dbb5a 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -7,6 +7,7 @@
 , fetchFromGitHub
 , fetchzip
 , fetchpatch
+, fetchpatch2
 , buildPackages
 , makeBinaryWrapper
 , ninja
@@ -238,10 +239,11 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-OmuPDm3NykrDeNTA3NcYt9iTXEUFwKJ5apPP4KqtABg=";
     })
 
-    # https://github.com/systemd/systemd/pull/33400
-    (fetchpatch {
-      url = "https://github.com/systemd/systemd/compare/051d462b42fe6c27824046c15cd3c84fa5afe05b..5e2d802c018f0b6d5dd58745f64d6958fa261096.patch";
-      hash = "sha256-drGAnx+ECixOjIP0DUSbCG/emUgoVips9WQL5ny3NKQ=";
+    # https://github.com/systemd/systemd/issues/33392
+    (fetchpatch2 {
+      url = "https://github.com/systemd/systemd/commit/f8b02a56febf14adf2474875a1b6625f1f346a6f.patch?full_index=1";
+      hash = "sha256-qRW92gPtACjk+ifptkw5mujhHlkCF56M3azGIjLiMKE=";
+      revert = true;
     })
   ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
     ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch

From 89700ef3d9dbb87fd480f9dd93c92f18ad6886f4 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 30 Jul 2024 22:06:10 -0400
Subject: [PATCH 112/342] systemd: 256.2 -> 256.4

---
 pkgs/os-specific/linux/systemd/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e3ac4101dbb5a..04b357913c70e 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -6,7 +6,6 @@
 , pkgsCross
 , fetchFromGitHub
 , fetchzip
-, fetchpatch
 , fetchpatch2
 , buildPackages
 , makeBinaryWrapper
@@ -184,7 +183,7 @@ assert withBootloader -> withEfi;
 let
   wantCurl = withRemote || withImportd;
   wantGcrypt = withResolved || withImportd;
-  version = "256.2";
+  version = "256.4";
 
   # Use the command below to update `releaseTimestamp` on every (major) version
   # change. More details in the commentary at mesonFlags.
@@ -202,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "systemd";
     repo = "systemd";
     rev = "v${version}";
-    hash = "sha256-fyHzL+oe192YYuwyoTrov10IlrB0NSfY/XKVWzJrQEI=";
+    hash = "sha256-dugBiRgDFpB0eKhhIT3LkA8FhClM0lvvwCMJ+dKtjPM=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -232,13 +231,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
     ./0017-meson.build-do-not-create-systemdstatedir.patch
 
-    # https://github.com/systemd/systemd/pull/33258
-    # Remove after 256.3
-    (fetchpatch {
-      url = "https://github.com/systemd/systemd/compare/b268a71069786a45460807967e669d505ba3c5a2..f26b2ec46118a4493608618da2253bb9dfc6b517.patch";
-      hash = "sha256-OmuPDm3NykrDeNTA3NcYt9iTXEUFwKJ5apPP4KqtABg=";
-    })
-
     # https://github.com/systemd/systemd/issues/33392
     (fetchpatch2 {
       url = "https://github.com/systemd/systemd/commit/f8b02a56febf14adf2474875a1b6625f1f346a6f.patch?full_index=1";

From 0bfa3d044d3f08b5aa65eb89f09b029f1683f864 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 31 Jul 2024 08:58:36 +0300
Subject: [PATCH 113/342] Revert "darktable: fix build"

This reverts commit 7b67b4bebce9207c76cd3ef5f2f8de1673bfab34.

Fixed properly in libavif.
---
 pkgs/applications/graphics/darktable/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 4d4f004976867..0d19158f4476d 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -53,8 +53,6 @@
 , libaom
 , portmidi
 , lua
-, dav1d
-, libyuv
 }:
 
 stdenv.mkDerivation rec {
@@ -108,8 +106,6 @@ stdenv.mkDerivation rec {
     libaom
     portmidi
     lua
-    dav1d
-    libyuv
   ] ++ lib.optionals stdenv.isLinux [
     colord
     colord-gtk

From 0f37de9fe637b5dcb6ecb3921515f2e7d323b618 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 31 Jul 2024 07:15:29 +0000
Subject: [PATCH 114/342] aws-c-auth: 0.7.22 -> 0.7.23

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

diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix
index d07a7fc529964..cbd997127d7a3 100644
--- a/pkgs/development/libraries/aws-c-auth/default.nix
+++ b/pkgs/development/libraries/aws-c-auth/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aws-c-auth";
-  version = "0.7.22";
+  version = "0.7.23";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-auth";
     rev = "v${version}";
-    hash = "sha256-8+SFag3hRQ+1aOK2vuHOV/gXE1qUIlAW5LNJDmUORLs=";
+    hash = "sha256-WQ5mJrPGsjsBGUHGott0wiDbgMbPMgOEt0TkHOvAR9w=";
   };
 
   nativeBuildInputs = [

From e4f405d002ba79e048d5bc582608d54629cd01c1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 31 Jul 2024 15:44:46 +0200
Subject: [PATCH 115/342] python3Packages.motor: 3.4.0 -> 3.5.1

---
 .../python-modules/motor/default.nix          | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix
index fa9fc4da9e637..1a8aa99a36795 100644
--- a/pkgs/development/python-modules/motor/default.nix
+++ b/pkgs/development/python-modules/motor/default.nix
@@ -2,6 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
+  hatch-requirements-txt,
   mockupdb,
   pymongo,
   pythonOlder,
@@ -9,19 +11,24 @@
 
 buildPythonPackage rec {
   pname = "motor";
-  version = "3.4.0";
-  format = "setuptools";
+  version = "3.5.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "mongodb";
-    repo = pname;
+    repo = "motor";
     rev = "refs/tags/${version}";
-    hash = "sha256-Rj8eYZxmw/cn/vkhLunmHgxMMHIQe80Zhc2p0q3b/AY=";
+    hash = "sha256-mg31FzMF0xEEhfLKAdF2pzEkULESFFGaXnE0uospXqE=";
   };
 
-  propagatedBuildInputs = [ pymongo ];
+  build-system = [
+    hatchling
+    hatch-requirements-txt
+  ];
+
+  dependencies = [ pymongo ];
 
   nativeCheckInputs = [ mockupdb ];
 
@@ -30,10 +37,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "motor" ];
 
-  meta = with lib; {
+  meta = {
     description = "Non-blocking MongoDB driver for Tornado or asyncio";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://github.com/mongodb/motor";
-    maintainers = with maintainers; [ globin ];
+    maintainers = with lib.maintainers; [ globin ];
   };
 }

From 2fecb94326ee487375104a418bd33b72b72dfee1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 31 Jul 2024 15:49:38 +0200
Subject: [PATCH 116/342] python3Packages.pymongo: 4.7.3 -> 4.8.0

---
 .../python-modules/pymongo/default.nix        | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index d7e1b35ed742c..c64d22d66cb97 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -2,6 +2,9 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  hatchling,
+  hatch-requirements-txt,
+  setuptools,
   pythonOlder,
   dnspython,
 
@@ -16,17 +19,24 @@
 
 buildPythonPackage rec {
   pname = "pymongo";
-  version = "4.7.3";
-  format = "setuptools";
+  version = "4.8.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Y1SmayKPLNOZvnQpaF+2jgfxkRCjZ5eC7LT9to2gODE=";
+    inherit version;
+    pname = "pymongo";
+    hash = "sha256-RU8ilYdXRNxw8YgeSy65nNrQCKM1dLyKrxIFMPZsDN4=";
   };
 
-  propagatedBuildInputs = [ dnspython ];
+  build-system = [
+    hatchling
+    hatch-requirements-txt
+    setuptools
+  ];
+
+  dependencies = [ dnspython ];
 
   # Tests call a running mongodb instance
   doCheck = false;
@@ -44,10 +54,10 @@ buildPythonPackage rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Python driver for MongoDB";
     homepage = "https://github.com/mongodb/mongo-python-driver";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }

From 84c30688a9effa65e8aeac962194c4618aa7e674 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jul 2024 00:21:27 +0000
Subject: [PATCH 117/342] jdupes: 1.27.3 -> 1.28.0

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

diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 049b69fa7661e..8a637a66de378 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "jdupes";
-  version = "1.27.3";
+  version = "1.28.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    hash = "sha256-hR5nl8G7TYVm4ol/jgo7iOb4dLr2MovgjKSXCD2UwMg=";
+    hash = "sha256-jRjVuN/FNDpKB+Ibi+Mkm+WhB16cz9c33dOOeiPdgr8=";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.

From 7a8913b2d10174a8f17ce5b0925da0be77f1394e Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 31 Jul 2024 19:22:09 +0530
Subject: [PATCH 118/342] jdupes: point to new homepage link, cleanup

apply nixfmt-rfc-style
rec -> finalAttrs
---
 pkgs/tools/misc/jdupes/default.nix | 38 +++++++++++++++++-------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 8a637a66de378..9c69888469907 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -1,14 +1,19 @@
-{ lib, stdenv, fetchFromGitea, libjodycode }:
-
-stdenv.mkDerivation rec {
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  libjodycode,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "jdupes";
   version = "1.28.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "jbruchon";
-    repo  = "jdupes";
-    rev   = "v${version}";
+    repo = "jdupes";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-jRjVuN/FNDpKB+Ibi+Mkm+WhB16cz9c33dOOeiPdgr8=";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
@@ -20,14 +25,13 @@ stdenv.mkDerivation rec {
 
   dontConfigure = true;
 
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ] ++ lib.optionals stdenv.isLinux [
-    "ENABLE_DEDUPE=1"
-    "STATIC_DEDUPE_H=1"
-  ] ++ lib.optionals stdenv.cc.isGNU [
-    "HARDEN=1"
-  ];
+  makeFlags =
+    [ "PREFIX=${placeholder "out"}" ]
+    ++ lib.optionals stdenv.isLinux [
+      "ENABLE_DEDUPE=1"
+      "STATIC_DEDUPE_H=1"
+    ]
+    ++ lib.optionals stdenv.cc.isGNU [ "HARDEN=1" ];
 
   enableParallelBuilding = true;
 
@@ -37,16 +41,16 @@ stdenv.mkDerivation rec {
     install -Dm444 -t $out/share/doc/jdupes CHANGES.txt LICENSE.txt README.md
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Powerful duplicate file finder and an enhanced fork of 'fdupes'";
     longDescription = ''
       jdupes is a program for identifying and taking actions upon
       duplicate files. This fork known as 'jdupes' is heavily modified
       from and improved over the original.
     '';
-    homepage = "https://github.com/jbruchon/jdupes";
-    license = licenses.mit;
+    homepage = "https://codeberg.org/jbruchon/jdupes";
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "jdupes";
   };
-}
+})

From 51df2b8f014ecd030c4fa8422dc31673c6214188 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 31 Jul 2024 22:17:43 +0530
Subject: [PATCH 119/342] pythonPackages.sure: fix eval

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

diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index 0a8f5cef066ca..45d3c055634ff 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -41,12 +41,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "sure" ];
 
-  meta = with lib; {
+  meta = {
     description = "Utility belt for automated testing";
     mainProgram = "sure";
     homepage = "https://sure.readthedocs.io/";
     changelog = "https://github.com/gabrielfalcao/sure/blob/v${version}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = [ sigmanificient ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ sigmanificient ];
   };
 }

From 2f62682564b8b8d402e7a54295323962ad0834b7 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 28 Jul 2024 14:03:58 +0800
Subject: [PATCH 120/342] emacs: remove one unneeded line from genericBuild

I test this patch on x86_64-linux and aarch64-darwin systems.  This
patch does not cause package build failure.

https://github.com/NixOS/nixpkgs/commit/e89082346762164f5a9f7f3ebc3afa13fb964718
---
 pkgs/applications/editors/emacs/build-support/generic.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index 727b1f03cae4f..0dc094c2549fa 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -3,7 +3,7 @@
 { lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
 
 let
-  inherit (lib) optionalAttrs getLib;
+  inherit (lib) optionalAttrs;
   handledArgs = [ "buildInputs" "packageRequires" "propagatedUserEnvPkgs" "meta" ]
     ++ lib.optionals (emacs.withNativeCompilation or false) [ "nativeBuildInputs" "postInstall" ];
 
@@ -73,8 +73,6 @@ stdenv.mkDerivation (finalAttrs: ({
 
 // optionalAttrs (emacs.withNativeCompilation or false) {
 
-  LIBRARY_PATH = "${getLib stdenv.cc.libc}/lib";
-
   nativeBuildInputs = [ gcc ] ++ nativeBuildInputs;
 
   addEmacsNativeLoadPath = true;

From c7ce9ed4733bf46569d9fed88730d869807996f4 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 28 Jul 2024 14:08:25 +0800
Subject: [PATCH 121/342] emacs: remove unneeded code from genericBuild

I test this patch on x86_64-linux and aarch64-darwin systems.  This
patch makes elisp-ffi and rime fail to build, which is their own
packaging issue and should be fixed on the their side.  Build failure
of rime is only on darwin and the fix is easy.

The removed line was added[1] to fix a build failure on macos.  So I
also test emacs.pkgs.withPackages on that system and it works well.

[1]: https://github.com/NixOS/nixpkgs/commit/8bc10fbc56db2aaf1f234349e4d0c7607b8ead4f
---
 pkgs/applications/editors/emacs/build-support/elpa.nix    | 4 ++--
 pkgs/applications/editors/emacs/build-support/generic.nix | 7 ++-----
 pkgs/applications/editors/emacs/build-support/melpa.nix   | 4 ++--
 pkgs/applications/editors/emacs/build-support/wrapper.nix | 3 +--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix
index 6dd0c7f167c90..7ac8d673346ae 100644
--- a/pkgs/applications/editors/emacs/build-support/elpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/elpa.nix
@@ -1,10 +1,10 @@
 # builder for Emacs packages built for packages.el
 
-{ lib, stdenv, emacs, texinfo, writeText, gcc }:
+{ lib, stdenv, emacs, texinfo, writeText }:
 
 let
   handledArgs = [ "meta" ];
-  genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; };
+  genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText; };
 
 in
 
diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index 0dc094c2549fa..dd9a693137b0a 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -1,11 +1,11 @@
 # generic builder for Emacs packages
 
-{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
+{ lib, stdenv, emacs, texinfo, writeText, ... }:
 
 let
   inherit (lib) optionalAttrs;
   handledArgs = [ "buildInputs" "packageRequires" "propagatedUserEnvPkgs" "meta" ]
-    ++ lib.optionals (emacs.withNativeCompilation or false) [ "nativeBuildInputs" "postInstall" ];
+    ++ lib.optionals (emacs.withNativeCompilation or false) [ "postInstall" ];
 
   setupHook = writeText "setup-hook.sh" ''
     source ${./emacs-funcs.sh}
@@ -26,7 +26,6 @@ in
 { pname
 , version
 , buildInputs ? []
-, nativeBuildInputs ? []
 , packageRequires ? []
 , propagatedUserEnvPkgs ? []
 , postInstall ? ""
@@ -73,8 +72,6 @@ stdenv.mkDerivation (finalAttrs: ({
 
 // optionalAttrs (emacs.withNativeCompilation or false) {
 
-  nativeBuildInputs = [ gcc ] ++ nativeBuildInputs;
-
   addEmacsNativeLoadPath = true;
 
   inherit turnCompilationWarningToError ignoreCompilationError;
diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix
index 6249f4e7f1866..20f7e79eb683d 100644
--- a/pkgs/applications/editors/emacs/build-support/melpa.nix
+++ b/pkgs/applications/editors/emacs/build-support/melpa.nix
@@ -1,11 +1,11 @@
 # builder for Emacs packages built for packages.el
 # using MELPA package-build.el
 
-{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }:
+{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }:
 
 let
   handledArgs = [ "meta" "preUnpack" "postUnpack" ];
-  genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; };
+  genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText; };
 
   packageBuild = stdenv.mkDerivation {
     name = "package-build";
diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix
index 59a694286d09e..5b325f5e0a9e6 100644
--- a/pkgs/applications/editors/emacs/build-support/wrapper.nix
+++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix
@@ -32,7 +32,7 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
 
 */
 
-{ lib, lndir, makeBinaryWrapper, runCommand, gcc }:
+{ lib, lndir, makeBinaryWrapper, runCommand }:
 self:
 let
   inherit (self) emacs;
@@ -60,7 +60,6 @@ runCommand
     deps = runCommand "emacs-packages-deps"
       ({
         inherit explicitRequires lndir emacs;
-        nativeBuildInputs = lib.optional withNativeCompilation gcc;
       } // lib.optionalAttrs withNativeCompilation {
         inherit (emacs) LIBRARY_PATH;
       })

From 6b3965ed806c849deddf162013396f3e294644b7 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 28 Jul 2024 16:30:20 +0800
Subject: [PATCH 122/342] emacs: move emacs and texinfo to nativeBuildInputs in
 genericBuild

---
 pkgs/applications/editors/emacs/build-support/generic.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix
index dd9a693137b0a..3b3298cd14685 100644
--- a/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -4,7 +4,7 @@
 
 let
   inherit (lib) optionalAttrs;
-  handledArgs = [ "buildInputs" "packageRequires" "propagatedUserEnvPkgs" "meta" ]
+  handledArgs = [ "buildInputs" "nativeBuildInputs" "packageRequires" "propagatedUserEnvPkgs" "meta" ]
     ++ lib.optionals (emacs.withNativeCompilation or false) [ "postInstall" ];
 
   setupHook = writeText "setup-hook.sh" ''
@@ -26,6 +26,7 @@ in
 { pname
 , version
 , buildInputs ? []
+, nativeBuildInputs ? []
 , packageRequires ? []
 , propagatedUserEnvPkgs ? []
 , postInstall ? ""
@@ -54,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: ({
     esac
   '';
 
-  buildInputs = [emacs texinfo] ++ packageRequires ++ buildInputs;
+  buildInputs = packageRequires ++ buildInputs;
+  nativeBuildInputs = [ emacs texinfo ] ++ nativeBuildInputs;
   propagatedBuildInputs = packageRequires;
   propagatedUserEnvPkgs = packageRequires ++ propagatedUserEnvPkgs;
 

From 0b51f54b8f6b2c6fba77166390ff1cda657d4ca7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 1 Aug 2024 12:38:15 +0300
Subject: [PATCH 123/342] pipewire: 1.2.1 -> 1.2.2

Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.2.1...1.2.2

Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.2.2
---
 pkgs/development/libraries/pipewire/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index bf8386d544031..f4b411776a666 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -56,7 +56,7 @@
 
 stdenv.mkDerivation(finalAttrs: {
   pname = "pipewire";
-  version = "1.2.1";
+  version = "1.2.2";
 
   outputs = [
     "out"
@@ -72,7 +72,7 @@ stdenv.mkDerivation(finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-CkxsVD813LbWpuZhJkNLJnqjLF6jmEn+CajXb2XTCsY=";
+    sha256 = "sha256-neLQ41p2f2QyOS3r2VxanaHbiVj6nnnkT7kx/On0azM=";
   };
 
   patches = [

From 204bb970670a4562e1b9960a6449777f35ba90b4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 1 Aug 2024 12:45:07 +0300
Subject: [PATCH 124/342] mesa: 24.1.4 -> 24.1.5

---
 pkgs/development/libraries/mesa/common.nix  | 4 ++--
 pkgs/development/libraries/mesa/default.nix | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 1a60c136be568..06efd715c23f1 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "24.1.4";
+  version = "24.1.5";
 
   src = fetchurl {
     urls = [
       "https://archive.mesa3d.org/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    hash = "sha256-fPfG9mUmOtASKInB1LB2ZUwe7ep6LzjGnIxRV5k3reE=";
+    hash = "sha256-AnYf/ZZd1kuVQh6/yhGR1zckq6APMANACSN1ZPNM+XY=";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 2266716bd9dae..5782ec9fbedf4 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -138,13 +138,6 @@ in stdenv.mkDerivation {
 
   patches = [
     ./opencl.patch
-
-    # https://gitlab.freedesktop.org/mesa/mesa/-/issues/11533
-    (fetchpatch {
-      name = "ffmpeg.patch";
-      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/241f70e5a13bb9c13a168282446ad074e16c3d74.patch";
-      hash = "sha256-Cx7OL8iXGAOuDbCQReCCxSrWYvfZVrGoP0txIKSLTvs=";
-    })
   ];
 
   postPatch = ''

From a76707e813b56ed367c0683ad7e2e4a06248c5d2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 1 Aug 2024 14:17:37 +0100
Subject: [PATCH 125/342] bash: 5.2p26 -> 5.2p32

Replace one patch with its upstream version.
---
 pkgs/shells/bash/5.nix                | 5 -----
 pkgs/shells/bash/bash-5.2-patches.nix | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 395fffe293fcb..e36d69593bd35 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -57,11 +57,6 @@ stdenv.mkDerivation rec {
 
   patches = upstreamPatches ++ [
     ./pgrp-pipe-5.patch
-    (fetchurl {
-      name = "fix-static.patch";
-      url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51";
-      sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk=";
-    })
     # Apply parallel build fix pending upstream inclusion:
     #   https://savannah.gnu.org/patch/index.php?10373
     # Had to fetch manually to workaround -p0 default.
diff --git a/pkgs/shells/bash/bash-5.2-patches.nix b/pkgs/shells/bash/bash-5.2-patches.nix
index 5d5ef94676dee..fb4c9c4e36785 100644
--- a/pkgs/shells/bash/bash-5.2-patches.nix
+++ b/pkgs/shells/bash/bash-5.2-patches.nix
@@ -27,4 +27,10 @@ patch: [
 (patch "024" "1hq23djqbr7s9y2324jq9mxr5bwdkmgizn3zgpchbsqp054k85cp")
 (patch "025" "0x9hc4silzl4d3zw4p43i5dm7w86k50j47f87lracwfgwy3z8f2i")
 (patch "026" "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln")
+(patch "027" "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1")
+(patch "028" "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0")
+(patch "029" "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j")
+(patch "030" "13v9fqgim082dmvkslsr0hs793yzhsij2s91mjswsfhj1qip7zy3")
+(patch "031" "15d7rddj6spwc1fy997lxx6zvzq0zbxgf2h20mhi4wgp5nzbglf2")
+(patch "032" "05ia6yf32hjprmyyxqawhgckxs3684ikfx8xg08zfgx9xkd7g73v")
 ]

From b62cfa99c3583b5c77490b0875390d0d813706a5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 1 Aug 2024 14:21:50 +0100
Subject: [PATCH 126/342] bash: add upstream fix for `pop_var_context` error

Closes: #214822
---
 pkgs/shells/bash/5.nix                          |  2 ++
 .../shells/bash/fix-pop-var-context-error.patch | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/shells/bash/fix-pop-var-context-error.patch

diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index e36d69593bd35..b2167b9ef7fac 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -61,6 +61,8 @@ stdenv.mkDerivation rec {
     #   https://savannah.gnu.org/patch/index.php?10373
     # Had to fetch manually to workaround -p0 default.
     ./parallel.patch
+    # Fix `pop_var_context: head of shell_variables not a function context`.
+    ./fix-pop-var-context-error.patch
   ];
 
   configureFlags = [
diff --git a/pkgs/shells/bash/fix-pop-var-context-error.patch b/pkgs/shells/bash/fix-pop-var-context-error.patch
new file mode 100644
index 0000000000000..1b8d5ae20b31d
--- /dev/null
+++ b/pkgs/shells/bash/fix-pop-var-context-error.patch
@@ -0,0 +1,17 @@
+Excerpted from <https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=055a4552c901e43e6a6007f5bc664a33698dbf85>.
+
+Original author: Chet Ramey <chet.ramey@case.edu>
+
+--- variables.c
++++ variables.c
+@@ -5413,7 +5413,9 @@ pop_var_context ()
+   vcxt = shell_variables;
+   if (vc_isfuncenv (vcxt) == 0)
+     {
+-      internal_error (_("pop_var_context: head of shell_variables not a function context"));
++      /* If we haven't flushed all of the local contexts already, flag an error */
++      if (shell_variables != global_variables || variable_context > 0)
++	internal_error (_("pop_var_context: head of shell_variables not a function context"));
+       return;
+     }
+ 

From c47a1e701df7f00352b8cf401fa79c0d2f5fcc59 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 1 Aug 2024 19:26:05 +0200
Subject: [PATCH 127/342] stdenv: make sure the `env-vars` file created is not
 world readable

Under some circumstances this file might contain private information
that should not be accessible to everybody.
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index c1de5b97d2d6a..cc69434dc8c98 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1044,7 +1044,7 @@ substituteAllInPlace() {
 # the environment used for building.
 dumpVars() {
     if [ "${noDumpEnvVars:-0}" != 1 ]; then
-        export 2>/dev/null >| "$NIX_BUILD_TOP/env-vars" || true
+        install -m 0600 <(export 2>/dev/null) "$NIX_BUILD_TOP/env-vars" || true
     fi
 }
 

From 2168c0df8da6878c1f338cc780132f7f961908f8 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@pacien.net>
Date: Thu, 1 Aug 2024 19:41:52 +0200
Subject: [PATCH 128/342] mercurial: 6.8 -> 6.8.1

Changelog: https://wiki.mercurial-scm.org/Release6.8
---
 pkgs/applications/version-management/mercurial/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index f60813a7eea64..e6f08bc6dea02 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -21,11 +21,11 @@ let
 
   self = python3Packages.buildPythonApplication rec {
     pname = "mercurial${lib.optionalString fullBuild "-full"}";
-    version = "6.8";
+    version = "6.8.1";
 
     src = fetchurl {
       url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-      hash = "sha256-COTQ5dqK8RMrUea8M1AYCtV63Nk18Je20LwRmiwsChA=";
+      hash = "sha256-Aw6Kem1ZDk6utAPuJWdWFc2A0jbzq4oLVtzIQYEViwU=";
     };
 
     format = "other";
@@ -35,7 +35,7 @@ let
     cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
       inherit src;
       name = "mercurial-${version}";
-      hash = "sha256-mP82UtASD0Fh8ilDDCB6ubY7/MGPoRP6hg6/xRwzwAw=";
+      hash = "sha256-i5AVyi9m7qLLubhV8fBhhZ6/RYOjMdwmv9Bek9pT/xo=";
       sourceRoot = "mercurial-${version}/rust";
     } else null;
     cargoRoot = if rustSupport then "rust" else null;

From b0b178fc293ad71c35d3ac84e8ac856bd0d3492b Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Fri, 2 Aug 2024 04:34:00 +0900
Subject: [PATCH 129/342] pahole: fix clang kernel build

This should fix clang builds for real this time

Reported-by: PedroHLC <root@pedrohlc.com>
---
 pkgs/by-name/pa/pahole/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix
index 14a31958c0e2c..d82c76eb769c9 100644
--- a/pkgs/by-name/pa/pahole/package.nix
+++ b/pkgs/by-name/pa/pahole/package.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/acmel/dwarves/commit/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch";
       hash = "sha256-Le1BAew/a/QKkYNLgSQxEvZ9mEEglUw8URwz1kiheeE=";
     })
+    (fetchpatch {
+      name = "fix-clang-btf-generation-bug-2.patch";
+      url = "https://github.com/acmel/dwarves/commit/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch";
+      hash = "sha256-SMIxLEBjBkprAqVNX1h7nXxAsgbwvCD/Bz7c1ekwg5w=";
+    })
   ];
 
   # Put libraries in "lib" subdirectory, not top level of $out

From e53cf6ca74e8faaa5081137eb367cda363444c07 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 31 Jul 2024 21:15:55 +0200
Subject: [PATCH 130/342] ffmpeg_4: 4.4.4 -> 4.4.5

---
 pkgs/development/libraries/ffmpeg/default.nix |  4 +--
 pkgs/development/libraries/ffmpeg/generic.nix | 30 -------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index a4869184bdc68..f17ef87dd820e 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -18,8 +18,8 @@ let
     );
 
   v4 = {
-    version = "4.4.4";
-    hash = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA=";
+    version = "4.4.5";
+    hash = "sha256-GrKNGYI8kO47Yoi82dMV30ymuXSjxo4gH+yB8jIUa2A=";
   };
 
   v6 = {
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index c780ad1b545a0..f89d76453bdb4 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -403,36 +403,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   patches = []
-    ++ optionals (versionOlder version "5") [
-      (fetchpatch2 {
-        name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135";
-        hash = "sha256-agJgzIzrBTQBAypuCmGXXFo7vw6Iodw5Ny5O5QCKCn8=";
-      })
-      (fetchpatch2 {
-        # Backport fix for binutils-2.41.
-        name = "binutils-2.41.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb";
-        hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY=";
-      })
-      # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks.
-      # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary.
-      (fetchpatch2 {
-        name = "utils-fix_crash_in_ff_seek_frame_binary.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d";
-        hash = "sha256-vqqVACjbCcGL9Qvmg1QArSKqVmOqr8BEr+OxTBDt6mA=";
-        postFetch = ''
-          substituteInPlace "$out" \
-            --replace libavformat/seek.c libavformat/utils.c \
-            --replace 'const AVInputFormat *const ' 'const AVInputFormat *'
-        '';
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-51794.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/50f0f8c53c818f73fe2d752708e2fa9d2a2d8a07";
-        hash = "sha256-5G9lmKjMEa0+vqbA8EEiNIr6QG+PeEoIL+uZP4Hlo28=";
-      })
-    ]
     ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [
       (fetchpatch2 { # this can be removed post 6.1
         name = "fix_build_failure_due_to_PropertyKey_EncoderID";

From e4bb50afcbd3201eb9e2f9ffe398627e606b5040 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 1 Aug 2024 22:38:13 +0200
Subject: [PATCH 131/342] abseil-cpp: 20240116.2 -> 20240722.0

Diff:
https://github.com/abseil/abseil-cpp/compare/20240116.2...20240722.0

Changelog: https://github.com/abseil/abseil-cpp/releases/tag/20240722.0
---
 .../libraries/abseil-cpp/{202401.nix => 202407.nix}  | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/development/libraries/abseil-cpp/{202401.nix => 202407.nix} (77%)

diff --git a/pkgs/development/libraries/abseil-cpp/202401.nix b/pkgs/development/libraries/abseil-cpp/202407.nix
similarity index 77%
rename from pkgs/development/libraries/abseil-cpp/202401.nix
rename to pkgs/development/libraries/abseil-cpp/202407.nix
index 8352007b3413a..49e18c271e64b 100644
--- a/pkgs/development/libraries/abseil-cpp/202401.nix
+++ b/pkgs/development/libraries/abseil-cpp/202407.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "abseil-cpp";
-  version = "20240116.2";
+  version = "20240722.0";
 
   src = fetchFromGitHub {
     owner = "abseil";
     repo = "abseil-cpp";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg=";
+    hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=";
   };
 
   cmakeFlags = [
@@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ gtest ];
 
-  meta = with lib; {
+  meta = {
     description = "Open-source collection of C++ code designed to augment the C++ standard library";
     homepage = "https://abseil.io/";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = [ maintainers.GaetanLepage ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.GaetanLepage ];
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93d5f1b13fad2..5c9b69758007e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19562,13 +19562,13 @@ with pkgs;
       then overrideSDK stdenv { darwinMinVersion = "10.13"; }
       else stdenv;
   };
-  abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix {
+  abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix {
     # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
     stdenv = if stdenv.isDarwin && stdenv.isx86_64
       then overrideSDK stdenv { darwinMinVersion = "10.13"; }
       else stdenv;
   };
-  abseil-cpp = abseil-cpp_202401;
+  abseil-cpp = abseil-cpp_202407;
 
   accountsservice = callPackage ../development/libraries/accountsservice { };
 

From 1327403cbe97566c648e22879850a5ed631c5a01 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:37:01 -0400
Subject: [PATCH 132/342] libtheora: migrate to by-name

---
 .../li}/libtheora/mingw-remove-export.patch                     | 0
 .../libtheora/default.nix => by-name/li/libtheora/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{development/libraries => by-name/li}/libtheora/mingw-remove-export.patch (100%)
 rename pkgs/{development/libraries/libtheora/default.nix => by-name/li/libtheora/package.nix} (100%)

diff --git a/pkgs/development/libraries/libtheora/mingw-remove-export.patch b/pkgs/by-name/li/libtheora/mingw-remove-export.patch
similarity index 100%
rename from pkgs/development/libraries/libtheora/mingw-remove-export.patch
rename to pkgs/by-name/li/libtheora/mingw-remove-export.patch
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/by-name/li/libtheora/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtheora/default.nix
rename to pkgs/by-name/li/libtheora/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 235ca173d66e2..1ff4f5f452dd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22442,8 +22442,6 @@ with pkgs;
 
   libthai = callPackage ../development/libraries/libthai { };
 
-  libtheora = callPackage ../development/libraries/libtheora { };
-
   libthreadar = callPackage ../development/libraries/libthreadar { };
 
   libticables2 = callPackage ../development/libraries/libticables2 { };

From a8a6cb7a0960ceb6599b1a09828402c1fc382336 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:37:17 -0400
Subject: [PATCH 133/342] libtheora: format with nixfmt

---
 pkgs/by-name/li/libtheora/package.nix | 31 +++++++++++++++++++++------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index d529c22c9f670..baf93bbb9f188 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -1,4 +1,13 @@
-{ lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  libogg,
+  libvorbis,
+  pkg-config,
+  autoreconfHook,
+  fetchpatch,
+}:
 
 stdenv.mkDerivation rec {
   pname = "libtheora";
@@ -15,17 +24,25 @@ stdenv.mkDerivation rec {
       url = "https://github.com/xiph/theora/commit/28cc6dbd9b2a141df94f60993256a5fca368fa54.diff";
       sha256 = "16jqrq4h1b3krj609vbpzd5845cvkbh3mwmjrcdg35m490p19x9k";
     })
-  ] ++ lib.optionals stdenv.hostPlatform.isMinGW [
-    ./mingw-remove-export.patch
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ];
 
   configureFlags = [ "--disable-examples" ];
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
   outputDoc = "devdoc";
 
-  nativeBuildInputs = [ pkg-config autoreconfHook ];
-  propagatedBuildInputs = [ libogg libvorbis ];
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ];
+  propagatedBuildInputs = [
+    libogg
+    libvorbis
+  ];
 
   meta = with lib; {
     homepage = "https://www.theora.org/";

From b44d3ef41639ac3654207ea29fece05d9740f7bd Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:40:05 -0400
Subject: [PATCH 134/342] libtheora: modernize

---
 pkgs/by-name/li/libtheora/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index baf93bbb9f188..ff36e19605c59 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -2,11 +2,11 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
+  autoreconfHook,
   libogg,
   libvorbis,
   pkg-config,
-  autoreconfHook,
-  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
   version = "1.1.1";
 
   src = fetchurl {
-    url = "https://downloads.xiph.org/releases/theora/${pname}-${version}.tar.gz";
-    sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
+    url = "https://downloads.xiph.org/releases/theora/libtheora-${version}.tar.gz";
+    hash = "sha256-QJUpVsR4EZKNHnkizaO8H0J+t1aAw8NySckelJBUkWs=";
   };
 
   patches = [
     # fix error in autoconf scripts
     (fetchpatch {
       url = "https://github.com/xiph/theora/commit/28cc6dbd9b2a141df94f60993256a5fca368fa54.diff";
-      sha256 = "16jqrq4h1b3krj609vbpzd5845cvkbh3mwmjrcdg35m490p19x9k";
+      hash = "sha256-M/UULkiklvEay7LyOuCamxWCSvt37QSMzHOsAAnOWJo=";
     })
   ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ];
 
@@ -36,19 +36,20 @@ stdenv.mkDerivation rec {
   outputDoc = "devdoc";
 
   nativeBuildInputs = [
-    pkg-config
     autoreconfHook
+    pkg-config
   ];
+
   propagatedBuildInputs = [
     libogg
     libvorbis
   ];
 
-  meta = with lib; {
-    homepage = "https://www.theora.org/";
+  meta = {
     description = "Library for Theora, a free and open video compression format";
-    license = licenses.bsd3;
+    homepage = "https://www.theora.org/";
+    license = lib.licenses.bsd3;
     maintainers = [ ];
-    platforms = platforms.unix ++ platforms.windows;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
 }

From 3a0ea49b6484b4074462ba884f441274942b1445 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:41:49 -0400
Subject: [PATCH 135/342] libtheora: add pkg-config test

---
 pkgs/by-name/li/libtheora/package.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index ff36e19605c59..f11dc3dd5d66d 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -7,14 +7,15 @@
   libogg,
   libvorbis,
   pkg-config,
+  testers,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libtheora";
   version = "1.1.1";
 
   src = fetchurl {
-    url = "https://downloads.xiph.org/releases/theora/libtheora-${version}.tar.gz";
+    url = "https://downloads.xiph.org/releases/theora/libtheora-${finalAttrs.version}.tar.gz";
     hash = "sha256-QJUpVsR4EZKNHnkizaO8H0J+t1aAw8NySckelJBUkWs=";
   };
 
@@ -45,6 +46,17 @@ stdenv.mkDerivation rec {
     libvorbis
   ];
 
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      moduleNames = [
+        "theora"
+        "theoradec"
+        "theoraenc"
+      ];
+    };
+  };
+
   meta = {
     description = "Library for Theora, a free and open video compression format";
     homepage = "https://www.theora.org/";
@@ -52,4 +64,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
-}
+})

From a654a5db5119bce50dfae0a77c3e7240dc58b56f Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:45:55 -0400
Subject: [PATCH 136/342] libtheora: add getchoo as maintainer

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

diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index f11dc3dd5d66d..5587976552497 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library for Theora, a free and open video compression format";
     homepage = "https://www.theora.org/";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ getchoo ];
     platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
 })

From 5e48c4378570b4783b975fa6cb80a87ecf702159 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 02:51:16 -0400
Subject: [PATCH 137/342] libtheora: add validatePkgConfig hook

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

diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index 5587976552497..df49f3988c01e 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -8,6 +8,7 @@
   libvorbis,
   pkg-config,
   testers,
+  validatePkgConfig,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
+    validatePkgConfig
   ];
 
   propagatedBuildInputs = [

From 9b7f1a3913168bc9b9c070dbc9720dad1d06b49c Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 25 Jul 2024 21:37:05 -0700
Subject: [PATCH 138/342] glslang: add dev and lib outputs to prevent cross
 comp issues

---
 pkgs/development/compilers/glslang/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 5fe11e35a434d..fff581bae4f67 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-slKBFq6NyWHQmJq/YR3LmbGnHyZgRg0hej90tZDOGzA=";
   };
 
+  outputs = [ "bin" "out" "dev" ];
+
   # These get set at all-packages, keep onto them for child drvs
   passthru = {
     spirv-tools = spirv-tools;
@@ -33,16 +35,19 @@ stdenv.mkDerivation rec {
 
   # This is a dirty fix for lib/cmake/SPIRVTargets.cmake:51 which includes this directory
   postInstall = ''
-    mkdir $out/include/External
+    mkdir -p $dev/include/External
+    moveToOutput lib/pkgconfig "''${!outputDev}"
+    moveToOutput lib/cmake "''${!outputDev}"
   '';
 
   # Fix the paths in .pc, even though it's unclear if these .pc are really useful.
   postFixup = ''
-    substituteInPlace $out/lib/pkgconfig/*.pc \
-      --replace '=''${prefix}//' '=/'
+    substituteInPlace $dev/lib/pkgconfig/*.pc \
+      --replace-fail '=''${prefix}//' '=/' \
+      --replace-fail "includedir=$dev/$dev" "includedir=$dev"
 
     # add a symlink for backwards compatibility
-    ln -s $out/bin/glslang $out/bin/glslangValidator
+    ln -s $dev/bin/glslang $dev/bin/glslangValidator
   '';
 
   meta = with lib; {

From 2c15c76d47101962a6ca564a6eb048e9596edec9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 3 Aug 2024 16:21:21 +0200
Subject: [PATCH 139/342] pipewire: restore enableSystemd option

This is important to me, and I volunteer to maintain it going forward,
just I have in the past (e.g. db5ed5d7fb8e ("pipewire: fix
enableSystemd option")).

Partial revert of 3cf28607c140 ("pipewire: remove superfluous args").
---
 pkgs/development/libraries/pipewire/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index f4b411776a666..7e37b5400e1cd 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -5,6 +5,7 @@
 , meson
 , ninja
 , systemd
+, enableSystemd ? true
 , pkg-config
 , docutils
 , doxygen
@@ -14,6 +15,7 @@
 , alsa-lib
 , libjack2
 , libusb1
+, udev
 , libsndfile
 , vulkanSupport ? true
 , vulkan-headers
@@ -118,8 +120,7 @@ stdenv.mkDerivation(finalAttrs: {
     ncurses
     readline
     sbc
-    systemd
-  ]
+  ] ++ (if enableSystemd then [ systemd ] else [ udev ])
   ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ])
   ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ldacbt) ldacbt
   ++ lib.optional zeroconfSupport avahi
@@ -145,9 +146,9 @@ stdenv.mkDerivation(finalAttrs: {
     (lib.mesonEnable "avahi" zeroconfSupport)
     (lib.mesonEnable "gstreamer" true)
     (lib.mesonEnable "gstreamer-device-provider" true)
-    (lib.mesonEnable "systemd" true)
-    (lib.mesonEnable "systemd-system-service" true)
-    (lib.mesonEnable "udev" false)
+    (lib.mesonEnable "systemd" enableSystemd)
+    (lib.mesonEnable "systemd-system-service" enableSystemd)
+    (lib.mesonEnable "udev" (!enableSystemd))
     (lib.mesonEnable "ffmpeg" true)
     (lib.mesonEnable "pw-cat-ffmpeg" true)
     (lib.mesonEnable "bluez5" true)

From ab783af38b189a73bcd455cfe9420ff934684464 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 3 Aug 2024 16:31:55 +0200
Subject: [PATCH 140/342] pipewire: document enableSystemd maintainership

---
 pkgs/development/libraries/pipewire/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 7e37b5400e1cd..d9ddee2b1022d 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -5,7 +5,7 @@
 , meson
 , ninja
 , systemd
-, enableSystemd ? true
+, enableSystemd ? true # enableSystemd=false maintained by maintainers.qyliss.
 , pkg-config
 , docutils
 , doxygen

From f91fb1678a4bdbb276ccb39927da059f9dfb4a14 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 8 Jul 2024 00:29:12 +0200
Subject: [PATCH 141/342] gsl: 2.7.1 -> 2.8

---
 pkgs/development/libraries/gsl/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 7e3d11528a4f0..2211f2d0d99ff 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,16 +1,24 @@
-{ fetchurl, lib, stdenv }:
+{ fetchurl, fetchpatch, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   pname = "gsl";
-  version = "2.7.1";
+  version = "2.8";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnu/gsl/${pname}-${version}.tar.gz";
-    sha256 = "sha256-3LD71DBIgyt1f/mUJpGo3XACbV2g/4VgHlJof23us0s=";
+    hash = "sha256-apnu7RVjLGNUiVsd1ULtWoVcDxXZrRMmxv4rLJ5CMZA=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/macports/macports-ports/raw/90be777d2ce451d3c23783cb2be0efab9732e4d0/math/gsl/files/patch-fix-linking.diff";
+      extraPrefix = "";
+      hash = "sha256-lweYndIxcM5+4ckIUubkD9XbJbqkfdK+y9c3aRzmq0M=";
+    })
+  ];
+
   preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then ''
     MACOSX_DEPLOYMENT_TARGET=10.16
   '' else null;

From 5bc5f138bf15050eebabf80b6fa93178d47c3c69 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 4 Aug 2024 22:08:46 +0200
Subject: [PATCH 142/342] python312Packages.pygsl: fix build with gsl 2.8

---
 pkgs/development/python-modules/pygsl/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/pygsl/default.nix b/pkgs/development/python-modules/pygsl/default.nix
index c8e247f7d2d95..7726badc81978 100644
--- a/pkgs/development/python-modules/pygsl/default.nix
+++ b/pkgs/development/python-modules/pygsl/default.nix
@@ -20,6 +20,14 @@ buildPythonPackage rec {
     hash = "sha256-7agGgfDUgY6mRry7d38vGGNLJC4dFUniy2M/cnejDDs=";
   };
 
+  # error: no member named 'n' in 'gsl_bspline_workspace'
+  postPatch = lib.optionalString (lib.versionAtLeast gsl.version "2.8") ''
+    substituteInPlace src/bspline/bspline.ic \
+      --replace-fail "self->w->n" "self->w->ncontrol"
+    substituteInPlace swig_src/bspline_wrap.c \
+      --replace-fail "self->w->n;" "self->w->ncontrol;"
+  '';
+
   nativeBuildInputs = [
     gsl.dev
     swig

From d55d1d69027dbad2bfb134721194c9514dc5cc02 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 5 Aug 2024 21:56:39 +0100
Subject: [PATCH 143/342] nodejs_22: fix the eval

Without the change the eval fails as:

    $ nix build --no-link -f. nodejs_22
    error:
       error: undefined variable 'fetchpatch2'
       at pkgs/development/web/nodejs/v22.nix:23:6:
           22|     ./bin-sh-node-run-v22.patch
           23|     (fetchpatch2 {
             |      ^
           24|       url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch";
---
 pkgs/development/web/nodejs/v22.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index da9cdded58195..9b3fa4fa0d8b7 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -1,4 +1,4 @@
-{ callPackage, openssl, python3, enableNpm ? true }:
+{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {

From 3342050260fb83ad02a44dbdf49a7cc616d83fa0 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 5 Aug 2024 14:54:23 -0700
Subject: [PATCH 144/342] glslang: fix symlink from dev to use bin

---
 pkgs/development/compilers/glslang/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index fff581bae4f67..9d67dde87c2d4 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       --replace-fail "includedir=$dev/$dev" "includedir=$dev"
 
     # add a symlink for backwards compatibility
-    ln -s $dev/bin/glslang $dev/bin/glslangValidator
+    ln -s $bin/bin/glslang $bin/bin/glslangValidator
   '';
 
   meta = with lib; {

From bbb9f2f1c98768a1ff623fbe730c71d4871646b5 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 2 Aug 2024 14:07:03 -0700
Subject: [PATCH 145/342] stdenv: set the phase in showPhaseHeader

---
 pkgs/stdenv/generic/setup.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index cc69434dc8c98..fc1f6b7d7478a 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1597,6 +1597,13 @@ distPhase() {
 showPhaseHeader() {
     local phase="$1"
     echo "Running phase: $phase"
+
+    # The Nix structured logger allows derivations to update the phase as they're building,
+    # which shows up in the terminal UI. See `handleJSONLogMessage` in the Nix source.
+    if [[ -z ${NIX_LOG_FD-} ]]; then
+        return
+    fi
+    printf "@nix { \"action\": \"setPhase\", \"phase\": \"%s\" }\n" "$phase" >&"$NIX_LOG_FD"
 }
 
 
@@ -1629,8 +1636,6 @@ runPhase() {
     if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then return; fi
     if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then return; fi
 
-    nixLog "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }"
-
     showPhaseHeader "$curPhase"
     dumpVars
 

From 624463391d94d0fc505f50f26f02d95e3a72c60c Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 2 Aug 2024 14:27:08 -0700
Subject: [PATCH 146/342] stdenv: introduce specific logging functions

---
 pkgs/stdenv/generic/setup.sh | 66 +++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index fc1f6b7d7478a..a93f3c25ef7e6 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -12,7 +12,15 @@ fi
 
 shopt -s inherit_errexit
 
-if (( "${NIX_DEBUG:-0}" >= 6 )); then
+# $NIX_DEBUG must be a documented integer level, if set, so we can use it safely as an integer.
+# See the `Verbosity` enum in the Nix source for these levels.
+if ! [[ -z ${NIX_DEBUG-} || $NIX_DEBUG == [0-7] ]]; then
+    printf 'The `NIX_DEBUG` environment variable has an unexpected value: %s\n' "${NIX_DEBUG}"
+    echo "It can only be unset or an integer between 0 and 7."
+    exit 1
+fi
+
+if [[ ${NIX_DEBUG:-0} -ge 6 ]]; then
     set -x
 fi
 
@@ -55,6 +63,62 @@ nixLog() {
     echo "$@" >&"$NIX_LOG_FD"
 }
 
+# All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
+# Corresponds to `Verbosity::lvlError` in the Nix source.
+nixErrorLog() {
+    if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 0 ]]; then return; fi
+    printf "%s\n" "$*" >&"$NIX_LOG_FD"
+}
+
+# All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
+# Corresponds to `Verbosity::lvlWarn` in the Nix source.
+nixWarnLog() {
+    if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 1 ]]; then return; fi
+    printf "%s\n" "$*" >&"$NIX_LOG_FD"
+}
+
+# All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
+# Corresponds to `Verbosity::lvlNotice` in the Nix source.
+nixNoticeLog() {
+    if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 2 ]]; then return; fi
+    printf "%s\n" "$*" >&"$NIX_LOG_FD"
+}
+
+# All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
+# Corresponds to `Verbosity::lvlInfo` in the Nix source.
+nixInfoLog() {
+    if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 3 ]]; then return; fi
+    printf "%s\n" "$*" >&"$NIX_LOG_FD"
+}
+
+# All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
+# Corresponds to `Verbosity::lvlTalkative` in the Nix source.
+nixTalkativeLog() {
+    if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 4 ]]; then return; fi
+    printf "%s\n" "$*" >&"$NIX_LOG_FD"
+}
+
+# All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
+# Corresponds to `Verbosity::lvlChatty` in the Nix source.
+nixChattyLog() {
+    if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 5 ]]; then return; fi
+    printf "%s\n" "$*" >&"$NIX_LOG_FD"
+}
+
+# All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
+# Corresponds to `Verbosity::lvlDebug` in the Nix source.
+nixDebugLog() {
+    if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 6 ]]; then return; fi
+    printf "%s\n" "$*" >&"$NIX_LOG_FD"
+}
+
+# All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
+# Corresponds to `Verbosity::lvlVomit` in the Nix source.
+nixVomitLog() {
+    if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 7 ]]; then return; fi
+    printf "%s\n" "$*" >&"$NIX_LOG_FD"
+}
+
 # Log a hook, to be run before the hook is actually called.
 # logging for "implicit" hooks -- the ones specified directly
 # in derivation's arguments -- is done in _callImplicitHook instead.

From 465dbd2ddf6197f006411a9ff632d9ed2e9c5e38 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 2 Aug 2024 14:41:27 -0700
Subject: [PATCH 147/342] stdenv: log hooks at nixTalkativeLog level
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nix filters out messages with level ≥ 4 by default as of this commit.
---
 pkgs/stdenv/generic/setup.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a93f3c25ef7e6..c248d0b3f9585 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -123,7 +123,7 @@ nixVomitLog() {
 # logging for "implicit" hooks -- the ones specified directly
 # in derivation's arguments -- is done in _callImplicitHook instead.
 _logHook() {
-    # Fast path in case nixLog is no-op.
+    # Fast path in case nixTalkativeLog is no-op.
     if [[ -z ${NIX_LOG_FD-} ]]; then
         return
     fi
@@ -133,14 +133,14 @@ _logHook() {
     shift 2
 
     if declare -F "$hookExpr" > /dev/null 2>&1; then
-        nixLog "calling '$hookKind' function hook '$hookExpr'" "$@"
+        nixTalkativeLog "calling '$hookKind' function hook '$hookExpr'" "$@"
     elif type -p "$hookExpr" > /dev/null; then
-        nixLog "sourcing '$hookKind' script hook '$hookExpr'"
+        nixTalkativeLog "sourcing '$hookKind' script hook '$hookExpr'"
     elif [[ "$hookExpr" != "_callImplicitHook"* ]]; then
         # Here we have a string hook to eval.
-        # Join lines onto one with literal \n characters unless NIX_DEBUG >= 2.
+        # Join lines onto one with literal \n characters unless NIX_DEBUG >= 5.
         local exprToOutput
-        if (( "${NIX_DEBUG:-0}" >= 2 )); then
+        if [[ ${NIX_DEBUG:-0} -ge 5 ]]; then
             exprToOutput="$hookExpr"
         else
             # We have `r'\n'.join([line.lstrip() for lines in text.split('\n')])` at home.
@@ -159,7 +159,7 @@ _logHook() {
             # And then remove the final, unnecessary, \n
             exprToOutput="${exprToOutput%%\\n }"
         fi
-        nixLog "evaling '$hookKind' string hook '$exprToOutput'"
+        nixTalkativeLog "evaling '$hookKind' string hook '$exprToOutput'"
     fi
 }
 
@@ -217,13 +217,13 @@ _callImplicitHook() {
     local def="$1"
     local hookName="$2"
     if declare -F "$hookName" > /dev/null; then
-        nixLog "calling implicit '$hookName' function hook"
+        nixTalkativeLog "calling implicit '$hookName' function hook"
         "$hookName"
     elif type -p "$hookName" > /dev/null; then
-        nixLog "sourcing implicit '$hookName' script hook"
+        nixTalkativeLog "sourcing implicit '$hookName' script hook"
         source "$hookName"
     elif [ -n "${!hookName:-}" ]; then
-        nixLog "evaling implicit '$hookName' string hook"
+        nixTalkativeLog "evaling implicit '$hookName' string hook"
         eval "${!hookName}"
     else
         return "$def"
@@ -769,7 +769,7 @@ activatePackage() {
     (( hostOffset <= targetOffset )) || exit 1
 
     if [ -f "$pkg" ]; then
-        nixLog "sourcing setup hook '$pkg'"
+        nixTalkativeLog "sourcing setup hook '$pkg'"
         source "$pkg"
     fi
 
@@ -793,7 +793,7 @@ activatePackage() {
     fi
 
     if [[ -f "$pkg/nix-support/setup-hook" ]]; then
-        nixLog "sourcing setup hook '$pkg/nix-support/setup-hook'"
+        nixTalkativeLog "sourcing setup hook '$pkg/nix-support/setup-hook'"
         source "$pkg/nix-support/setup-hook"
     fi
 }

From e844424e4f9b8107ca0055c8a67f8a003ee2b2a1 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 2 Aug 2024 14:50:40 -0700
Subject: [PATCH 148/342] stdenv: replace other $NIX_DEBUG log statements

---
 pkgs/stdenv/generic/setup.sh | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index c248d0b3f9585..afdfc4eec8dec 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -55,14 +55,6 @@ getAllOutputNames() {
     fi
 }
 
-# Logs arguments to $NIX_LOG_FD, if it exists, no-op if it does not.
-nixLog() {
-    if [[ -z ${NIX_LOG_FD-} ]]; then
-        return
-    fi
-    echo "$@" >&"$NIX_LOG_FD"
-}
-
 # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set.
 # Corresponds to `Verbosity::lvlError` in the Nix source.
 nixErrorLog() {
@@ -539,10 +531,7 @@ done
 
 unset i
 
-if (( "${NIX_DEBUG:-0}" >= 1 )); then
-    echo "initial path: $PATH"
-fi
-
+nixWarnLog "initial path: $PATH"
 
 # Check that the pre-hook initialised SHELL.
 if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi
@@ -905,11 +894,10 @@ fi
 PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH"
 HOST_PATH="${_HOST_PATH-}${_HOST_PATH:+${HOST_PATH:+:}}$HOST_PATH"
 export XDG_DATA_DIRS="${_XDG_DATA_DIRS-}${_XDG_DATA_DIRS:+${XDG_DATA_DIRS:+:}}${XDG_DATA_DIRS-}"
-if (( "${NIX_DEBUG:-0}" >= 1 )); then
-    echo "final path: $PATH"
-    echo "final host path: $HOST_PATH"
-    echo "final data dirs: $XDG_DATA_DIRS"
-fi
+
+nixWarnLog "final path: $PATH"
+nixWarnLog "final host path: $HOST_PATH"
+nixWarnLog "final data dirs: $XDG_DATA_DIRS"
 
 unset _PATH
 unset _HOST_PATH
@@ -1058,14 +1046,11 @@ substituteInPlace() {
 }
 
 _allFlags() {
-    # export some local variables for the awk below
-    # so some substitutions such as name don't have to be in the env attrset
-    # when __structuredAttrs is enabled
+    # Export some local variables for the `awk` below so some substitutions (such as name)
+    # don't have to be in the env attrset when `__structuredAttrs` is enabled.
     export system pname name version
     while IFS='' read -r varName; do
-        if (( "${NIX_DEBUG:-0}" >= 1 )); then
-            printf "@%s@ -> %q\n" "${varName}" "${!varName}" >&2
-        fi
+        nixWarnLog "@${varName}@" "->" "${!varName}"
         args+=("--subst-var" "$varName")
     done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }')
 }

From d8fbb162190086dbab5fb69adab3ae187f138672 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 5 Aug 2024 16:18:14 -0700
Subject: [PATCH 149/342] stdenv: change the logging in _allFlags to talkative

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index afdfc4eec8dec..fc748aa12a665 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1050,7 +1050,7 @@ _allFlags() {
     # don't have to be in the env attrset when `__structuredAttrs` is enabled.
     export system pname name version
     while IFS='' read -r varName; do
-        nixWarnLog "@${varName}@" "->" "${!varName}"
+        nixTalkativeLog "@${varName}@ -> ${!varName}"
         args+=("--subst-var" "$varName")
     done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }')
 }

From 6fbb06080897ce3fbf58da4776fab7c0aa270d64 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 29 Jul 2024 11:31:53 +0200
Subject: [PATCH 150/342] cargo-c: 0.9.32 -> 0.10.2

Required to build with Rust 1.80.

Link: https://github.com/rust-lang/rust/issues/127343
---
 pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index 8dbd282555d6b..ca0f8a590ebd9 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-c";
-  version = "0.9.31";
+  version = "0.10.2";
 
   src = fetchCrate {
     inherit pname;
     # this version may need to be updated along with package version
-    version = "${version}+cargo-0.78.0";
-    hash = "sha256-RqwUV3e02GykYH/pWHjoent+gix+CD+t3yAQxqUmo54=";
+    version = "${version}+cargo-0.80.0";
+    hash = "sha256-ltxd4n3oo8ZF/G/zmR4FSVtNOkxwCjDv6PdxkmWxZ+8=";
   };
 
-  cargoHash = "sha256-SfKDlcN+PW1twJu3YbmMsQOtFh6JHncAhdrVg+tweAE=";
+  cargoHash = "sha256-UfhIz87s0CLUDbIpWMPzGQ7qVmh14GuiFoquauSbTOw=";
 
   nativeBuildInputs = [ pkg-config (lib.getDev curl) ];
   buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [

From 8a4b60f702b6a6dad7d50746118b8a44ca79ece9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 1 Aug 2024 10:10:21 +0200
Subject: [PATCH 151/342] gst_all_1.gst-plugins-rs: 0.12.4 -> 0.12.8

Required to build with Rust 1.80.

Link: https://github.com/rust-lang/rust/issues/127343
---
 .../libraries/gstreamer/rs/Cargo.lock         | 1255 +++++++++--------
 .../libraries/gstreamer/rs/default.nix        |   10 +-
 2 files changed, 703 insertions(+), 562 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/rs/Cargo.lock b/pkgs/development/libraries/gstreamer/rs/Cargo.lock
index 52c6518bd51f9..7c91f3ef8aeec 100644
--- a/pkgs/development/libraries/gstreamer/rs/Cargo.lock
+++ b/pkgs/development/libraries/gstreamer/rs/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -70,7 +70,7 @@ dependencies = [
  "getrandom",
  "once_cell",
  "version_check",
- "zerocopy 0.7.32",
+ "zerocopy 0.7.34",
 ]
 
 [[package]]
@@ -90,9 +90,9 @@ checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "android-tzdata"
@@ -111,47 +111,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -159,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "arbitrary"
@@ -177,7 +178,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -188,12 +189,11 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "async-channel"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
  "concurrent-queue",
- "event-listener",
  "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
@@ -201,9 +201,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60"
+checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
 dependencies = [
  "flate2",
  "futures-core",
@@ -214,13 +214,13 @@ dependencies = [
 
 [[package]]
 name = "async-recursion"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -242,31 +242,31 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.7.0"
+version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.79"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "async-tungstenite"
-version = "0.25.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cca750b12e02c389c1694d35c16539f88b8bbaa5945934fdc1b41a776688589"
+checksum = "bb786dab48e539c5f17b23bac20d812ac027c01732ed7c7b58850c69a684e46c"
 dependencies = [
  "futures-io",
  "futures-util",
@@ -275,9 +275,15 @@ dependencies = [
  "pin-project-lite",
  "tokio",
  "tokio-native-tls",
- "tungstenite 0.21.0",
+ "tungstenite 0.23.0",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "atomic_refcell"
 version = "0.1.13"
@@ -297,9 +303,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "av1-grain"
@@ -337,7 +343,7 @@ dependencies = [
  "fastrand",
  "hex",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "ring",
  "time",
  "tokio",
@@ -547,7 +553,7 @@ dependencies = [
  "aws-types",
  "bytes",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "once_cell",
  "regex-lite",
  "tracing",
@@ -704,12 +710,12 @@ dependencies = [
  "http 0.2.12",
  "http-body 0.4.6",
  "http-body 1.0.0",
- "hyper 0.14.28",
- "hyper-rustls",
+ "hyper 0.14.29",
+ "hyper-rustls 0.24.2",
  "once_cell",
  "pin-project-lite",
  "pin-utils",
- "rustls",
+ "rustls 0.21.12",
  "tokio",
  "tracing",
 ]
@@ -783,9 +789,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -804,9 +810,9 @@ checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
 
 [[package]]
 name = "base32"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
+checksum = "d1ce0365f4d5fb6646220bb52fe547afd51796d90f914d4063cb0b032ebee088"
 
 [[package]]
 name = "base64"
@@ -822,9 +828,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64-serde"
@@ -875,9 +881,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "bitstream-io"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da"
+checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
 
 [[package]]
 name = "block-buffer"
@@ -914,15 +920,15 @@ checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7"
 
 [[package]]
 name = "built"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53"
+checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17"
 
 [[package]]
 name = "bumpalo"
-version = "3.15.4"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-slice-cast"
@@ -932,9 +938,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 
 [[package]]
 name = "byteorder"
@@ -960,8 +966,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-rs"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "bitflags 2.5.0",
  "cairo-sys-rs",
@@ -972,8 +978,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "glib-sys",
  "libc",
@@ -982,12 +988,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.91"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 dependencies = [
  "jobserver",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
@@ -1008,9 +1015,9 @@ dependencies = [
 
 [[package]]
 name = "cea708-types"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7f33493cb6f19aa19c6e688708f66bf792bc2c75137da2a03c7ebbdf7a44f9"
+checksum = "82b825228dce83e7156c7cd189bcfe5ef8014320deca7dd619787fe594946426"
 dependencies = [
  "env_logger 0.10.2",
  "log",
@@ -1021,9 +1028,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -1037,9 +1044,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -1047,7 +1054,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -1078,7 +1085,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim",
+ "strsim 0.10.0",
 ]
 
 [[package]]
@@ -1090,7 +1097,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1127,15 +1134,15 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "concurrent-queue"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1148,9 +1155,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "cookie"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
 dependencies = [
  "percent-encoding",
  "time",
@@ -1168,12 +1175,12 @@ dependencies = [
 
 [[package]]
 name = "cookie_store"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6"
+checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
 dependencies = [
  "cookie",
- "idna 0.3.0",
+ "idna 0.5.0",
  "log",
  "publicsuffix",
  "serde",
@@ -1219,27 +1226,27 @@ dependencies = [
 
 [[package]]
 name = "crc32c"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2"
+checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
 dependencies = [
  "rustc_version",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1265,9 +1272,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crypto-bigint"
@@ -1344,9 +1351,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1354,37 +1361,38 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
- "syn 2.0.58",
+ "strsim 0.11.1",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "dash-mpd"
-version = "0.16.0"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cafa2c33eff2857e1a14c38aa9a432aa565a01e77804a541fce7aec3affb8f8"
+checksum = "0f8a6df34a2957e8a164afa9265bcb1ea9a07a0df69c5dcda4909e4f650c0850"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "base64-serde",
+ "bytes",
  "chrono",
  "fs-err",
  "iso8601",
@@ -1401,19 +1409,6 @@ dependencies = [
  "xattr",
 ]
 
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.3",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
 [[package]]
 name = "dasp_frame"
 version = "0.11.0"
@@ -1431,9 +1426,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
 name = "data-encoding"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "dav1d"
@@ -1503,9 +1498,9 @@ dependencies = [
 
 [[package]]
 name = "dssim-core"
-version = "3.2.8"
+version = "3.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fafad37c1f4f168243f3ac1b4cae0d358c528ac695670100337314e38d54b486"
+checksum = "0c074fca6cdf5e3faaaf03f71e29cd5d92ea533b1432cf78910dafffc2ce872b"
 dependencies = [
  "imgref",
  "itertools 0.12.1",
@@ -1548,9 +1543,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
 [[package]]
 name = "elliptic-curve"
@@ -1574,9 +1569,9 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if",
 ]
@@ -1614,9 +1609,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1624,9 +1619,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "5.3.0"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1635,9 +1630,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
  "event-listener",
  "pin-project-lite",
@@ -1651,9 +1646,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
 
 [[package]]
 name = "fastrand"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "fdeflate"
@@ -1702,9 +1697,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1831,7 +1826,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1866,8 +1861,8 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "gdk-pixbuf-sys",
  "gio",
@@ -1877,8 +1872,8 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -1889,8 +1884,8 @@ dependencies = [
 
 [[package]]
 name = "gdk4"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "cairo-rs",
  "gdk-pixbuf",
@@ -1903,8 +1898,8 @@ dependencies = [
 
 [[package]]
 name = "gdk4-sys"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -1919,8 +1914,8 @@ dependencies = [
 
 [[package]]
 name = "gdk4-wayland"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "gdk4",
  "gdk4-wayland-sys",
@@ -1931,8 +1926,8 @@ dependencies = [
 
 [[package]]
 name = "gdk4-wayland-sys"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "glib-sys",
  "libc",
@@ -1941,8 +1936,8 @@ dependencies = [
 
 [[package]]
 name = "gdk4-win32"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "gdk4",
  "gdk4-win32-sys",
@@ -1954,8 +1949,8 @@ dependencies = [
 
 [[package]]
 name = "gdk4-win32-sys"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "gdk4-sys",
  "glib-sys",
@@ -1965,8 +1960,8 @@ dependencies = [
 
 [[package]]
 name = "gdk4-x11"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "gdk4",
  "gdk4-x11-sys",
@@ -1977,8 +1972,8 @@ dependencies = [
 
 [[package]]
 name = "gdk4-x11-sys"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "gdk4-sys",
  "glib-sys",
@@ -2007,9 +2002,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2030,14 +2025,14 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "gio"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2053,8 +2048,8 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2065,8 +2060,8 @@ dependencies = [
 
 [[package]]
 name = "glib"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "bitflags 2.5.0",
  "futures-channel",
@@ -2086,20 +2081,20 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "heck 0.5.0",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "glib-sys"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "libc",
  "system-deps",
@@ -2113,8 +2108,8 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "gobject-sys"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "glib-sys",
  "libc",
@@ -2123,8 +2118,8 @@ dependencies = [
 
 [[package]]
 name = "graphene-rs"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "glib",
  "graphene-sys",
@@ -2133,8 +2128,8 @@ dependencies = [
 
 [[package]]
 name = "graphene-sys"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "glib-sys",
  "libc",
@@ -2155,8 +2150,8 @@ dependencies = [
 
 [[package]]
 name = "gsk4"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "cairo-rs",
  "gdk4",
@@ -2169,8 +2164,8 @@ dependencies = [
 
 [[package]]
 name = "gsk4-sys"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -2184,7 +2179,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-audiofx"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "atomic_refcell",
@@ -2206,7 +2201,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-aws"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "async-stream",
  "aws-config",
@@ -2239,7 +2234,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-cdg"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "cdg",
  "cdg_renderer",
@@ -2254,7 +2249,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-claxon"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "atomic_refcell",
  "byte-slice-cast",
@@ -2268,7 +2263,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-closedcaption"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "atomic_refcell",
@@ -2296,7 +2291,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-csound"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "byte-slice-cast",
  "csound",
@@ -2310,7 +2305,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-dav1d"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "dav1d",
  "gst-plugin-version-helper",
@@ -2323,7 +2318,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-fallbackswitch"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gio",
  "gst-plugin-gtk4",
@@ -2341,7 +2336,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-ffv1"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "byte-slice-cast",
  "ffv1",
@@ -2354,7 +2349,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-file"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
@@ -2365,7 +2360,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-flavors"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "byteorder",
  "flavors",
@@ -2381,9 +2376,10 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-fmp4"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
+ "bitstream-io",
  "chrono",
  "dash-mpd",
  "gst-plugin-version-helper",
@@ -2402,7 +2398,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-gif"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "atomic_refcell",
  "gif",
@@ -2415,7 +2411,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-gtk4"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "async-channel",
  "gdk4-wayland",
@@ -2423,6 +2419,7 @@ dependencies = [
  "gdk4-x11",
  "gst-plugin-version-helper",
  "gstreamer",
+ "gstreamer-allocators",
  "gstreamer-base",
  "gstreamer-gl",
  "gstreamer-gl-egl",
@@ -2436,7 +2433,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-hlssink3"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2455,7 +2452,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-hsv"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "byte-slice-cast",
  "gst-plugin-version-helper",
@@ -2470,7 +2467,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-inter"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "futures",
@@ -2488,7 +2485,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-json"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
@@ -2500,7 +2497,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-lewton"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "atomic_refcell",
  "byte-slice-cast",
@@ -2514,7 +2511,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-livesync"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gio",
  "gst-plugin-gtk4",
@@ -2530,9 +2527,10 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-mp4"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
+ "bitstream-io",
  "gst-plugin-version-helper",
  "gstreamer",
  "gstreamer-audio",
@@ -2546,7 +2544,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-ndi"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "atomic_refcell",
@@ -2568,7 +2566,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-onvif"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "cairo-rs",
  "chrono",
@@ -2586,7 +2584,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-png"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
@@ -2599,7 +2597,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-raptorq"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
@@ -2613,7 +2611,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-rav1e"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "atomic_refcell",
  "gst-plugin-version-helper",
@@ -2626,7 +2624,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-regex"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
@@ -2637,7 +2635,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-reqwest"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "bytes",
  "futures",
@@ -2646,18 +2644,18 @@ dependencies = [
  "gstreamer-base",
  "headers 0.4.0",
  "http-body-util",
- "hyper 1.2.0",
+ "hyper 1.3.1",
  "mime",
  "once_cell",
  "pin-project-lite",
- "reqwest 0.12.3",
+ "reqwest 0.12.5",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "gst-plugin-rtp"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "bitstream-io",
  "gst-plugin-version-helper",
@@ -2671,7 +2669,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-rtsp"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "atomic_refcell",
@@ -2686,7 +2684,7 @@ dependencies = [
  "once_cell",
  "rtsp-types",
  "sdp-types",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -2695,7 +2693,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-sodium"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "clap",
  "gst-plugin-version-helper",
@@ -2715,7 +2713,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-spotify"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "futures",
@@ -2730,7 +2728,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-textahead"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
@@ -2739,7 +2737,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-textwrap"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
@@ -2751,7 +2749,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-threadshare"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "async-task",
  "cc",
@@ -2775,14 +2773,14 @@ dependencies = [
  "rand",
  "rustix",
  "slab",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "waker-fn",
  "winapi",
 ]
 
 [[package]]
 name = "gst-plugin-togglerecord"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "either",
  "gio",
@@ -2799,7 +2797,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-tracers"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "gst-plugin-version-helper",
@@ -2811,7 +2809,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-tutorial"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "byte-slice-cast",
  "gst-plugin-version-helper",
@@ -2825,7 +2823,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-uriplaylistbin"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "clap",
@@ -2843,12 +2841,12 @@ name = "gst-plugin-version-helper"
 version = "0.8.2"
 dependencies = [
  "chrono",
- "toml_edit 0.22.9",
+ "toml_edit 0.22.14",
 ]
 
 [[package]]
 name = "gst-plugin-videofx"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "atomic_refcell",
  "cairo-rs",
@@ -2868,7 +2866,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-webp"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
@@ -2881,7 +2879,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-webrtc"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -2937,7 +2935,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-webrtc-signalling"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "anyhow",
  "async-tungstenite",
@@ -2959,7 +2957,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-webrtc-signalling-protocol"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "serde",
  "serde_json",
@@ -2967,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "gst-plugin-webrtchttp"
-version = "0.12.4"
+version = "0.12.8"
 dependencies = [
  "async-recursion",
  "bytes",
@@ -2978,14 +2976,14 @@ dependencies = [
  "gstreamer-webrtc",
  "once_cell",
  "parse_link_header",
- "reqwest 0.12.3",
+ "reqwest 0.12.5",
  "tokio",
 ]
 
 [[package]]
 name = "gstreamer"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "cfg-if",
  "futures-channel",
@@ -2993,7 +2991,7 @@ dependencies = [
  "futures-util",
  "glib",
  "gstreamer-sys",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "libc",
  "muldiv",
  "num-integer",
@@ -3008,10 +3006,34 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "gstreamer-allocators"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
+dependencies = [
+ "glib",
+ "gstreamer",
+ "gstreamer-allocators-sys",
+ "libc",
+ "once_cell",
+]
+
+[[package]]
+name = "gstreamer-allocators-sys"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
 [[package]]
 name = "gstreamer-app"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3024,8 +3046,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-app-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gstreamer-base-sys",
@@ -3036,8 +3058,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-audio"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "cfg-if",
  "glib",
@@ -3052,8 +3074,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-audio-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -3065,8 +3087,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "atomic_refcell",
  "cfg-if",
@@ -3078,8 +3100,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -3090,8 +3112,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-check"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3100,8 +3122,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-check-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -3112,8 +3134,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3126,8 +3148,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-egl"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3138,8 +3160,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-egl-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gstreamer-gl-sys",
@@ -3149,8 +3171,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -3163,8 +3185,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-wayland"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3175,8 +3197,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-wayland-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gstreamer-gl-sys",
@@ -3186,8 +3208,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-x11"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3198,8 +3220,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-gl-x11-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gstreamer-gl-sys",
@@ -3209,8 +3231,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-net"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "gio",
  "glib",
@@ -3220,8 +3242,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-net-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -3232,8 +3254,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-pbutils"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3246,8 +3268,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-pbutils-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -3260,8 +3282,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-rtp"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3271,8 +3293,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-rtp-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gstreamer-base-sys",
@@ -3283,8 +3305,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-sdp"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3293,8 +3315,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-sdp-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gstreamer-sys",
@@ -3304,8 +3326,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -3315,8 +3337,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-utils"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "gstreamer",
  "gstreamer-app",
@@ -3327,8 +3349,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-video"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "cfg-if",
  "futures-channel",
@@ -3344,8 +3366,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-video-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -3357,8 +3379,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-webrtc"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib",
  "gstreamer",
@@ -3369,8 +3391,8 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-webrtc-sys"
-version = "0.22.4"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#f2d3128bf9d0170288ce479bea021f0886617fac"
+version = "0.22.7"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.22#da8c41c6fba41095c94e8d0e8967f051e44bc1ff"
 dependencies = [
  "glib-sys",
  "gstreamer-sdp-sys",
@@ -3381,8 +3403,8 @@ dependencies = [
 
 [[package]]
 name = "gtk4"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "cairo-rs",
  "field-offset",
@@ -3401,21 +3423,19 @@ dependencies = [
 
 [[package]]
 name = "gtk4-macros"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
- "anyhow",
  "proc-macro-crate",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "gtk4-sys"
-version = "0.8.1"
-source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#05d26f6a97a0ccf856b565b4fd796cdf57059084"
+version = "0.8.2"
+source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.8#cf84b5cd36fc1aa31175bc24ff45e8ceb0710dec"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -3451,15 +3471,15 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
  "http 1.1.0",
  "indexmap 2.2.6",
  "slab",
@@ -3476,9 +3496,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -3559,6 +3579,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -3651,12 +3677,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
+ "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
  "pin-project-lite",
@@ -3664,9 +3690,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "httpdate"
@@ -3688,9 +3714,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3703,7 +3729,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -3712,14 +3738,14 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.4",
+ "h2 0.4.5",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
@@ -3741,7 +3767,7 @@ dependencies = [
  "futures",
  "headers 0.3.9",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "tokio",
  "tower-service",
 ]
@@ -3754,12 +3780,29 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "log",
- "rustls",
+ "rustls 0.21.12",
  "rustls-native-certs",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.3.1",
+ "hyper-util",
+ "rustls 0.23.10",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tower-service",
 ]
 
 [[package]]
@@ -3769,7 +3812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -3783,7 +3826,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.2.0",
+ "hyper 1.3.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -3793,18 +3836,18 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
- "hyper 1.2.0",
+ "hyper 1.3.1",
  "pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio",
  "tower",
  "tower-service",
@@ -3942,7 +3985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
  "serde",
 ]
 
@@ -3954,7 +3997,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3974,6 +4017,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "iso8601"
 version = "0.6.1"
@@ -4001,6 +4050,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -4009,9 +4067,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
@@ -4066,9 +4124,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -4088,7 +4146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -4128,7 +4186,7 @@ dependencies = [
  "futures-util",
  "getopts",
  "hex",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "librespot-audio",
  "librespot-connect",
  "librespot-core",
@@ -4197,7 +4255,7 @@ dependencies = [
  "hmac 0.11.0",
  "http 0.2.12",
  "httparse",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "hyper-proxy",
  "librespot-protocol",
  "log",
@@ -4233,7 +4291,7 @@ dependencies = [
  "form_urlencoded",
  "futures-core",
  "hmac 0.11.0",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "libmdns",
  "librespot-core",
  "log",
@@ -4320,9 +4378,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "livekit-api"
@@ -4365,9 +4423,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -4385,7 +4443,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -4435,9 +4493,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
@@ -4481,9 +4539,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -4565,11 +4623,10 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -4638,11 +4695,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
  "rand",
@@ -4650,9 +4706,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
@@ -4671,7 +4727,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4685,11 +4741,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -4698,9 +4753,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
@@ -4718,9 +4773,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
  "memchr",
 ]
@@ -4769,7 +4824,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4824,8 +4879,8 @@ dependencies = [
 
 [[package]]
 name = "pango"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "gio",
  "glib",
@@ -4835,8 +4890,8 @@ dependencies = [
 
 [[package]]
 name = "pango-sys"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -4846,8 +4901,8 @@ dependencies = [
 
 [[package]]
 name = "pangocairo"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "cairo-rs",
  "glib",
@@ -4858,8 +4913,8 @@ dependencies = [
 
 [[package]]
 name = "pangocairo-sys"
-version = "0.19.3"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#5e944f2eff8b344591666754f7ea3b359943ee8c"
+version = "0.19.8"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.19#4dc6fee85588f0dd6d8defdaa100f1cb22b7b8ae"
 dependencies = [
  "cairo-sys-rs",
  "glib-sys",
@@ -4876,9 +4931,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -4886,9 +4941,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -4897,7 +4952,7 @@ dependencies = [
  "redox_syscall",
  "smallvec",
  "thread-id",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -4914,9 +4969,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pbjson"
@@ -4973,9 +5028,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap 2.2.6",
@@ -4998,7 +5053,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -5050,13 +5105,13 @@ checksum = "c135f38778ad324d9e9ee68690bac2c1a51f340fdf96ca13e2ab3914eb2e51d8"
 
 [[package]]
 name = "polling"
-version = "3.6.0"
+version = "3.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.3.9",
+ "hermit-abi 0.4.0",
  "pin-project-lite",
  "rustix",
  "tracing",
@@ -5087,19 +5142,19 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "primal-check"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0"
+checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08"
 dependencies = [
  "num-integer",
 ]
@@ -5149,9 +5204,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
  "unicode-ident",
 ]
@@ -5172,14 +5227,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
 dependencies = [
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "prost"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -5187,12 +5242,12 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
+checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
  "bytes",
- "heck 0.4.1",
+ "heck 0.5.0",
  "itertools 0.12.1",
  "log",
  "multimap 0.10.0",
@@ -5202,28 +5257,28 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.58",
+ "syn 2.0.66",
  "tempfile",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.4"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
 dependencies = [
  "prost",
 ]
@@ -5281,9 +5336,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -5401,23 +5456,23 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -5431,20 +5486,20 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
 name = "regex-lite"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e"
+checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
 
 [[package]]
 name = "regex-syntax"
@@ -5454,9 +5509,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
@@ -5472,7 +5527,7 @@ dependencies = [
  "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -5486,7 +5541,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -5500,23 +5555,24 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "async-compression",
- "base64 0.22.0",
+ "base64 0.22.1",
  "bytes",
  "cookie",
  "cookie_store",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.4",
+ "h2 0.4.5",
  "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.2.0",
+ "hyper 1.3.1",
+ "hyper-rustls 0.27.2",
  "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
@@ -5531,7 +5587,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.1",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -5593,9 +5649,9 @@ dependencies = [
 
 [[package]]
 name = "rtsp-types"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5c11e0af63f1ac6057f9029f7ddf1c677bade51e449f75be25c8b29f59474c"
+checksum = "d9eda23daacde59c9e182db0a25e03f51f0108707169c09b4e5d931885470c5c"
 dependencies = [
  "cookie-factory",
  "nom",
@@ -5617,9 +5673,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
@@ -5656,9 +5712,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.32"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
  "bitflags 2.5.0",
  "errno",
@@ -5669,16 +5725,29 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.10"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
  "sct",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.6.3"
@@ -5706,15 +5775,15 @@ version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.4.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-webpki"
@@ -5726,11 +5795,22 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -5741,6 +5821,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "scc"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ad2bbb0ae5100a07b7a6f2ed7ab5fd0045551a4c507989b7a620046ea3efdc"
+dependencies = [
+ "sdd",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.23"
@@ -5772,6 +5861,12 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "sdd"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d"
+
 [[package]]
 name = "sdp-types"
 version = "0.1.6"
@@ -5798,11 +5893,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -5811,9 +5906,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5821,15 +5916,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
@@ -5845,20 +5940,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",
@@ -5877,9 +5972,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -5898,11 +5993,11 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.7.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
@@ -5916,39 +6011,39 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.7.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "serial_test"
-version = "3.0.0"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d"
+checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d"
 dependencies = [
- "dashmap",
  "futures",
- "lazy_static",
  "log",
+ "once_cell",
  "parking_lot",
+ "scc",
  "serial_test_derive",
 ]
 
 [[package]]
 name = "serial_test_derive"
-version = "3.0.0"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212"
+checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6022,9 +6117,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -6087,9 +6182,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -6144,6 +6239,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "subtle"
 version = "2.5.0"
@@ -6157,15 +6258,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
- "quote",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.58"
+version = "2.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6178,6 +6278,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -6257,7 +6363,7 @@ checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6270,7 +6376,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6287,22 +6393,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6327,9 +6433,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.34"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
@@ -6348,9 +6454,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6373,9 +6479,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -6385,20 +6491,20 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6417,7 +6523,18 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls",
+ "rustls 0.21.12",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls 0.23.10",
+ "rustls-pki-types",
  "tokio",
 ]
 
@@ -6460,35 +6577,34 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.9",
+ "toml_edit 0.22.14",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
@@ -6506,15 +6622,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.9"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.5",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -6530,7 +6646,6 @@ dependencies = [
  "tokio",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
@@ -6565,7 +6680,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6648,6 +6763,25 @@ name = "tungstenite"
 version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 1.1.0",
+ "httparse",
+ "log",
+ "rand",
+ "sha1",
+ "thiserror",
+ "url",
+ "utf-8",
+]
+
+[[package]]
+name = "tungstenite"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
 dependencies = [
  "byteorder",
  "bytes",
@@ -6707,9 +6841,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "untrusted"
@@ -6719,9 +6853,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna 0.5.0",
@@ -6751,9 +6885,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
@@ -6824,9 +6958,9 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 
 [[package]]
 name = "waker-fn"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "walkdir"
@@ -6858,7 +6992,7 @@ dependencies = [
  "futures-util",
  "headers 0.3.9",
  "http 0.2.12",
- "hyper 0.14.28",
+ "hyper 0.14.29",
  "log",
  "mime",
  "mime_guess",
@@ -6903,7 +7037,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
  "wasm-bindgen-shared",
 ]
 
@@ -6937,7 +7071,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6982,11 +7116,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7001,7 +7135,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -7019,7 +7153,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -7039,17 +7173,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
@@ -7060,9 +7195,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -7072,9 +7207,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -7084,9 +7219,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -7096,9 +7237,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -7108,9 +7249,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -7120,9 +7261,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -7132,9 +7273,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
@@ -7147,9 +7288,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.5"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]
@@ -7224,11 +7365,11 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
- "zerocopy-derive 0.7.32",
+ "zerocopy-derive 0.7.34",
 ]
 
 [[package]]
@@ -7239,22 +7380,22 @@ checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 9e8d95b77a908..3e8eec7b8a60e 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -144,7 +144,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-rs";
-  version = "0.12.4";
+  version = "0.12.8";
 
   outputs = [ "out" "dev" ];
 
@@ -153,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "gstreamer";
     repo = "gst-plugins-rs";
     rev = finalAttrs.version;
-    hash = "sha256-Qnp+e1Vww2kWjDG0x2tcigwDdG67I4xnm8+QrBI+o08=";
+    hash = "sha256-AGXKI/0Y2BdaSnpQAt3T/rkYlM8UpQpKm4kMAGd6Dyk=";
     # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
     postFetch = ''
       sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
@@ -178,12 +178,12 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "cairo-rs-0.19.3" = "sha256-TjVXdnlYEfPLbUx1pC84rCC2MlNecECMK2Yo9XKwz9M=";
+      "cairo-rs-0.19.8" = "sha256-AdIUcxxuZVAWQ+KOBTrtsvTu4KtFiXkQPYWT9Avt7Z0=";
       "color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A=";
       "ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
       "flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
-      "gdk4-0.8.1" = "sha256-VPmegFZ/bC8x1vkl3YU208jQ8FCEKLwe6ZDatz4mIvM=";
-      "gstreamer-0.22.4" = "sha256-r5+wOEhTVztDMEu6t47yJ9HIlbXyjdvswUND4l7kPl8=";
+      "gdk4-0.8.2" = "sha256-DZjHlhzrELZ8M5YUM5kSeOphjF7863DmywFgGbZL4Jo=";
+      "gstreamer-0.22.7" = "sha256-vTEDqmyqhj9e7r7N0QfG4uTNBizrU0gTUfLOJ8kU1JE=";
     };
   };
 

From 09d8b504e238cd196a7e24d818f2f57b2c235b3f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 29 Jul 2024 11:44:38 +0200
Subject: [PATCH 152/342] nsncd: unstable-2024-03-18 -> 1.4.1

Required to build with Rust 1.80.

Link: https://github.com/rust-lang/rust/issues/127343
---
 pkgs/os-specific/linux/nsncd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix
index 80dfdb5457fa7..8c302b6270958 100644
--- a/pkgs/os-specific/linux/nsncd/default.nix
+++ b/pkgs/os-specific/linux/nsncd/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nsncd";
-  version = "unstable-2024-03-18";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "twosigma";
     repo = "nsncd";
-    rev =  "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427";
-    hash = "sha256-Bd7qE9MP5coBCkr70TdoJfwYhQpdrn/zmN4KoARcaMI=";
+    rev = "v${version}";
+    hash = "sha256-nTXtIZ/2SBpViCTk3fcv4mUAPjc+DRSEUjSVdNt04A8=";
   };
 
-  cargoHash = "sha256-i1rmc5wxtc631hZy2oM4d6r7od0w8GrG7+/pdM6Gqco=";
+  cargoHash = "sha256-S2kshoM9jEgMLcCTydmQN5DM/sGAv2ENPAAFlaGCedI=";
   checkFlags = [
     # Relies on the test environment to be able to resolve "localhost"
     # on IPv4. That's not the case in the Nix sandbox somehow. Works

From ae0d5d9cc8dd82af36846bc3a4839ae16f98a6df Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 4 Aug 2024 22:28:49 +0200
Subject: [PATCH 153/342] unixODBCDrivers.psql: merge with psqlodbc

The former hasn't been updated in years and broke with the upgrade of
`pkgs.postgresql` to v16 subsequently breaking `qtbase`[1].

There's already `pkgs.psqlodbc` which seems to be the same, but kept
up-to-date and linked against libiodbc. Modify `pkgs.psqlodbc` to
provide both libiodbc and unixodbc variants.

[1] https://github.com/NixOS/nixpkgs/pull/329611#issuecomment-2267513284
---
 .../libraries/psqlodbc/default.nix            | 25 +++++++++++++----
 .../libraries/unixODBCDrivers/default.nix     | 27 ++-----------------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix
index 946cb50359359..0431bb284dab4 100644
--- a/pkgs/development/libraries/psqlodbc/default.nix
+++ b/pkgs/development/libraries/psqlodbc/default.nix
@@ -1,4 +1,9 @@
-{ lib, stdenv, fetchurl, libiodbc, postgresql, openssl }:
+{ lib, stdenv, fetchurl, postgresql, openssl
+, withLibiodbc ? false, libiodbc
+, withUnixODBC ? true, unixODBC
+}:
+
+assert lib.xor withLibiodbc withUnixODBC;
 
 stdenv.mkDerivation rec {
   pname = "psqlodbc";
@@ -9,18 +14,28 @@ stdenv.mkDerivation rec {
     hash = "sha256-r9iS+J0uzujT87IxTxvVvy0CIBhyxuNDHlwxCW7KTIs=";
   };
 
-  buildInputs = [ libiodbc postgresql openssl ];
+  buildInputs = [
+    postgresql
+    openssl
+  ]
+  ++ lib.optional withLibiodbc libiodbc
+  ++ lib.optional withUnixODBC unixODBC;
+
+  passthru = lib.optionalAttrs withUnixODBC {
+    fancyName = "PostgreSQL";
+    driver = "lib/psqlodbcw.so";
+  };
 
   configureFlags = [
-    "--with-iodbc=${libiodbc}"
     "--with-libpq=${lib.getDev postgresql}/bin/pg_config"
-  ];
+  ]
+  ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}";
 
   meta = with lib; {
     homepage = "https://odbc.postgresql.org/";
     description = "ODBC driver for PostgreSQL";
     license = licenses.lgpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 641d051c1c32a..fe181d37f6bf6 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fixDarwinDylibNames, fetchFromGitHub }:
+{ fetchurl, stdenv, unixODBC, cmake, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fixDarwinDylibNames, fetchFromGitHub, psqlodbc }:
 
 # Each of these ODBC drivers can be configured in your odbcinst.ini file using
 # the various passthru and meta values. Of note are:
@@ -16,30 +16,7 @@
 # ''
 
 {
-  psql = stdenv.mkDerivation rec {
-    pname = "psqlodbc";
-    version = "10.01.0000";
-
-    src = fetchurl {
-      url = "mirror://postgresql/odbc/versions/src/${pname}-${version}.tar.gz";
-      sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7";
-    };
-
-    buildInputs = [ unixODBC postgresql ];
-
-    # see the top of the file for an explanation
-    passthru = {
-      fancyName = "PostgreSQL";
-      driver = "lib/psqlodbcw.so";
-    };
-
-    meta = with lib; {
-      description = "Official PostgreSQL ODBC Driver";
-      homepage = "https://odbc.postgresql.org/";
-      license = licenses.lgpl2;
-      platforms = platforms.unix;
-    };
-  };
+  psql = psqlodbc.override { withUnixODBC = true; withLibiodbc = false; };
 
   mariadb = stdenv.mkDerivation rec {
     pname = "mariadb-connector-odbc";

From 4a1b6d3442bf7ef7db3d7dda173b58a3ed25d4f6 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 6 Aug 2024 13:01:25 +0200
Subject: [PATCH 154/342] Revert "nsncd: unstable-2024-03-18 -> 1.4.1"

This reverts commit 09d8b504e238cd196a7e24d818f2f57b2c235b3f, which
accidentally downgraded nsncd.
---
 pkgs/os-specific/linux/nsncd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix
index 8c302b6270958..80dfdb5457fa7 100644
--- a/pkgs/os-specific/linux/nsncd/default.nix
+++ b/pkgs/os-specific/linux/nsncd/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nsncd";
-  version = "1.4.1";
+  version = "unstable-2024-03-18";
 
   src = fetchFromGitHub {
     owner = "twosigma";
     repo = "nsncd";
-    rev = "v${version}";
-    hash = "sha256-nTXtIZ/2SBpViCTk3fcv4mUAPjc+DRSEUjSVdNt04A8=";
+    rev =  "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427";
+    hash = "sha256-Bd7qE9MP5coBCkr70TdoJfwYhQpdrn/zmN4KoARcaMI=";
   };
 
-  cargoHash = "sha256-S2kshoM9jEgMLcCTydmQN5DM/sGAv2ENPAAFlaGCedI=";
+  cargoHash = "sha256-i1rmc5wxtc631hZy2oM4d6r7od0w8GrG7+/pdM6Gqco=";
   checkFlags = [
     # Relies on the test environment to be able to resolve "localhost"
     # on IPv4. That's not the case in the Nix sandbox somehow. Works

From b335dfdd9eef81afd1358e282bbf05f34fded772 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 6 Aug 2024 16:59:45 +0300
Subject: [PATCH 155/342] mesa: cherry-pick patch to fix broken video decoding
 on AMD iGPUs

---
 pkgs/development/libraries/mesa/default.nix         |  5 +++++
 pkgs/development/libraries/mesa/vcn-pagefault.patch | 10 ++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/mesa/vcn-pagefault.patch

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5782ec9fbedf4..6f3f7b45b569e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -138,6 +138,11 @@ in stdenv.mkDerivation {
 
   patches = [
     ./opencl.patch
+
+    # Manual backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30510
+    # Fixes video corruption / crashes when decoding video on AMD iGPUs
+    # FIXME: remove when merged
+    ./vcn-pagefault.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/mesa/vcn-pagefault.patch b/pkgs/development/libraries/mesa/vcn-pagefault.patch
new file mode 100644
index 0000000000000..9b8c7b99c564e
--- /dev/null
+++ b/pkgs/development/libraries/mesa/vcn-pagefault.patch
@@ -0,0 +1,10 @@
+--- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
++++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
+@@ -1390,6 +1390,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn
+                            dummy->dpb.res;
+                addr = dec->ws->buffer_get_virtual_address(dummy_res->buf);
+             }
++            dec->ws->cs_add_buffer(&dec->cs, d->dpb.res->buf, RADEON_USAGE_READWRITE | RADEON_USAGE_SYNCHRONIZED, RADEON_DOMAIN_VRAM);
+             dynamic_dpb_t2->dpbAddrLo[i] = addr;
+             dynamic_dpb_t2->dpbAddrHi[i] = addr >> 32;
+             ++dynamic_dpb_t2->dpbArraySize;

From df74f34c6d96397fd8028901d5225bcb827938c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 30 Jul 2024 01:05:54 +0200
Subject: [PATCH 156/342] python312Packages.glyphtools: disable tests

The setup.py test command has been removed. This package had no tests in
the first place, so we reach partiy by import testing the module.
---
 .../development/python-modules/glyphtools/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/glyphtools/default.nix b/pkgs/development/python-modules/glyphtools/default.nix
index c5c407ed9767d..814c7a74d037b 100644
--- a/pkgs/development/python-modules/glyphtools/default.nix
+++ b/pkgs/development/python-modules/glyphtools/default.nix
@@ -5,7 +5,6 @@
   beziers,
   glyphslib,
   numpy,
-  setuptoolsCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -25,12 +24,10 @@ buildPythonPackage rec {
   ];
 
   # A unit test suite does exist, but it only contains a dummy test that
-  # doesn't test anything. It does import the module though so we still run it.
-  doCheck = true;
-  nativeCheckInputs = [
-    # Upstream apparently prefers the deprecated setuptools 'test' command.
-    setuptoolsCheckHook
-  ];
+  # imports the library.
+  doCheck = false;
+
+  pythonImportsCheck = [ "glyphtools" ];
 
   meta = with lib; {
     description = "Python library for extracting information from font glyphs";

From 471d15382485e4ea6c2f2cdbd6377d37304c5228 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 30 Jul 2024 02:06:53 +0200
Subject: [PATCH 157/342] whipper: test with pytest

---
 pkgs/applications/audio/whipper/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index 179bb96660859..b6ff1f45440c7 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -21,6 +21,7 @@ let
 in python3.pkgs.buildPythonApplication rec {
   pname = "whipper";
   version = "0.10.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "whipper-team";
@@ -38,14 +39,15 @@ in python3.pkgs.buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = [
     installShellFiles
     wrapGAppsNoGuiHook
     gobject-introspection
+  ];
 
-    setuptools-scm
+  build-system = with python3.pkgs; [
     docutils
-    setuptoolsCheckHook
+    setuptools-scm
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -63,6 +65,7 @@ in python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = with python3.pkgs; [
     twisted
+    pytestCheckHook
   ] ++ bins;
 
   makeWrapperArgs = [

From c4a5a7dd972ed1e3e8ff4c210bae8584d844ca50 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 30 Jul 2024 02:07:06 +0200
Subject: [PATCH 158/342] python312Packages.pycdio: fix tests on 3.12

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

diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix
index 78a620eb0dd76..994b6ff390c21 100644
--- a/pkgs/development/python-modules/pycdio/default.nix
+++ b/pkgs/development/python-modules/pycdio/default.nix
@@ -23,6 +23,8 @@ buildPythonPackage rec {
       --replace 'library_dirs=library_dirs' 'library_dirs=[dir.decode("utf-8") for dir in library_dirs]' \
       --replace 'include_dirs=include_dirs' 'include_dirs=[dir.decode("utf-8") for dir in include_dirs]' \
       --replace 'runtime_library_dirs=runtime_lib_dirs' 'runtime_library_dirs=[dir.decode("utf-8") for dir in runtime_lib_dirs]'
+    substituteInPlace test/test-cdtext.py \
+      --replace-fail assertEquals assertEqual
   '';
 
   preConfigure = ''

From 102305ea0b353ad8c1b12670b60cc6ff839d91cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 30 Jul 2024 04:20:30 +0200
Subject: [PATCH 159/342] python312Packages.apsw: test with pytest

---
 .../python-modules/apsw/default.nix           | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index cf38790288698..e23aa93ccec79 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -2,8 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  python,
   pythonOlder,
+  pytestCheckHook,
   setuptools,
   sqlite,
 }:
@@ -26,12 +26,19 @@ buildPythonPackage rec {
 
   buildInputs = [ sqlite ];
 
-  # Project uses custom test setup to exclude some tests by default, so using pytest
-  # requires more maintenance
-  # https://github.com/rogerbinns/apsw/issues/335
-  checkPhase = ''
-    ${python.interpreter} setup.py test
-  '';
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "apsw/tests.py" ];
+
+  disabledTests = [
+    # we don't build the test extension
+    "testLoadExtension"
+    "testShell"
+    "testVFS"
+    "testVFSWithWAL"
+    # no lines in errout.txt
+    "testWriteUnraisable"
+  ];
 
   pythonImportsCheck = [ "apsw" ];
 

From 976cb96fe0e7a601f6ac322e9404bfa6466e7306 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 30 Jul 2024 04:21:26 +0200
Subject: [PATCH 160/342] python312Packages.serpent: test with pytest

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

diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix
index 529eb8bfdfeb4..f6ddf55407032 100644
--- a/pkgs/development/python-modules/serpent/default.nix
+++ b/pkgs/development/python-modules/serpent/default.nix
@@ -2,11 +2,11 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python,
   isPy27,
   enum34,
   attrs,
   pytz,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -24,10 +24,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     attrs
     pytz
+    pytestCheckHook
   ];
-  checkPhase = ''
-    ${python.interpreter} setup.py test
-  '';
 
   meta = with lib; {
     description = "Simple serialization library based on ast.literal_eval";

From 0b0dd33e0ad51b5059008fdfdfdef1510bc049dd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 30 Jul 2024 01:03:02 +0200
Subject: [PATCH 161/342] python312Packages.setuptoolsCheckHook: remove

The hook relied on the `test` command passed to `setup.py`, which has
long been deprecated and finally removed in setuptools 72.0.
---
 doc/languages-frameworks/python.section.md     |  1 -
 .../interpreters/python/hooks/default.nix      |  9 +--------
 .../python/hooks/pytest-check-hook.sh          | 12 ------------
 .../python/hooks/setuptools-check-hook.sh      | 18 ------------------
 .../python/hooks/unittest-check-hook.sh        | 12 ------------
 .../python/mk-python-derivation.nix            |  9 +--------
 .../python/python2/mk-python-derivation.nix    |  9 +--------
 7 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 5a2e2de2edef0..e5447d9860882 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -475,7 +475,6 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function).
   See [example usage](#using-pythonrelaxdepshook).
 - `pythonRemoveBinBytecode` to remove bytecode from the `/bin` folder.
 - `setuptoolsBuildHook` to build a wheel using `setuptools`.
-- `setuptoolsCheckHook` to run tests with `python setup.py test`.
 - `sphinxHook` to build documentation and manpages using Sphinx.
 - `venvShellHook` to source a Python 3 `venv` at the `venvDir` location. A
   `venv` is created if it does not yet exist. `postVenvCreation` can be used to
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index c61cd77fc7ecd..ca70d452c8087 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -200,14 +200,7 @@ in {
       };
     } ./setuptools-build-hook.sh) {};
 
-  setuptoolsCheckHook = callPackage ({ makePythonHook, setuptools }:
-    makePythonHook {
-      name = "setuptools-check-hook";
-      propagatedBuildInputs = [ setuptools ];
-      substitutions = {
-        inherit pythonCheckInterpreter setuppy;
-      };
-    } ./setuptools-check-hook.sh) {};
+  setuptoolsCheckHook = throw "The setuptoolsCheckHook has been removed, since the test command has been removed in setuptools 72.0";
 
     setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust }:
       makePythonHook {
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
index 0f708f888292b..06694e79e4928 100644
--- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
@@ -59,16 +59,4 @@ function pytestCheckPhase() {
 if [ -z "${dontUsePytestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then
     echo "Using pytestCheckPhase"
     preDistPhases+=" pytestCheckPhase"
-
-    # It's almost always the case that setuptoolsCheckPhase should not be ran
-    # when the pytestCheckHook is being ran
-    if [ -z "${useSetuptoolsCheck-}" ]; then
-        dontUseSetuptoolsCheck=1
-
-        # Remove command if already injected into preDistPhases
-        if [[ "$preDistPhases" =~ "setuptoolsCheckPhase" ]]; then
-            echo "Removing setuptoolsCheckPhase"
-            preDistPhases=${preDistPhases/setuptoolsCheckPhase/}
-        fi
-    fi
 fi
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
deleted file mode 100644
index 88b7b11931b02..0000000000000
--- a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Setup hook for setuptools.
-echo "Sourcing setuptools-check-hook"
-
-setuptoolsCheckPhase() {
-    echo "Executing setuptoolsCheckPhase"
-    runHook preCheck
-
-    cp -f @setuppy@ nix_run_setup
-    @pythonCheckInterpreter@ nix_run_setup test
-
-    runHook postCheck
-    echo "Finished executing setuptoolsCheckPhase"
-}
-
-if [ -z "${dontUseSetuptoolsCheck-}" ] && [ -z "${installCheckPhase-}" ]; then
-    echo "Using setuptoolsCheckPhase"
-    preDistPhases+=" setuptoolsCheckPhase"
-fi
diff --git a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh
index 3485fcc79452a..f4bd34747730e 100644
--- a/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/unittest-check-hook.sh
@@ -14,16 +14,4 @@ unittestCheckPhase() {
 if [ -z "${dontUseUnittestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then
     echo "Using unittestCheckPhase"
     preDistPhases+=" unittestCheckPhase"
-
-    # It's almost always the case that setuptoolsCheckPhase should not be ran
-    # when the unittestCheckHook is being ran
-    if [ -z "${useSetuptoolsCheck-}" ]; then
-        dontUseSetuptoolsCheck=1
-
-        # Remove command if already injected into preDistPhases
-        if [[ "$preDistPhases" =~ "setuptoolsCheckPhase" ]]; then
-            echo "Removing setuptoolsCheckPhase"
-            preDistPhases=${preDistPhases/setuptoolsCheckPhase/}
-        fi
-    fi
 fi
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 0d6ab22249916..d75fea0eaef14 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -22,7 +22,6 @@
 , pythonRemoveTestsDirHook
 , pythonRuntimeDepsCheckHook
 , setuptoolsBuildHook
-, setuptoolsCheckHook
 , wheelUnpackHook
 , eggUnpackHook
 , eggBuildHook
@@ -313,13 +312,7 @@ let
     # Python packages don't have a checkPhase, only an installCheckPhase
     doCheck = false;
     doInstallCheck = attrs.doCheck or true;
-    nativeInstallCheckInputs = [
-    ] ++ optionals (format' == "setuptools") [
-      # Longer-term we should get rid of this and require
-      # users of this function to set the `installCheckPhase` or
-      # pass in a hook that sets it.
-      setuptoolsCheckHook
-    ] ++ nativeCheckInputs;
+    nativeInstallCheckInputs = nativeCheckInputs;
     installCheckInputs = checkInputs;
 
     postFixup = optionalString (!dontWrapPythonPrograms) ''
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index d0d8a9d0dca8f..0fb6a5d57f220 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -19,7 +19,6 @@
 , pythonRemoveBinBytecodeHook
 , pythonRemoveTestsDirHook
 , setuptoolsBuildHook
-, setuptoolsCheckHook
 , wheelUnpackHook
 , eggUnpackHook
 , eggBuildHook
@@ -210,13 +209,7 @@ let
     # Python packages don't have a checkPhase, only an installCheckPhase
     doCheck = false;
     doInstallCheck = attrs.doCheck or true;
-    nativeInstallCheckInputs = [
-    ] ++ lib.optionals (format == "setuptools") [
-      # Longer-term we should get rid of this and require
-      # users of this function to set the `installCheckPhase` or
-      # pass in a hook that sets it.
-      setuptoolsCheckHook
-    ] ++ nativeCheckInputs;
+    nativeInstallCheckInputs = nativeCheckInputs;
     installCheckInputs = checkInputs;
 
     postFixup = lib.optionalString (!dontWrapPythonPrograms) ''

From 9253653383e968abc638d54b3b9866d7c8355dca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 30 Jul 2024 02:24:22 +0200
Subject: [PATCH 162/342] python312Packages.setuptools: 70.0.0 -> 72.1.0

https://setuptools.pypa.io/en/stable/history.html#v72-1-0
---
 .../python-modules/setuptools/default.nix     |  4 +-
 .../setuptools/setuptools-distutils-C++.patch | 53 +++++++++----------
 .../python-modules/setuptools/tag-date.patch  |  7 +--
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 9614680b08f88..7882a9363860a 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "setuptools";
-  version = "70.0.0";
+  version = "72.1.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "setuptools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LXF3R9zfWylvihP2M8N94/IlgifwxUwKJFhtvcXEPB0=";
+    hash = "sha256-3Hm9HxJdSmyhHtDZeMF76HaR17vZwZWYYhS6Z0nA8rU=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
index 16dfd34c2def2..10eae862de8a5 100644
--- a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
+++ b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch
@@ -1,8 +1,8 @@
 diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py
-index 539f09d8f..a3d3020cb 100644
+index 7b812fd05..c122a4318 100644
 --- a/setuptools/_distutils/cygwinccompiler.py
 +++ b/setuptools/_distutils/cygwinccompiler.py
-@@ -99,14 +99,19 @@ class CygwinCCompiler(UnixCCompiler):
+@@ -99,14 +99,18 @@ class CygwinCCompiler(UnixCCompiler):
          self.cxx = os.environ.get('CXX', 'g++')
  
          self.linker_dll = self.cc
@@ -10,19 +10,18 @@ index 539f09d8f..a3d3020cb 100644
          shared_option = "-shared"
  
          self.set_executables(
-             compiler='%s -mcygwin -O -Wall' % self.cc,
-             compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc,
-+            compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx,
-             compiler_cxx='%s -mcygwin -O -Wall' % self.cxx,
-             linker_exe='%s -mcygwin' % self.cc,
+             compiler=f'{self.cc} -mcygwin -O -Wall',
+             compiler_so=f'{self.cc} -mcygwin -mdll -O -Wall',
++            compiler_so_cxx=f'{self.cxx} -mcygwin -mdll -O -Wall',
+             compiler_cxx=f'{self.cxx} -mcygwin -O -Wall',
+             linker_exe=f'{self.cc} -mcygwin',
              linker_so=(f'{self.linker_dll} -mcygwin {shared_option}'),
-+            linker_exe_cxx='%s -mcygwin' % self.cxx,
-+            linker_so_cxx=('%s -mcygwin %s' %
-+                (self.linker_dll_cxx, shared_option)),
++            linker_exe_cxx=f'{self.cxx} -mcygwin',
++            linker_so_cxx=(f'{self.cxx} -mcygwin {shared_option}'),
          )
  
          # Include the appropriate MSVC runtime library if Python was built
-@@ -138,9 +143,12 @@ class CygwinCCompiler(UnixCCompiler):
+@@ -138,9 +142,12 @@ class CygwinCCompiler(UnixCCompiler):
                  raise CompileError(msg)
          else:  # for other files use the C-compiler
              try:
@@ -38,24 +37,24 @@ index 539f09d8f..a3d3020cb 100644
              except DistutilsExecError as msg:
                  raise CompileError(msg)
  
-@@ -276,9 +284,12 @@ class Mingw32CCompiler(CygwinCCompiler):
+@@ -276,9 +283,12 @@ class Mingw32CCompiler(CygwinCCompiler):
          self.set_executables(
-             compiler='%s -O -Wall' % self.cc,
-             compiler_so='%s -mdll -O -Wall' % self.cc,
-+            compiler_so_cxx='%s -mdll -O -Wall' % self.cxx,
-             compiler_cxx='%s -O -Wall' % self.cxx,
-             linker_exe='%s' % self.cc,
+             compiler=f'{self.cc} -O -Wall',
+             compiler_so=f'{self.cc} -shared -O -Wall',
++            compiler_so_cxx=f'{self.cxx} -mdll -O -Wall',
+             compiler_cxx=f'{self.cxx} -O -Wall',
+             linker_exe=f'{self.cc}',
              linker_so=f'{self.linker_dll} {shared_option}',
-+            linker_exe_cxx='%s' % self.cxx,
-+            linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option)
++            linker_exe_cxx=f'{self.cxx}',
++            linker_so_cxx=f'{self.linker_dll_cxx} {shared_option}',
          )
  
      def runtime_library_dir_option(self, dir):
 diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py
-index 1a38e9fa7..034ed6566 100644
+index 7ebe67687..a995edf80 100644
 --- a/setuptools/_distutils/sysconfig.py
 +++ b/setuptools/_distutils/sysconfig.py
-@@ -300,6 +300,7 @@ def customize_compiler(compiler):  # noqa: C901
+@@ -304,6 +304,7 @@ def customize_compiler(compiler):  # noqa: C901
              cflags,
              ccshared,
              ldshared,
@@ -63,7 +62,7 @@ index 1a38e9fa7..034ed6566 100644
              shlib_suffix,
              ar,
              ar_flags,
-@@ -309,11 +310,14 @@ def customize_compiler(compiler):  # noqa: C901
+@@ -313,11 +314,14 @@ def customize_compiler(compiler):  # noqa: C901
              'CFLAGS',
              'CCSHARED',
              'LDSHARED',
@@ -78,7 +77,7 @@ index 1a38e9fa7..034ed6566 100644
          if 'CC' in os.environ:
              newcc = os.environ['CC']
              if 'LDSHARED' not in os.environ and ldshared.startswith(cc):
-@@ -325,19 +329,27 @@ def customize_compiler(compiler):  # noqa: C901
+@@ -329,19 +333,27 @@ def customize_compiler(compiler):  # noqa: C901
              cxx = os.environ['CXX']
          if 'LDSHARED' in os.environ:
              ldshared = os.environ['LDSHARED']
@@ -107,7 +106,7 @@ index 1a38e9fa7..034ed6566 100644
          if 'AR' in os.environ:
              ar = os.environ['AR']
          if 'ARFLAGS' in os.environ:
-@@ -346,13 +358,17 @@ def customize_compiler(compiler):  # noqa: C901
+@@ -350,13 +362,17 @@ def customize_compiler(compiler):  # noqa: C901
              archiver = ar + ' ' + ar_flags
  
          cc_cmd = cc + ' ' + cflags
@@ -127,7 +126,7 @@ index 1a38e9fa7..034ed6566 100644
          )
  
 diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py
-index 0248bde87..9508e6cff 100644
+index 7e68596b2..7214dbd20 100644
 --- a/setuptools/_distutils/unixccompiler.py
 +++ b/setuptools/_distutils/unixccompiler.py
 @@ -118,9 +118,12 @@ class UnixCCompiler(CCompiler):
@@ -144,7 +143,7 @@ index 0248bde87..9508e6cff 100644
          'archiver': ["ar", "-cr"],
          'ranlib': None,
      }
-@@ -184,8 +187,13 @@ class UnixCCompiler(CCompiler):
+@@ -187,8 +190,13 @@ class UnixCCompiler(CCompiler):
  
      def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
          compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs)
@@ -159,7 +158,7 @@ index 0248bde87..9508e6cff 100644
          except DistutilsExecError as msg:
              raise CompileError(msg)
  
-@@ -253,7 +261,8 @@ class UnixCCompiler(CCompiler):
+@@ -256,7 +264,8 @@ class UnixCCompiler(CCompiler):
                  # building an executable or linker_so (with shared options)
                  # when building a shared library.
                  building_exe = target_desc == CCompiler.EXECUTABLE
diff --git a/pkgs/development/python-modules/setuptools/tag-date.patch b/pkgs/development/python-modules/setuptools/tag-date.patch
index 441177a5d17e4..30ed812c67409 100644
--- a/pkgs/development/python-modules/setuptools/tag-date.patch
+++ b/pkgs/development/python-modules/setuptools/tag-date.patch
@@ -1,12 +1,9 @@
 diff --git a/setup.cfg b/setup.cfg
-index f23714b6..8aaeb330 100644
+index 38922089a..a743a2467 100644
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -1,6 +1,6 @@
+@@ -1,3 +1,3 @@
  [egg_info]
  tag_build = .post
 -tag_date = 1
 +tag_date = 0
-
- [aliases]
- clean_egg_info = egg_info -Db ''

From a65d78dd315e212219c1a7101beefcd73d363d6d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 31 Jul 2024 15:30:34 +0200
Subject: [PATCH 163/342] python312Packages.intervaltree: migrate to pytest and
 pep517 lingo

---
 .../python-modules/intervaltree/default.nix   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix
index a611124c5a5e0..eb9511c9e70ab 100644
--- a/pkgs/development/python-modules/intervaltree/default.nix
+++ b/pkgs/development/python-modules/intervaltree/default.nix
@@ -2,30 +2,29 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python,
-  pytest,
+  setuptools,
+  pytestCheckHook,
   sortedcontainers,
 }:
 
 buildPythonPackage rec {
   version = "3.1.0";
-  format = "setuptools";
   pname = "intervaltree";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "902b1b88936918f9b2a19e0e5eb7ccb430ae45cde4f39ea4b36932920d33952d";
   };
 
-  buildInputs = [ pytest ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ sortedcontainers ];
+  dependencies = [ sortedcontainers ];
 
-  checkPhase = ''
-    runHook preCheck
-    rm build -rf
-    ${python.interpreter} nix_run_setup test
-    runHook postCheck
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  preCheck = ''
+    rm -rf build
   '';
 
   meta = with lib; {

From ab0e29728635f2c48cd5f3c7b75ee299528c8616 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 31 Jul 2024 16:21:29 +0200
Subject: [PATCH 164/342] python312Packages.scikit-build: 0.17.6 -> 0.18.0

https://github.com/scikit-build/scikit-build/releases/tag/0.18.0
---
 .../python-modules/scikit-build/default.nix   | 21 ++++------
 .../python312-compatibility.patch             | 40 -------------------
 2 files changed, 8 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/development/python-modules/scikit-build/python312-compatibility.patch

diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index 2071f2ca4dece..f5c54e856e247 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -24,27 +24,22 @@
 
 buildPythonPackage rec {
   pname = "scikit-build";
-  version = "0.17.6";
-  format = "pyproject";
+  version = "0.18.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "scikit_build";
     inherit version;
-    hash = "sha256-tRpRo2s3xCZQmUtQR5EvWbIuMhCyPjIfKHYR+e9uXJ0=";
+    hash = "sha256-caE69GfRo4UQw0lHhuLttz6tU+qSK95uUZ3FNyqmUJY=";
   };
 
   patches = [
-    # https://github.com/scikit-build/scikit-build/pull/1032
-    # https://github.com/scikit-build/scikit-build/issues/1047
-    ./python312-compatibility.patch
-
     (fetchpatch2 {
-      # https://github.com/scikit-build/scikit-build/pull/1073
-      name = "skbuild-suppress-permissionerror.patch";
-      url = "https://github.com/scikit-build/scikit-build/commit/41183413e4f5ef29cf3d21e470a2cfa2305733f8.patch";
-      hash = "sha256-M5Sbt4CBuiAeGgN0D/toglVi1V2GlA9hPIOMzcqOwdo=";
+      name = "setuptools-70.2.0-compat.patch";
+      url = "https://github.com/scikit-build/scikit-build/commit/7005897053bc5c71d823c36bbd89bd43121670f1.patch";
+      hash = "sha256-YGNCS1AXnqHQMd40CDePVNAzLe5gQ/nJxASAZafsxK8=";
     })
   ];
 
@@ -54,13 +49,13 @@ buildPythonPackage rec {
     sed -i "/'error',/d" pyproject.toml
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-fancy-pypi-readme
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     distro
     packaging
     setuptools
diff --git a/pkgs/development/python-modules/scikit-build/python312-compatibility.patch b/pkgs/development/python-modules/scikit-build/python312-compatibility.patch
deleted file mode 100644
index 8e86eccf010b7..0000000000000
--- a/pkgs/development/python-modules/scikit-build/python312-compatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/skbuild/resources/cmake/FindPythonExtensions.cmake b/skbuild/resources/cmake/FindPythonExtensions.cmake
-index 59b30c2..62298d5 100644
---- a/skbuild/resources/cmake/FindPythonExtensions.cmake
-+++ b/skbuild/resources/cmake/FindPythonExtensions.cmake
-@@ -254,19 +254,23 @@ endif()
- include(targetLinkLibrariesWithDynamicLookup)
- 
- set(_command "
--import distutils.sysconfig
-+import sys
-+
-+if sys.version_info >= (3,10):
-+  import sysconfig
-+else:
-+  from distutils import sysconfig
- import itertools
- import os
- import os.path
- import site
--import sys
- 
- result = None
- rel_result = None
- candidate_lists = []
- 
- try:
--    candidate_lists.append((distutils.sysconfig.get_python_lib(),))
-+    candidate_lists.append((sysconfig.get_python_lib(),))
- except AttributeError: pass
- 
- try:
-@@ -293,7 +297,7 @@ sys.stdout.write(\";\".join((
-     sys.prefix,
-     result,
-     rel_result,
--    distutils.sysconfig.get_config_var('EXT_SUFFIX')
-+    sysconfig.get_config_var('EXT_SUFFIX')
- )))
- ")
- 

From 1b87ff961d8ff66f948735b3e975d170b89353a0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 31 Jul 2024 17:21:51 +0200
Subject: [PATCH 165/342] python312Packages.pytest-fixture-config: patch out
 tests_require

The source is also reused in pytest-server-fixtures, pytest-shutil and
pytest-virtualenv, which now inherit the patch.
---
 .../pytest-fixture-config/default.nix         |   8 +-
 .../setuptools-72.0-compat.patch              | 396 ++++++++++++++++++
 .../pytest-server-fixtures/default.nix        |   8 +-
 .../python-modules/pytest-shutil/default.nix  |  13 +-
 .../pytest-virtualenv/default.nix             |   8 +-
 5 files changed, 419 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest-fixture-config/setuptools-72.0-compat.patch

diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix
index ebc3fcdc4ba4a..3c94e6de6c98f 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -7,7 +7,7 @@
   pytest,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pytest-fixture-config";
   version = "1.7.1-unstable-2022-10-03";
   pyproject = true;
@@ -19,7 +19,11 @@ buildPythonPackage rec {
     hash = "sha256-huN3RzwtfVf4iMJ96VRP/ldOxTUlUMF1wJIdbcGXHn4=";
   };
 
-  sourceRoot = "${src.name}/pytest-fixture-config";
+  patches = [ ./setuptools-72.0-compat.patch ];
+
+  postPatch = ''
+    cd pytest-fixture-config
+  '';
 
   nativeBuildInputs = [
     setuptools
diff --git a/pkgs/development/python-modules/pytest-fixture-config/setuptools-72.0-compat.patch b/pkgs/development/python-modules/pytest-fixture-config/setuptools-72.0-compat.patch
new file mode 100644
index 0000000000000..d44180e5957da
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-fixture-config/setuptools-72.0-compat.patch
@@ -0,0 +1,396 @@
+diff --git a/common_setup.py b/common_setup.py
+index 002952b..11ca9c9 100644
+--- a/common_setup.py
++++ b/common_setup.py
+@@ -1,45 +1,5 @@
+ # Common setup.py code shared between all the projects in this repository
+-import sys
+ import os
+-import logging
+-
+-from setuptools.command.test import test as TestCommand
+-from setuptools.command.egg_info import egg_info as EggInfoCommand
+-
+-
+-class PyTest(TestCommand):
+-    pytest_args = []
+-    src_dir = None
+-
+-    def initialize_options(self):
+-        TestCommand.initialize_options(self)
+-
+-    def finalize_options(self):
+-        TestCommand.finalize_options(self)
+-        self.test_args = []
+-        self.test_suite = True
+-
+-    def run_tests(self):
+-        global pytest_args
+-        logging.basicConfig(format='%(asctime)s %(levelname)s %(name)s %(message)s', level='DEBUG')
+-
+-        # import here, cause outside the eggs aren't loaded
+-        import pytest
+-
+-        self.pytest_args.extend(['--junitxml', 'junit.xml'])
+-        errno = pytest.main(self.pytest_args)
+-        sys.exit(errno)
+-
+-
+-class EggInfo(EggInfoCommand):
+-    """ Customisation of the package metadata creation. Changes are:
+-         - Save the test requirements into an extra called 'tests'
+-    """
+-    def run(self):
+-        if self.distribution.extras_require is None:
+-            self.distribution.extras_require = {}
+-        self.distribution.extras_require['tests'] = self.distribution.tests_require
+-        EggInfoCommand.run(self)
+ 
+ 
+ def common_setup(src_dir):
+@@ -57,13 +17,6 @@ def common_setup(src_dir):
+         long_description = open(readme_file).read()
+         changelog = open(changelog_file).read()
+ 
+-    # Gather trailing arguments for pytest, this can't be done using setuptools' api
+-    if 'test' in sys.argv:
+-        PyTest.pytest_args = sys.argv[sys.argv.index('test') + 1:]
+-        if PyTest.pytest_args:
+-            sys.argv = sys.argv[:-len(PyTest.pytest_args)]
+-    PyTest.src_dir = src_dir
+-
+     return dict(
+             # Version is shared between all the projects in this repo
+             version=open(version_file).read().strip(),
+@@ -71,6 +24,5 @@ def common_setup(src_dir):
+             url='https://github.com/manahl/pytest-plugins',
+             license='MIT license',
+             platforms=['unix', 'linux'],
+-            cmdclass={'test': PyTest, 'egg_info': EggInfo},
+             include_package_data=True
+             )
+diff --git a/pytest-devpi-server/setup.py b/pytest-devpi-server/setup.py
+index 8891130..22b460f 100644
+--- a/pytest-devpi-server/setup.py
++++ b/pytest-devpi-server/setup.py
+@@ -27,8 +27,6 @@ install_requires = ['pytest-server-fixtures',
+                     'ruamel.yaml>=0.15;python_version > "3.4"',
+                     ]
+ 
+-tests_require = []
+-
+ entry_points = {
+     'pytest11': [
+         'devpi_server = _pytest_devpi_server',
+@@ -44,7 +42,6 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
+         packages=find_packages(exclude='tests'),
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-fixture-config/setup.py b/pytest-fixture-config/setup.py
+index 164ad33..15a9e16 100644
+--- a/pytest-fixture-config/setup.py
++++ b/pytest-fixture-config/setup.py
+@@ -20,8 +20,9 @@ classifiers = [
+ 
+ install_requires = ['pytest']
+ 
+-tests_require = ['six',
+-                 ]
++extras_require = {
++    'test': ["six"]
++}
+ 
+ if __name__ == '__main__':
+     kwargs = common_setup('pytest_fixture_config')
+@@ -32,7 +33,7 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
++        extras_require=extras_require,
+         py_modules=['pytest_fixture_config'],
+     ))
+     setup(**kwargs)
+diff --git a/pytest-git/setup.py b/pytest-git/setup.py
+index 8f4a1d3..9c4557a 100644
+--- a/pytest-git/setup.py
++++ b/pytest-git/setup.py
+@@ -27,9 +27,6 @@ install_requires = ['pytest',
+                     'gitpython',
+                     ]
+ 
+-tests_require = [
+-                 ]
+-
+ entry_points = {
+     'pytest11': [
+         'git_repo = pytest_git',
+@@ -46,7 +43,6 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
+         py_modules=['pytest_git'],
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-listener/setup.py b/pytest-listener/setup.py
+index 3ce8897..dcde454 100644
+--- a/pytest-listener/setup.py
++++ b/pytest-listener/setup.py
+@@ -23,8 +23,6 @@ install_requires = ['six',
+                     'pytest-server-fixtures'
+                     ]
+ 
+-tests_require = []
+-
+ entry_points = {
+     'pytest11': [
+         'listener = pytest_listener',
+@@ -40,7 +38,6 @@ if __name__ == '__main__':
+         author_email='drtimcouper@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
+         packages=find_packages(exclude='tests'),
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-profiling/setup.py b/pytest-profiling/setup.py
+index 612899a..fa412da 100644
+--- a/pytest-profiling/setup.py
++++ b/pytest-profiling/setup.py
+@@ -22,9 +22,9 @@ install_requires = ['six',
+                     'gprof2dot',
+                     ]
+ 
+-tests_require = [
+-                 'pytest-virtualenv',
+-                 ]
++extras_require = {
++    'tests': ['pytest-virtualenv']
++}
+ 
+ entry_points = {
+     'pytest11': [
+@@ -41,7 +41,7 @@ if __name__ == '__main__':
+         author_email='ed@catmur.co.uk',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
++        extras_require=extras_require,
+         py_modules=['pytest_profiling'],
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-pyramid-server/setup.py b/pytest-pyramid-server/setup.py
+index f6fbea0..a02587a 100644
+--- a/pytest-pyramid-server/setup.py
++++ b/pytest-pyramid-server/setup.py
+@@ -26,9 +26,9 @@ install_requires = ['pytest-server-fixtures',
+                     'six',
+                     ]
+ 
+-tests_require = [
+-                 'pyramid-debugtoolbar',
+-                 ]
++extras_require = {
++    'tests': ['pyramid-debugtoolbar']
++}
+ 
+ entry_points = {
+     'pytest11': [
+@@ -48,7 +48,7 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
++        extras_require=extras_require,
+         py_modules=['pytest_pyramid_server', 'pyramid_server_test'],
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-qt-app/setup.py b/pytest-qt-app/setup.py
+index 27f367a..3170aaf 100644
+--- a/pytest-qt-app/setup.py
++++ b/pytest-qt-app/setup.py
+@@ -22,8 +22,9 @@ install_requires = ['pytest',
+                     'pytest-shutil',
+                     ]
+ 
+-tests_require = ['pytest-cov'
+-                 ]
++extras_require = {
++    'tests': ['pytest-cov']
++}
+ 
+ entry_points = {
+     'pytest11': [
+@@ -40,7 +41,7 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
++        extras_require=extras_require,
+         py_modules=['pytest_qt_app'],
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-server-fixtures/setup.py b/pytest-server-fixtures/setup.py
+index 065c1c2..88af64c 100644
+--- a/pytest-server-fixtures/setup.py
++++ b/pytest-server-fixtures/setup.py
+@@ -36,13 +36,12 @@ extras_require = {
+     's3': ["boto3"],
+     'docker': ["docker"],
+     'kubernetes': ["kubernetes"],
++    'tests': [
++        'mock; python_version<"3.3"',
++        'psutil',
++    ],
+ }
+ 
+-tests_require = [
+-                 'mock; python_version<"3.3"',
+-                 'psutil',
+-                 ]
+-
+ entry_points = {
+     'pytest11': [
+         'httpd_server = pytest_server_fixtures.httpd',
+@@ -66,7 +65,6 @@ if __name__ == '__main__':
+         classifiers=classifiers,
+         install_requires=install_requires,
+         extras_require=extras_require,
+-        tests_require=tests_require,
+         packages=find_packages(exclude='tests'),
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-shutil/setup.py b/pytest-shutil/setup.py
+index 43ed91e..e1d9e56 100644
+--- a/pytest-shutil/setup.py
++++ b/pytest-shutil/setup.py
+@@ -27,8 +27,10 @@ install_requires = ['six',
+                     'termcolor'
+                     ]
+ 
+-tests_require = ['pytest',
+-                 ]
++
++extras_require = {
++    'tests':  ["pytest"],
++}
+ 
+ entry_points = {
+     'pytest11': [
+@@ -45,7 +47,7 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
++        extras_require=extras_require,
+         packages=find_packages(exclude='tests'),
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-svn/setup.py b/pytest-svn/setup.py
+index 470181f..9d4d272 100644
+--- a/pytest-svn/setup.py
++++ b/pytest-svn/setup.py
+@@ -21,9 +21,6 @@ install_requires = ['pytest',
+                     'pytest-shutil',
+                     ]
+ 
+-tests_require = [
+-                 ]
+-
+ entry_points = {
+     'pytest11': [
+         'svn_repo = pytest_svn',
+@@ -40,7 +37,6 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
+         py_modules=['pytest_svn'],
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-verbose-parametrize/setup.py b/pytest-verbose-parametrize/setup.py
+index ae0a482..b6fa5e1 100644
+--- a/pytest-verbose-parametrize/setup.py
++++ b/pytest-verbose-parametrize/setup.py
+@@ -21,10 +21,11 @@ install_requires = ['pytest',
+                     'six',
+                     ]
+ 
+-tests_require = ['mock; python_version<"3.3"',
+-                 'pytest-virtualenv',
+-                 'coverage',
+-                 ]
++extras_require = {
++    'tests': ['mock; python_version<"3.3"',
++              'pytest-virtualenv',
++              'coverage']
++}
+ 
+ entry_points = {
+     'pytest11': [
+@@ -41,7 +42,7 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
++        extras_require=extras_require,
+         py_modules=['pytest_verbose_parametrize'],
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-virtualenv/setup.py b/pytest-virtualenv/setup.py
+index 815b59c..55f97e3 100644
+--- a/pytest-virtualenv/setup.py
++++ b/pytest-virtualenv/setup.py
+@@ -25,9 +25,9 @@ install_requires = ['pytest-fixture-config',
+                     'importlib-metadata',
+                     ]
+ 
+-tests_require = [
+-                 'mock; python_version<"3.3"'
+-                 ]
++extras_require = {
++    'tests': ['mock; python_version<"3.3"']
++}
+ 
+ entry_points = {
+     'pytest11': [
+@@ -44,7 +44,7 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
++        extras_require=extras_require,
+         py_modules=['pytest_virtualenv'],
+         entry_points=entry_points,
+     ))
+diff --git a/pytest-webdriver/setup.py b/pytest-webdriver/setup.py
+index 280818a..afb618b 100644
+--- a/pytest-webdriver/setup.py
++++ b/pytest-webdriver/setup.py
+@@ -23,8 +23,10 @@ install_requires = ['py',
+                     'selenium',
+                     ]
+ 
+-tests_require = ['mock; python_version<"3.3"',
+-                 ]
++
++extras_require = {
++    'tests':  ['mock; python_version,"3.3"'],
++}
+ 
+ entry_points = {
+     'pytest11': [
+@@ -41,7 +43,7 @@ if __name__ == '__main__':
+         author_email='eeaston@gmail.com',
+         classifiers=classifiers,
+         install_requires=install_requires,
+-        tests_require=tests_require,
++        extras_require=extras_require,
+         py_modules=['pytest_webdriver'],
+         entry_points=entry_points,
+     ))
diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix
index bc66d607c775c..eddc3fc06fa94 100644
--- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix
+++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix
@@ -12,12 +12,14 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pytest-server-fixtures";
-  inherit (pytest-fixture-config) version src;
+  inherit (pytest-fixture-config) version src patches;
   pyproject = true;
 
-  sourceRoot = "${src.name}/pytest-server-fixtures";
+  postPatch = ''
+    cd pytest-server-fixtures
+  '';
 
   build-system = [ setuptools ];
 
diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index 613b3e382d406..d8bde90932bf9 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -21,22 +21,23 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pytest-shutil";
   inherit (pytest-fixture-config) version src;
   pyproject = true;
 
-  sourceRoot = "${src.name}/pytest-shutil";
-
   # imp was removed in Python 3.12
   patches = [
     (fetchpatch {
       name = "stop-using-imp.patch";
       url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-pytest-shutil/stop-using-imp.patch?rev=10";
-      hash = "sha256-L8tXoQ9q8o6aP3TpJY/sUVVbUd/ebw0h6de6dBj1WNY=";
-      stripLen = 1;
+      hash = "sha256-ZsfOic6VmKIlK+HeAlUwiM4fXgw9wHo445dP9j5/h8Q=";
     })
-  ];
+  ] ++ pytest-fixture-config.patches;
+
+  postPatch = ''
+    cd pytest-shutil
+  '';
 
   build-system = [
     setuptools
diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix
index fa276e748cddc..fc027dd939299 100644
--- a/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix
@@ -12,12 +12,14 @@
   virtualenv,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pytest-virtualenv";
-  inherit (pytest-fixture-config) version src;
+  inherit (pytest-fixture-config) version src patches;
   pyproject = true;
 
-  sourceRoot = "${src.name}/pytest-virtualenv";
+  postPatch = ''
+    cd pytest-virtualenv
+  '';
 
   build-system = [ setuptools ];
 

From b1156644c8d663503ba0b0df276ce155eb755727 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 31 Jul 2024 22:13:48 +0200
Subject: [PATCH 166/342] python312Packages.pystray: run tests with pytest

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

diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix
index a448933fcc78f..632356001c59d 100644
--- a/pkgs/development/python-modules/pystray/default.nix
+++ b/pkgs/development/python-modules/pystray/default.nix
@@ -12,6 +12,7 @@
   pygobject3,
   gtk3,
   libayatana-appindicator,
+  pytest,
 }:
 
 buildPythonPackage rec {
@@ -54,12 +55,17 @@ buildPythonPackage rec {
     libayatana-appindicator
   ];
 
-  nativeCheckInputs = [ xvfb-run ];
+  nativeCheckInputs = [
+    pytest
+    xvfb-run
+  ];
 
   checkPhase = ''
-    rm tests/icon_tests.py # test needs user input
+    runHook preCheck
+
+    xvfb-run -s '-screen 0 800x600x24' pytest tests/menu_descriptor_tests.py
 
-    xvfb-run -s '-screen 0 800x600x24' python setup.py test
+    runHook postCheck
   '';
 
   meta = with lib; {

From 7195f7421f50886002064f4656733693a20bb213 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 1 Aug 2024 05:39:46 +0200
Subject: [PATCH 167/342] python312Packages.myst-parser: disable failing tests

---
 pkgs/development/python-modules/myst-parser/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix
index c5b7736c113ad..c17dfe1510e0f 100644
--- a/pkgs/development/python-modules/myst-parser/default.nix
+++ b/pkgs/development/python-modules/myst-parser/default.nix
@@ -55,6 +55,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ] ++ markdown-it-py.optional-dependencies.linkify;
 
+  disabledTests = [
+    # sphinx 7.4 compat
+    "test_gettext"
+    "test_gettext_additional_targets"
+  ];
+
   pythonImportsCheck = [ "myst_parser" ];
 
   pythonRelaxDeps = [ "docutils" ];

From ccd56ee7c3c92ea0ca97c692153409600a8dd019 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 1 Aug 2024 05:42:16 +0200
Subject: [PATCH 168/342] python312Packages.pdm-backend: 2.3.1 -> 2.3.3

https://github.com/pdm-project/pdm-backend/releases/tag/2.3.2
https://github.com/pdm-project/pdm-backend/releases/tag/2.3.3
---
 pkgs/development/python-modules/pdm-backend/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix
index 889c36936afc3..64ad22dd1651e 100644
--- a/pkgs/development/python-modules/pdm-backend/default.nix
+++ b/pkgs/development/python-modules/pdm-backend/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pdm-backend";
-  version = "2.3.1";
-  format = "pyproject";
+  version = "2.3.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm-backend";
     rev = "refs/tags/${version}";
-    hash = "sha256-I1bAjryLDXzlstIHK4cD6/HPJBGGskRUVp7B2PDwXhc=";
+    hash = "sha256-gM8Sx6nMiq84e3sLJn35shF2jy6Ce1qPlERi2XpS89k=";
   };
 
   env.PDM_BUILD_SCM_VERSION = version;

From e47d0b5400d0e4c4aaf314db6cb833144bd1d11a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 2 Aug 2024 18:12:12 +0200
Subject: [PATCH 169/342] electrum-ltc: disable failing and stuck tests

These tests have forced the hydra job for electrum-ltc to run into a
timeout.
---
 pkgs/applications/misc/electrum/ltc.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index d74f706cbf924..110a17aeeac98 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -138,6 +138,11 @@ python3.pkgs.buildPythonApplication {
   disabledTests = [
     "test_loop"  # test tries to bind 127.0.0.1 causing permission error
     "test_is_ip_address"  # fails spuriously https://github.com/spesmilo/electrum/issues/7307
+    # electrum_ltc.lnutil.RemoteMisbehaving: received commitment_signed without pending changes
+    "test_reestablish_replay_messages_rev_then_sig"
+    "test_reestablish_replay_messages_sig_then_rev"
+    # stuck on hydra
+    "test_reestablish_with_old_state"
   ];
 
   postCheck = ''

From fddf1534d86f773604b2e178b0648b0894564723 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 2 Aug 2024 19:39:55 +0200
Subject: [PATCH 170/342] python312Packages.datasette: ignore deprecation
 warnings

---
 pkgs/development/python-modules/datasette/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index fd31d3bbf1897..29cf78eeed88c 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -79,7 +79,12 @@ buildPythonPackage rec {
   # takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews
   # with pytest-xdist, it still takes around 10 mins with 32 cores
   # just run the csv tests, as this should give some indictation of correctness
-  pytestFlagsArray = [ "tests/test_csv.py" ];
+  pytestFlagsArray = [
+    # datasette/app.py:14: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html
+    "-W"
+    "ignore::DeprecationWarning"
+    "tests/test_csv.py"
+  ];
 
   disabledTests = [
     "facet"

From cc2b171ac7f140cf562a42eabfe1794ce94f10ba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 2 Aug 2024 19:48:06 +0200
Subject: [PATCH 171/342] python312Packages.python-daemon: fix build

Accessing packaging via setuptools.extern is dead.
---
 .../python-modules/python-daemon/default.nix       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
index 2adf0060dfb69..e8e8e2c018f79 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -4,17 +4,18 @@
   fetchPypi,
   docutils,
   lockfile,
+  packaging,
   pytestCheckHook,
   testscenarios,
   testtools,
-  twine,
+  setuptools,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "python-daemon";
   version = "3.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -23,7 +24,14 @@ buildPythonPackage rec {
     hash = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU=";
   };
 
-  nativeBuildInputs = [ twine ];
+  postPatch = ''
+    sed -i "s/setuptools\.extern\.//g" version.py test_version.py
+  '';
+
+  nativeBuildInputs = [
+    setuptools
+    packaging
+  ];
 
   propagatedBuildInputs = [
     docutils

From 1bf8aa36647488b87e4f7fd8d534f3480d540bc9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 2 Aug 2024 22:08:25 +0200
Subject: [PATCH 172/342] python312Packages.liblarch: test with pytest

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

diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix
index 1f891c126aef1..4dae337ca1f22 100644
--- a/pkgs/development/python-modules/liblarch/default.nix
+++ b/pkgs/development/python-modules/liblarch/default.nix
@@ -2,12 +2,12 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  python,
   pygobject3,
   xvfb-run,
   gobject-introspection,
   gtk3,
   pythonOlder,
+  pytest,
 }:
 
 buildPythonPackage rec {
@@ -26,6 +26,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     gobject-introspection # for setup hook
     gtk3
+    pytest
   ];
 
   buildInputs = [ gtk3 ];
@@ -34,8 +35,7 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
-    ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
-      ${python.interpreter} nix_run_setup test
+    ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' pytest
     runHook postCheck
   '';
 

From 0ab55a6ce8ba2b7bca3a4fd22c08c3b252bc6bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 31 Jul 2024 06:18:55 -0700
Subject: [PATCH 173/342] python312Packages.aiohttp: 3.9.5 -> 3.10.0

Diff: https://github.com/aio-libs/aiohttp/compare/refs/tags/v3.9.5...v3.10.0

Changelog: https://github.com/aio-libs/aiohttp/blob/v3.10.0/CHANGES.rst
---
 .../python-modules/aiohttp/default.nix        | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 20d911edfbbaf..b0682cec1be7e 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -11,6 +11,7 @@
   cython,
   setuptools,
   # install_requires
+  aiohappyeyeballs,
   attrs,
   multidict,
   async-timeout,
@@ -22,6 +23,7 @@
   # tests_require
   freezegun,
   gunicorn,
+  proxy-py,
   pytest-mock,
   pytest7CheckHook,
   python-on-whales,
@@ -31,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.9.5";
+  version = "3.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +42,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiohttp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FRtirmwgU8v+ee3db7rOFsmy0rNW8A7+yRZC5d6uYNA=";
+    hash = "sha256-8B5WyG3XUAxjoY08PTbkNM11K/ytlvdplhf2VV+I+JU=";
   };
 
   patches = [
@@ -69,6 +71,7 @@ buildPythonPackage rec {
   '';
 
   dependencies = [
+    aiohappyeyeballs
     attrs
     multidict
     async-timeout
@@ -85,20 +88,16 @@ buildPythonPackage rec {
   '';
 
   # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info.
-  nativeCheckInputs =
-    [
-      freezegun
-      gunicorn
-      pytest-mock
-      pytest7CheckHook
-      python-on-whales
-      re-assert
-    ]
-    ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [
-      # Optional test dependency. Depends indirectly on pyopenssl, which is
-      # broken on aarch64-darwin.
-      trustme
-    ];
+  nativeCheckInputs = [
+    freezegun
+    gunicorn
+    proxy-py
+    pytest-mock
+    pytest7CheckHook
+    python-on-whales
+    re-assert
+    trustme
+  ];
 
   disabledTests =
     [
@@ -115,17 +114,15 @@ buildPythonPackage rec {
       "test_close"
     ];
 
-  disabledTestPaths = [
-    "tests/test_proxy_functional.py" # FIXME package proxy.py
-  ];
-
   __darwinAllowLocalNetworking = true;
 
-  # aiohttp in current folder shadows installed version
   preCheck =
     ''
+      # aiohttp in current folder shadows installed version
       rm -r aiohttp
       touch tests/data.unknown_mime_type # has to be modified after 1 Jan 1990
+
+      export HOME=$(mktemp -d)
     ''
     + lib.optionalString stdenv.isDarwin ''
       # Work around "OSError: AF_UNIX path too long"

From b9a16acbae51e84898f34cbc8a6ff9c4867861d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 31 Jul 2024 06:39:49 -0700
Subject: [PATCH 174/342] python312Packages.uvloop: don't run aiohttp tests

Depending on aiohttp yields an infinite recursion.
---
 pkgs/development/python-modules/uvloop/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 905a923dc7bf2..9d3240bdf3ddc 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -15,7 +15,6 @@
   ApplicationServices,
 
   # tests
-  aiohttp,
   psutil,
   pyopenssl,
   pytestCheckHook,
@@ -48,7 +47,6 @@ buildPythonPackage rec {
     ];
 
   nativeCheckInputs = [
-    aiohttp
     pyopenssl
     pytestCheckHook
     psutil

From 1957bde1fb62c161a0382d02d4480f5de8de9c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 31 Jul 2024 07:17:35 -0700
Subject: [PATCH 175/342] python312Packages.aiohappyeyeballs: enable previously
 broken test

---
 pkgs/development/python-modules/aiohappyeyeballs/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
index 550d1d69133e7..7a778be238beb 100644
--- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix
+++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
@@ -60,11 +60,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiohappyeyeballs" ];
 
-  disabledTestPaths = [
-    # https://github.com/bdraco/aiohappyeyeballs/issues/30
-    "tests/test_impl.py"
-  ];
-
   meta = with lib; {
     description = "Happy Eyeballs for pre-resolved hosts";
     homepage = "https://github.com/bdraco/aiohappyeyeballs";

From 6bd87a30bfcf9435de577f15c200e656aac05366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 31 Jul 2024 07:43:09 -0700
Subject: [PATCH 176/342] python312Packages.aiohttp-fast-url-dispatcher: unpin
 aiohttp

---
 .../python-modules/aiohttp-fast-url-dispatcher/default.nix      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix b/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix
index 8e4cd760a5f76..e65e3fea31d7c 100644
--- a/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix
+++ b/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix
@@ -30,6 +30,8 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ poetry-core ];
 
+  pythonRelaxDeps = [ "aiohttp" ];
+
   propagatedBuildInputs = [ aiohttp ];
 
   nativeCheckInputs = [

From 45fd62a5392f87a7b7b98a2955315456ea323e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 31 Jul 2024 07:43:53 -0700
Subject: [PATCH 177/342] python312Packages.aiohttp-fast-url-dispatcher: 0.3.0
 -> 0.3.1

Diff: https://github.com/bdraco/aiohttp-fast-url-dispatcher/compare/refs/tags/v0.3.0...v0.3.1

Changelog: https://github.com/bdraco/aiohttp-fast-url-dispatcher/blob/v0.3.1/CHANGELOG.md
---
 .../python-modules/aiohttp-fast-url-dispatcher/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix b/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix
index e65e3fea31d7c..60cf4e1ee4e80 100644
--- a/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix
+++ b/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-fast-url-dispatcher";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "aiohttp-fast-url-dispatcher";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DZTW9CazcUY3hyxr0MbVfM/yJzUzwN43c2n07Sloxa8=";
+    hash = "sha256-RBS17LhbaAOxFYGjmoEyrq2DCEHeZNpkITPDdCd7Jk0=";
   };
 
   postPatch = ''
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Faster URL dispatcher for aiohttp";
     homepage = "https://github.com/bdraco/aiohttp-fast-url-dispatcher";
-    changelog = "https://github.com/bdraco/aiohttp-fast-url-dispatcher/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/bdraco/aiohttp-fast-url-dispatcher/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From 9cce6b2c487fbd25ac90411fd4bda3d12d8f70d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 31 Jul 2024 07:52:44 -0700
Subject: [PATCH 178/342] python312Packages.async-upnp-client: 0.39.0 -> 0.40.0

Diff: https://github.com/StevenLooman/async_upnp_client/compare/refs/tags/0.39.0...0.40.0

Changelog: https://github.com/StevenLooman/async_upnp_client/blob/0.40.0/CHANGES.rst
---
 pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index 7c87735f74724..18969f48233de 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "async-upnp-client";
-  version = "0.39.0";
+  version = "0.40.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "StevenLooman";
     repo = "async_upnp_client";
     rev = "refs/tags/${version}";
-    hash = "sha256-2A46/j6DkZ7rz/B64aBAp0NvRG5TBuL4VwMVS50+fQs=";
+    hash = "sha256-KaX1TNP6IP2wAijR2y9cqI+Pyc+Ygk3LqKwu5Yrv5LM=";
   };
 
   pythonRelaxDeps = [ "defusedxml" ];

From 7983e66e0e8fbdaffd4b5ee07746d0301988ac53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 1 Aug 2024 07:58:17 -0700
Subject: [PATCH 179/342] python312Packages.mocket: disable test failing due to
 DNS lookup

---
 pkgs/development/python-modules/mocket/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index 323633d3a4398..eb5ffb2b244f9 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -91,6 +91,7 @@ buildPythonPackage rec {
   disabledTests = [
     # tests that require network access (like DNS lookups)
     "test_truesendall_with_dump_from_recording"
+    "test_aiohttp"
     "test_asyncio_record_replay"
     "test_gethostbyname"
     # httpx read failure

From c8dd37a2a79659a3d6d7890133d1f982d3bedc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 29 Jul 2024 12:05:11 -0700
Subject: [PATCH 180/342] python312Packages.atpublic: 4.1.0 -> 5.0

Diff: https://gitlab.com/warsaw/public/-/compare/refs/tags/4.1.0...5.0

Changelog: https://gitlab.com/warsaw/public/-/blob/5.0/docs/NEWS.rst
---
 .../python-modules/atpublic/default.nix       | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix
index cf752f0a59c52..9789b8c471225 100644
--- a/pkgs/development/python-modules/atpublic/default.nix
+++ b/pkgs/development/python-modules/atpublic/default.nix
@@ -1,47 +1,38 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitLab,
   pytestCheckHook,
   pythonOlder,
   hatchling,
   sybil,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "atpublic";
-  version = "4.1.0";
-  format = "pyproject";
+  version = "5.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-0cjNkxr3Rh9tGLxgYzg+hlTZ6e8Z1Y7m3AHoUVu/Vd8=";
+  src = fetchFromGitLab {
+    owner = "warsaw";
+    repo = "public";
+    rev = "refs/tags/${version}";
+    hash = "sha256-cqum+4hREu0jO9iFoUUzfzn597BoMAhG+aanwnh8hb8=";
   };
 
-  nativeBuildInputs = [ hatchling ];
-
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [
     pytestCheckHook
     sybil
   ];
 
-  pytestFlagsArray = [
-    # TypeError: FixtureManager.getfixtureclosure() missing 1 required positional argument: 'ignore_args'
-    "--ignore=docs/using.rst"
-  ];
-
-  postPatch = ''
-    sed -i '/cov=public/d' pyproject.toml
-  '';
-
   pythonImportsCheck = [ "public" ];
 
   meta = with lib; {
+    changelog = "https://gitlab.com/warsaw/public/-/blob/${version}/docs/NEWS.rst";
     description = "Python decorator and function which populates a module's __all__ and globals";
     homepage = "https://public.readthedocs.io/";
     longDescription = ''

From c3dacd86f095e325888d6dc91b1beef5bc5eafe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 08:47:00 -0700
Subject: [PATCH 181/342] python312Packages.anyio: 4.3.0 -> 4.4.0

Diff: https://github.com/agronholm/anyio/compare/refs/tags/4.3.0...4.4.0

Changelog: https://github.com/agronholm/anyio/blob/refs/tags/4.4.0/docs/versionhistory.rst
---
 .../python-modules/anyio/default.nix          | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 3c1492c98223a..296fbcdc35630 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -6,7 +6,6 @@
   pythonOlder,
 
   # build-system
-  setuptools,
   setuptools-scm,
 
   # dependencies
@@ -33,24 +32,21 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "4.3.0";
+  version = "4.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "agronholm";
-    repo = pname;
+    repo = "anyio";
     rev = "refs/tags/${version}";
-    hash = "sha256-y58DQiTD0ZKaBNf0cA3MFE+7F68Svrl+Idz6BZY7HWQ=";
+    hash = "sha256-Sz/wWOT59T7LOAq68fBujgkTaY9ydMsIoSxeP3fBaoY=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    setuptools-scm
-  ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs =
+  dependencies =
     [
       idna
       sniffio
@@ -64,9 +60,6 @@ buildPythonPackage rec {
     trio = [ trio ];
   };
 
-  # trustme uses pyopenssl
-  doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
-
   nativeCheckInputs = [
     exceptiongroup
     hypothesis
@@ -85,7 +78,7 @@ buildPythonPackage rec {
     "'not network'"
   ];
 
-  disabledTests = lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [
+  disabledTests = lib.optionals stdenv.isDarwin [
     # PermissionError: [Errno 1] Operation not permitted: '/dev/console'
     "test_is_block_device"
   ];

From 003b09912e7f931133afeede3544729fccb9a513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 10:29:54 -0700
Subject: [PATCH 182/342] python312Packages.starlette: fix tests

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

diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index 73fb920314c97..21551a5786dae 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -63,6 +63,8 @@ buildPythonPackage rec {
     "ignore::DeprecationWarning"
     "-W"
     "ignore::trio.TrioDeprecationWarning"
+    "-W"
+    "ignore::ResourceWarning" # FIXME remove once test suite is fully compatible with anyio 4.4.0
   ];
 
   pythonImportsCheck = [ "starlette" ];

From da270cd5759771ced8331f7a3b48d2d36e93145b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 30 Jul 2024 07:27:49 -0700
Subject: [PATCH 183/342] python312Packages.av: 12.2.0 -> 12.3.0

Diff: https://github.com/mikeboers/PyAV/compare/refs/tags/v12.2.0...v12.3.0

Changelog: https://github.com/PyAV-Org/PyAV/blob/v12.3.0/CHANGELOG.rst
---
 pkgs/development/python-modules/av/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index e50028415d8a8..57fca04c0a4b4 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -17,24 +17,25 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "12.2.0";
+  version = "12.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
-    owner = "mikeboers";
+    owner = "PyAV-Org";
     repo = "PyAV";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yPVAtL71pL/ok3bli+r/IruCrmmhNyv98pr7z3m8sbo=";
+    hash = "sha256-ezeYv55UzNnnYDjrMz5YS5g2pV6U/Fxx3e2bCoPP3eI=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython
-    pkg-config
     setuptools
   ];
 
+  nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [ ffmpeg_6-headless ];
 
   preCheck =
@@ -95,7 +96,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pythonic bindings for FFmpeg/Libav";
     mainProgram = "pyav";
-    homepage = "https://github.com/mikeboers/PyAV/";
+    homepage = "https://github.com/PyAV-Org/PyAV";
     changelog = "https://github.com/PyAV-Org/PyAV/blob/v${version}/CHANGELOG.rst";
     license = licenses.bsd2;
     maintainers = [ ];

From e340c59f5eb3983e44a6a7aeed148ce80e3e1f25 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Thu, 4 Jul 2024 15:52:11 +0900
Subject: [PATCH 184/342] python311Packages.python-ulid: 2.2.0 -> 2.7.0

Diff: https://github.com/mdomke/python-ulid/compare/refs/tags/2.2.0...2.7.0

Changelog: https://github.com/mdomke/python-ulid/blob/refs/tags/2.7.0/CHANGELOG.rst
---
 .../python-modules/python-ulid/default.nix          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix
index 59c07c6453c82..9dc439fde7062 100644
--- a/pkgs/development/python-modules/python-ulid/default.nix
+++ b/pkgs/development/python-modules/python-ulid/default.nix
@@ -6,13 +6,14 @@
   hatch-fancy-pypi-readme,
   hatch-vcs,
   hatchling,
+  pydantic,
   freezegun,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "python-ulid";
-  version = "2.2.0";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,19 +22,23 @@ buildPythonPackage rec {
     owner = "mdomke";
     repo = "python-ulid";
     rev = "refs/tags/${version}";
-    hash = "sha256-d5jCPxWUOfw/OCtbA9Db9+s1D5DAdL+vbPR8zavgbbo=";
+    hash = "sha256-Z9rYqekhrYa8ab17AVmKyObvq4HTOij7+LMlvRSqUQM=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-fancy-pypi-readme
     hatch-vcs
     hatchling
   ];
 
+  optional-dependencies = {
+    pydantic = [ pydantic ];
+  };
+
   nativeCheckInputs = [
     freezegun
     pytestCheckHook
-  ];
+  ] ++ optional-dependencies.pydantic;
 
   pythonImportsCheck = [ "ulid" ];
 

From 633d642f4672e0c9451e761c32263d6ea6699fc0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 16:51:04 +0200
Subject: [PATCH 185/342] python312Packages.requests: fix ca loading regression
 in 2.32.3

Requests in 2.32.3 caused a regression in the code path that loads the
default certificate authorities, breaking downstream consumers like
httpie in the process.

The patch series fixing this is currently still a draft, since tests are
missing, but it at least fixes the reproducer and httpie.
---
 .../requests/ca-load-regression.patch         | 126 ++++++++++++++++++
 .../python-modules/requests/default.nix       |   6 +
 2 files changed, 132 insertions(+)
 create mode 100644 pkgs/development/python-modules/requests/ca-load-regression.patch

diff --git a/pkgs/development/python-modules/requests/ca-load-regression.patch b/pkgs/development/python-modules/requests/ca-load-regression.patch
new file mode 100644
index 0000000000000..e20d213cd23a8
--- /dev/null
+++ b/pkgs/development/python-modules/requests/ca-load-regression.patch
@@ -0,0 +1,126 @@
+From 2769cb607d4e696e2fe70802d4246ccc5abd64a8 Mon Sep 17 00:00:00 2001
+From: Nate Prewitt <nate.prewitt@gmail.com>
+Date: Wed, 29 May 2024 12:48:48 -0700
+Subject: [PATCH 1/3] Consider cert settings when using default context
+
+---
+ src/requests/adapters.py | 26 ++++++++++++++++++--------
+ 1 file changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/src/requests/adapters.py b/src/requests/adapters.py
+index 9a58b16025..991b7e21c9 100644
+--- a/src/requests/adapters.py
++++ b/src/requests/adapters.py
+@@ -87,6 +87,23 @@ def SOCKSProxyManager(*args, **kwargs):
+     _preloaded_ssl_context = None
+ 
+ 
++def _should_use_default_context(
++    verify: "bool | str | None",
++    client_cert: "typing.Tuple[str, str] | str | None",
++    poolmanager_kwargs: typing.Dict[str, typing.Any],
++) -> bool:
++    # Determine if we have and should use our default SSLContext
++    # to optimize performance on standard requests.
++    has_poolmanager_ssl_context = poolmanager_kwargs.get("ssl_context")
++    should_use_default_ssl_context = (
++        verify is True
++        and _preloaded_ssl_context is not None
++        and not has_poolmanager_ssl_context
++        and client_cert is None
++    )
++    return should_use_default_ssl_context
++
++
+ def _urllib3_request_context(
+     request: "PreparedRequest",
+     verify: "bool | str | None",
+@@ -98,19 +115,12 @@ def _urllib3_request_context(
+     parsed_request_url = urlparse(request.url)
+     scheme = parsed_request_url.scheme.lower()
+     port = parsed_request_url.port
+-
+-    # Determine if we have and should use our default SSLContext
+-    # to optimize performance on standard requests.
+     poolmanager_kwargs = getattr(poolmanager, "connection_pool_kw", {})
+-    has_poolmanager_ssl_context = poolmanager_kwargs.get("ssl_context")
+-    should_use_default_ssl_context = (
+-        _preloaded_ssl_context is not None and not has_poolmanager_ssl_context
+-    )
+ 
+     cert_reqs = "CERT_REQUIRED"
+     if verify is False:
+         cert_reqs = "CERT_NONE"
+-    elif verify is True and should_use_default_ssl_context:
++    elif _should_use_default_context(verify, client_cert, poolmanager_kwargs):
+         pool_kwargs["ssl_context"] = _preloaded_ssl_context
+     elif isinstance(verify, str):
+         if not os.path.isdir(verify):
+
+From e341df3efa0323072fab5d16307e2a20295675b9 Mon Sep 17 00:00:00 2001
+From: Nate Prewitt <nate.prewitt@gmail.com>
+Date: Fri, 31 May 2024 11:41:48 -0700
+Subject: [PATCH 2/3] Set default ca_cert bundle if verify is True
+
+---
+ src/requests/adapters.py | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/requests/adapters.py b/src/requests/adapters.py
+index 991b7e21c9..ba5a0ec4f0 100644
+--- a/src/requests/adapters.py
++++ b/src/requests/adapters.py
+@@ -118,15 +118,23 @@ def _urllib3_request_context(
+     poolmanager_kwargs = getattr(poolmanager, "connection_pool_kw", {})
+ 
+     cert_reqs = "CERT_REQUIRED"
++    cert_loc = None
+     if verify is False:
+         cert_reqs = "CERT_NONE"
+     elif _should_use_default_context(verify, client_cert, poolmanager_kwargs):
+         pool_kwargs["ssl_context"] = _preloaded_ssl_context
++    elif verify is True:
++        # Set default ca cert location if none provided
++        cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
+     elif isinstance(verify, str):
+-        if not os.path.isdir(verify):
+-            pool_kwargs["ca_certs"] = verify
++        cert_loc = verify
++
++    if cert_loc is not None:
++        if not os.path.isdir(cert_loc):
++            pool_kwargs["ca_certs"] = cert_loc
+         else:
+-            pool_kwargs["ca_cert_dir"] = verify
++            pool_kwargs["ca_cert_dir"] = cert_loc
++
+     pool_kwargs["cert_reqs"] = cert_reqs
+     if client_cert is not None:
+         if isinstance(client_cert, tuple) and len(client_cert) == 2:
+
+From da96a92e2eb6dfe7c74704267bcb8f9fd6fb92b0 Mon Sep 17 00:00:00 2001
+From: Nate Prewitt <nate.prewitt@gmail.com>
+Date: Fri, 31 May 2024 12:20:11 -0700
+Subject: [PATCH 3/3] Correct comment to match actual behavior
+
+---
+ src/requests/adapters.py | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/requests/adapters.py b/src/requests/adapters.py
+index ba5a0ec4f0..54143f9e6b 100644
+--- a/src/requests/adapters.py
++++ b/src/requests/adapters.py
+@@ -334,10 +334,8 @@ def cert_verify(self, conn, url, verify, cert):
+         if url.lower().startswith("https") and verify:
+             conn.cert_reqs = "CERT_REQUIRED"
+ 
+-            # Only load the CA certificates if 'verify' is a string indicating the CA bundle to use.
+-            # Otherwise, if verify is a boolean, we don't load anything since
+-            # the connection will be using a context with the default certificates already loaded,
+-            # and this avoids a call to the slow load_verify_locations()
++            # Only load the CA certificates if `verify` is a
++            # string indicating the CA bundle to use.
+             if verify is not True:
+                 # `verify` must be a str with a path then
+                 cert_loc = verify
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index a483d00695188..c8ec3c490ecf6 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -30,6 +30,12 @@ buildPythonPackage rec {
     hash = "sha256-VTZUF3NOsYJVWQqf+euX6eHaho1MzWQCOZ6vaK8gp2A=";
   };
 
+  patches = [
+    # https://github.com/psf/requests/issues/6730
+    # https://github.com/psf/requests/pull/6731
+    ./ca-load-regression.patch
+  ];
+
   dependencies = [
     brotlicffi
     certifi

From 717e520fa0778701162c68add4969d7c0efdbe56 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 3 Aug 2024 03:46:56 +0200
Subject: [PATCH 186/342] python312Packages.pytest: 8.2.2 -> 8.3.2

https://github.com/pytest-dev/pytest/releases/tag/8.3.0
https://github.com/pytest-dev/pytest/releases/tag/8.3.1
https://github.com/pytest-dev/pytest/releases/tag/8.3.2
---
 .../8.2.2-unittest-testcase-regression.patch  | 72 -------------------
 .../python-modules/pytest/default.nix         | 10 +--
 2 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest/8.2.2-unittest-testcase-regression.patch

diff --git a/pkgs/development/python-modules/pytest/8.2.2-unittest-testcase-regression.patch b/pkgs/development/python-modules/pytest/8.2.2-unittest-testcase-regression.patch
deleted file mode 100644
index 1d127b191f818..0000000000000
--- a/pkgs/development/python-modules/pytest/8.2.2-unittest-testcase-regression.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From de47b73520fd9b7e41272701d7fd4663357af046 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Fri, 7 Jun 2024 09:49:29 +0300
-Subject: [PATCH] unittest: fix assertion errors on unittest reruns
-
-This fixes unittest test reruns when using plugins like
-pytest-rerunfailures.
-
-The `instance` property uses AttributeError to check if the instance
-needs to be initialized, so `del` is the correct way to clear it, not
-setting to `None`.
-
-Regressed in 8.2.2.
----
- changelog/12424.bugfix.rst                            |  1 +
- src/_pytest/unittest.py                               |  2 +-
- .../pytest_rerunfailures_integration.py               | 11 +++++++++++
- tox.ini                                               |  2 +-
- 4 files changed, 14 insertions(+), 2 deletions(-)
- create mode 100644 changelog/12424.bugfix.rst
- create mode 100644 testing/plugins_integration/pytest_rerunfailures_integration.py
-
-diff --git a/changelog/12424.bugfix.rst b/changelog/12424.bugfix.rst
-new file mode 100644
-index 00000000000..7ad1126858b
---- /dev/null
-+++ b/changelog/12424.bugfix.rst
-@@ -0,0 +1 @@
-+Fix crash with `assert testcase is not None` assertion failure when re-running unittest tests using plugins like pytest-rerunfailures. Regressed in 8.2.2.
-diff --git a/src/_pytest/unittest.py b/src/_pytest/unittest.py
-index 643443f08c6..ca82ac5c14a 100644
---- a/src/_pytest/unittest.py
-+++ b/src/_pytest/unittest.py
-@@ -222,7 +222,7 @@ def teardown(self) -> None:
-             self._explicit_tearDown()
-             self._explicit_tearDown = None
-         self._obj = None
--        self._instance = None
-+        del self._instance
-         super().teardown()
- 
-     def startTest(self, testcase: "unittest.TestCase") -> None:
-diff --git a/testing/plugins_integration/pytest_rerunfailures_integration.py b/testing/plugins_integration/pytest_rerunfailures_integration.py
-new file mode 100644
-index 00000000000..9a13a3279a9
---- /dev/null
-+++ b/testing/plugins_integration/pytest_rerunfailures_integration.py
-@@ -0,0 +1,11 @@
-+import unittest
-+
-+
-+class MyTestCase(unittest.TestCase):
-+    first_time = True
-+
-+    def test_fail_the_first_time(self) -> None:
-+        """Regression test for issue #12424."""
-+        if self.first_time:
-+            type(self).first_time = False
-+            self.fail()
-diff --git a/tox.ini b/tox.ini
-index 0a3f0acf5b8..35b335a015d 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -141,7 +141,7 @@ commands =
-     pytest --cov=. simple_integration.py
-     pytest --ds=django_settings simple_integration.py
-     pytest --html=simple.html simple_integration.py
--    pytest --reruns 5 simple_integration.py
-+    pytest --reruns 5 simple_integration.py pytest_rerunfailures_integration.py
-     pytest pytest_anyio_integration.py
-     pytest pytest_asyncio_integration.py
-     pytest pytest_mock_integration.py
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 38675d502277d..fc5ca9c2a37b8 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -29,20 +29,14 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "8.2.2";
+  version = "8.3.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3ku4EE4gGTnM3GiLJ6iae+IHmyLivSsH+Aa2unEReXc=";
+    hash = "sha256-wTI0XRLOVRJCyHJp3oEkg/W8yHzbtHIuSEh7oZT5/c4=";
   };
 
-  patches = [
-    # https://github.com/pytest-dev/pytest/issues/12424
-    # https://github.com/pytest-dev/pytest/pull/12436
-    ./8.2.2-unittest-testcase-regression.patch
-  ];
-
   outputs = [
     "out"
     "testout"

From 287943d6ddc23a04118bfb778475eeccf061cbcc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 3 Aug 2024 04:22:16 +0200
Subject: [PATCH 187/342] python312Packages.hypothesis: 6.103.0 -> 6.108.5

https://hypothesis.readthedocs.io/en/latest/changes.html#v6-108-5
---
 pkgs/development/python-modules/hypothesis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 9590857b3480d..4379303f3dba7 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "hypothesis";
-  version = "6.103.0";
+  version = "6.108.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     rev = "hypothesis-python-${version}";
-    hash = "sha256-sll0GAI1nvBQvRqgpTkLpj7GQI988AftDQHV1zh2t1w=";
+    hash = "sha256-APZTI7AxbtLT+2mkxUapr1sPcq4ViMXy1J6g0I30s5A=";
   };
 
   # I tried to package sphinx-selective-exclude, but it throws

From 26414d70afde6fa0c7443b7f9c0641b47f21a9ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 3 Aug 2024 07:51:50 +0200
Subject: [PATCH 188/342] python312Packages.pillow: 10.3.0 -> 10.4.0

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

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 87e982491fe89..b5257f5101d2c 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -35,7 +35,7 @@
 import ./generic.nix (
   rec {
     pname = "pillow";
-    version = "10.3.0";
+    version = "10.4.0";
     format = "pyproject";
 
     disabled = pythonOlder "3.8";
@@ -43,7 +43,7 @@ import ./generic.nix (
     src = fetchPypi {
       pname = "pillow";
       inherit version;
-      hash = "sha256-nSRV+/RMkUhAx5PomqgtDhdjoUJToAB0NxmuWUaBSy0=";
+      hash = "sha256-Fmwc1NJDCbMNYfefSpEUt7IxPXRQkSJ3hV/139fNSgY=";
     };
 
     passthru.tests = {

From 3c26a3a495680ffa496b836ed9f0baf884782565 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 3 Aug 2024 23:12:40 +0200
Subject: [PATCH 189/342] python312Packages.fastapi: 0.111.0 -> 0.112.0

https://github.com/tiangolo/fastapi/releases/tag/0.112.0
---
 .../python-modules/fastapi/default.nix           | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 83f0eb95438a0..f4e5b5cb513ff 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -17,9 +17,9 @@
   dirty-equals,
   flask,
   passlib,
+  pyjwt,
   pytest-asyncio,
   pytestCheckHook,
-  python-jose,
   sqlalchemy,
   trio,
 
@@ -39,7 +39,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.111.0";
+  version = "0.112.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     owner = "tiangolo";
     repo = "fastapi";
     rev = "refs/tags/${version}";
-    hash = "sha256-DQYjK1dZuL7cF6quyNkgdd/GYmWm7k6YlF7YEjObQlI=";
+    hash = "sha256-M09yte0BGC5w3AZSwDUr9qKUrotqVklO8mwyms9B95Y=";
   };
 
   build-system = [ pdm-backend ];
@@ -87,17 +87,23 @@ buildPythonPackage rec {
     dirty-equals
     flask
     passlib
+    pyjwt
     pytestCheckHook
     pytest-asyncio
-    python-jose
     trio
     sqlalchemy
-  ] ++ optional-dependencies.all ++ python-jose.optional-dependencies.cryptography;
+  ] ++ optional-dependencies.all;
 
   pytestFlagsArray = [
     # ignoring deprecation warnings to avoid test failure from
     # tests/test_tutorial/test_testing/test_tutorial001.py
     "-W ignore::DeprecationWarning"
+    "-W ignore::pytest.PytestUnraisableExceptionWarning"
+  ];
+
+  disabledTests = [
+    # Coverage test
+    "test_fastapi_cli"
   ];
 
   disabledTestPaths = [

From 96c7496c70637cc943b16c5ae9d2e9ecc68aa2f0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Aug 2024 00:23:13 +0200
Subject: [PATCH 190/342] python312Packages.httpretty: fix build

---
 .../python-modules/httpretty/default.nix       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index ea38f414e32a4..0eb948bea4745 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -2,32 +2,32 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  sure,
-  six,
+  setuptools,
+
+  # tests
   freezegun,
+  mock,
   pytestCheckHook,
+  sure,
 }:
 
 buildPythonPackage rec {
   pname = "httpretty";
   version = "1.1.4";
-  format = "setuptools";
-
-  # drop this for version > 0.9.7
-  # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
-  doCheck = lib.versionAtLeast version "0.9.8";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68";
   };
 
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [
-    sure
     freezegun
+    mock
     pytestCheckHook
+    sure
   ];
 
   disabledTestPaths = [

From 2ebc3e29129965f272dd5cad789783646bbc0b2a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Aug 2024 00:24:01 +0200
Subject: [PATCH 191/342] python312Packages.sure: propagate mock

Used but undeclared runtime dependency.
---
 pkgs/development/python-modules/sure/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index 45d3c055634ff..f4ca02501d00e 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -28,7 +28,11 @@ buildPythonPackage rec {
   '';
 
   build-system = [ setuptools ];
-  dependencies = [ six ];
+
+  dependencies = [
+    mock
+    six
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook

From 73e448164887d069e6586fc0c02f03885757f5af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Aug 2024 00:24:45 +0200
Subject: [PATCH 192/342] python312Packages.proxy-py: disable failing test

---
 pkgs/development/python-modules/proxy-py/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix
index aa940d50ed011..c15880933905b 100644
--- a/pkgs/development/python-modules/proxy-py/default.nix
+++ b/pkgs/development/python-modules/proxy-py/default.nix
@@ -76,6 +76,7 @@ buildPythonPackage rec {
     "web_server"
     # Location is not writable
     "test_gen_csr"
+    "test_gen_public_key"
     # Tests run into a timeout
     "integration"
   ];

From ae24278745eda31a5960bc3a4a7ec151c6394168 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Aug 2024 00:25:12 +0200
Subject: [PATCH 193/342] python312Packages.aiohttp-fast-zlib: 0.1.1 -> 0.1.1

https://github.com/bdraco/aiohttp-fast-zlib/blob/v0.1.1/CHANGELOG.md
---
 pkgs/development/python-modules/aiohttp-fast-zlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
index e320648df3c71..3cea7804918e4 100644
--- a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
+++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-fast-zlib";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiohttp-fast-zlib";
     rev = "v${version}";
-    hash = "sha256-nR/0hVe5zAhLXu+kBOBH+whIjUV44c5yuNOj+Zl+eFo=";
+    hash = "sha256-uPmttfEiWmEtQrBZYwiSjLTMmXhZ0MmaAQJMXTSQj+U=";
   };
 
   postPatch = ''

From f22f05aa079a0944bbddb8092501cd6a0cc446d5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Aug 2024 17:40:53 +0200
Subject: [PATCH 194/342] python312Packages.chacha20poly1305-reuseable: 0.12.2
 -> 0.13.2

https://github.com/bdraco/chacha20poly1305-reuseable/blob/v0.13.2/CHANGELOG.md
---
 .../python-modules/chacha20poly1305-reuseable/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
index 6f306f46211be..f0acd8ea7dab2 100644
--- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
+++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
@@ -18,7 +18,7 @@
 
 let
   pname = "chacha20poly1305-reuseable";
-  version = "0.12.2";
+  version = "0.13.2";
 in
 
 buildPythonPackage {
@@ -31,7 +31,7 @@ buildPythonPackage {
     owner = "bdraco";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-RESSkMWkmlmYarLOI8pX5mwgcr8xAigbp1mrAQP/QNU=";
+    hash = "sha256-i6bhqfYo+gFTf3dqOBSQqGN4WPqbUR05StdwZvrVckI=";
   };
 
   nativeBuildInputs = [
@@ -46,7 +46,7 @@ buildPythonPackage {
 
   preCheck = ''
     substituteInPlace pyproject.toml \
-      --replace "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" ""
+      --replace-fail "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" ""
   '';
 
   nativeCheckInputs = [ pytestCheckHook ];

From 06643a404d92c7371e0aab4ff3d583c791154275 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Aug 2024 18:29:27 +0200
Subject: [PATCH 195/342] python312Packages.psycopg: 3.1.19 -> 3.2.1

https://github.com/psycopg/psycopg/blob/3.2.1/docs/news.rst#current-release
---
 .../python-modules/psycopg/ctypes.patch           | 15 ++++++++-------
 .../python-modules/psycopg/default.nix            |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/psycopg/ctypes.patch b/pkgs/development/python-modules/psycopg/ctypes.patch
index b3816d9c8d7c4..98a6ba080f785 100644
--- a/pkgs/development/python-modules/psycopg/ctypes.patch
+++ b/pkgs/development/python-modules/psycopg/ctypes.patch
@@ -1,12 +1,13 @@
 diff --git a/psycopg/psycopg/pq/_pq_ctypes.py b/psycopg/psycopg/pq/_pq_ctypes.py
-index cfc68672..02929ab6 100644
+index f3a7b143..1bf935fb 100644
 --- a/psycopg/psycopg/pq/_pq_ctypes.py
 +++ b/psycopg/psycopg/pq/_pq_ctypes.py
-@@ -11,14 +11,10 @@ from ctypes import Structure, CFUNCTYPE, POINTER
+@@ -13,14 +13,11 @@ from ctypes import Structure, CFUNCTYPE, POINTER
  from ctypes import c_char, c_char_p, c_int, c_size_t, c_ubyte, c_uint, c_void_p
- from typing import List, Optional, Tuple
+ from typing import Any, NoReturn
  
--from .misc import find_libpq_full_path
+-from .misc import find_libpq_full_path, version_pretty
++from .misc import version_pretty
  from ..errors import NotSupportedError
  
 -libname = find_libpq_full_path()
@@ -18,7 +19,7 @@ index cfc68672..02929ab6 100644
  
  
  class FILE(Structure):
-@@ -28,12 +24,7 @@ class FILE(Structure):
+@@ -30,12 +27,7 @@ class FILE(Structure):
  FILE_ptr = POINTER(FILE)
  
  if sys.platform == "linux":
@@ -33,10 +34,10 @@ index cfc68672..02929ab6 100644
      fdopen = libc.fdopen
      fdopen.argtypes = (c_int, c_char_p)
 diff --git a/tests/fix_pq.py b/tests/fix_pq.py
-index 917dfc91..505f2d65 100644
+index 1cff7e18..218d90a0 100644
 --- a/tests/fix_pq.py
 +++ b/tests/fix_pq.py
-@@ -47,18 +47,7 @@ def pytest_runtest_setup(item):
+@@ -49,18 +49,7 @@ def pytest_runtest_setup(item):
  @pytest.fixture
  def libpq():
      """Return a ctypes wrapper to access the libpq."""
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index c98ee99f154ec..7d1f8c54f3d04 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -35,13 +35,13 @@
 
 let
   pname = "psycopg";
-  version = "3.1.19";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "psycopg";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Fvg67sGWSNwChZTO5QdLSOKrbGfxzQZJqCjI5Jidcqo=";
+    hash = "sha256-jQMIgfMyQpd9bD3F1IhPff39BrFaBD6U7Exryna+Acw=";
   };
 
   patches = [

From eb93fae730190239110db07771f5d72699f8e17a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 5 Aug 2024 19:02:19 +0200
Subject: [PATCH 196/342] python312Packages.moto: 5.0.9 -> 5.0.12

https://github.com/getmoto/moto/blob/5.0.12/CHANGELOG.md
---
 pkgs/development/python-modules/moto/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index a013da79a922a..3f5ae8133936d 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -44,14 +44,14 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "5.0.9";
+  version = "5.0.12";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-63Hxy6AccP/x8WCGrLJNbZrrMoMNZG2JifmKKa6uJLo=";
+    hash = "sha256-EL1DS/2jKWOf6VKUcMTCeTgGTBOZhAJOamJRPlCv9Cc=";
   };
 
   build-system = [ setuptools ];
@@ -159,6 +159,9 @@ buildPythonPackage rec {
 
     # https://github.com/getmoto/moto/issues/7786
     "tests/test_dynamodb/test_dynamodb_import_table.py"
+
+    # Infinite recursion with pycognito
+    "tests/test_cognitoidp/test_cognitoidp.py"
   ];
 
   meta = with lib; {

From 9d4242c7599440bf1f8f0fa86b5d0bb62d63e048 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 5 Aug 2024 21:53:31 +0200
Subject: [PATCH 197/342] python312Packages.sqlalchemy: 2.0.31 -> 2.0.32

https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_32
---
 pkgs/development/python-modules/sqlalchemy/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index a40b2897cdabb..426be56eea9d4 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -41,8 +41,8 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy";
-  version = "2.0.31";
-  format = "pyproject";
+  version = "2.0.32";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -50,11 +50,14 @@ buildPythonPackage rec {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
     rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-+bF7pdz8bxkR+mbrOI773qLoZVzBHpzKOENWPEuVFt8=";
+    hash = "sha256-B0T4GsTIis2ZZykRnNOFfhyfW4qU/waXeP0BS5+G1IM=";
   };
 
   postPatch = ''
     sed -i '/tag_build = dev/d' setup.cfg
+
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=61.0,<69.3" "setuptools"
   '';
 
   nativeBuildInputs = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ];

From 90f0d98ccf279d47db6483292d6ddd98d74a86b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 5 Aug 2024 22:00:08 +0200
Subject: [PATCH 198/342] python312Packages.sqlalchemy_1_4: 1.4.52 -> 1.4.53

https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_53
---
 pkgs/development/python-modules/sqlalchemy/1_4.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix
index 376570156dbdf..45664292350cf 100644
--- a/pkgs/development/python-modules/sqlalchemy/1_4.nix
+++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix
@@ -36,18 +36,21 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy";
-  version = "1.4.52";
+  version = "1.4.53";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
     rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-3JiPDOI6KDQwtBtISvHi3d+Rdm0pz1d9cnZu3+f4jYE=";
+    hash = "sha256-CpFvL0W/X7/4N/FpufAdud5o11LHBuox8m+8EailqXg=";
   };
 
   postPatch = ''
     sed -i '/tag_build = dev/d' setup.cfg
+
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=44,<69.3" "setuptools"
   '';
 
   nativeBuildInputs = [ setuptools ];

From 12dd2562179379ad7d4f7896672b901c4fd484e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 6 Aug 2024 13:12:27 -0700
Subject: [PATCH 199/342] python312Packages.aiohttp: 3.10.0 -> 3.10.1

Diff: https://github.com/aio-libs/aiohttp/compare/refs/tags/v3.10.0...v3.10.1

Changelog: https://github.com/aio-libs/aiohttp/blob/v3.10.1/CHANGES.rst
---
 pkgs/development/python-modules/aiohttp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index b0682cec1be7e..83b35614aa4e0 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.10.0";
+  version = "3.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiohttp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8B5WyG3XUAxjoY08PTbkNM11K/ytlvdplhf2VV+I+JU=";
+    hash = "sha256-+1Qu5Y1FwrsqWuvhOANdYXamxZJ9Z41EXaiEhyvtFUE=";
   };
 
   patches = [

From 30889c3463e60d4090a45fa76a46d83398d5d1bb Mon Sep 17 00:00:00 2001
From: Theo Paris <theo@tinted.dev>
Date: Sun, 4 Aug 2024 17:42:57 -0700
Subject: [PATCH 200/342] cargo,clippy,rustc,rustfmt: 1.79.0 -> 1.80.0

---
 .../compilers/rust/{1_79.nix => 1_80.nix}     | 32 +++++++++----------
 pkgs/top-level/all-packages.nix               |  8 ++---
 2 files changed, 20 insertions(+), 20 deletions(-)
 rename pkgs/development/compilers/rust/{1_79.nix => 1_80.nix} (71%)

diff --git a/pkgs/development/compilers/rust/1_79.nix b/pkgs/development/compilers/rust/1_80.nix
similarity index 71%
rename from pkgs/development/compilers/rust/1_79.nix
rename to pkgs/development/compilers/rust/1_80.nix
index 71f4b0beffa72..b995c329963e2 100644
--- a/pkgs/development/compilers/rust/1_79.nix
+++ b/pkgs/development/compilers/rust/1_80.nix
@@ -46,8 +46,8 @@ let
 in
 import ./default.nix
   {
-    rustcVersion = "1.79.0";
-    rustcSha256 = "sha256-Fy7PPH0fnZ+xbNKmKIaXgmcEFt7QEp5SSoZ1H5YUSMA=";
+    rustcVersion = "1.80.0";
+    rustcSha256 = "sha256-b2BsGT8jD2ssrkV297JNUPX5sl3/Edv5si94fTUh1nI=";
 
     llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
     llvmSharedForHost = llvmSharedFor pkgsBuildHost;
@@ -104,25 +104,25 @@ import ./default.nix
 
     # Note: the version MUST be one version prior to the version we're
     # building
-    bootstrapVersion = "1.78.0";
+    bootstrapVersion = "1.79.0";
 
     # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
     bootstrapHashes = {
-      i686-unknown-linux-gnu = "8f3f5d2ab7b609ab30d584cfb5cecc3d8b16d2620fffb7643383c8a0a3881e21";
-      x86_64-unknown-linux-gnu = "1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87";
-      x86_64-unknown-linux-musl = "c11ab908cbffbe98097d99ed62f5db00aa98496520b1e09583a151d36df7fca4";
-      arm-unknown-linux-gnueabihf = "2a2b1cf93b31e429624380e5b0d2bcce327274f8593b63657b863e38831f6421";
-      armv7-unknown-linux-gnueabihf = "fcce5ddb4f55bbdc9a1359a4cb6e65f2ff790d59ad228102cd472112ea65d3fe";
-      aarch64-unknown-linux-gnu = "131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af";
-      aarch64-unknown-linux-musl = "f328bcf109bf3eae01559b53939a9afbdb70ef30429f95109f7ea21030d60dfa";
-      x86_64-apple-darwin = "6c91ed3bd90253961fcb4a2991b8b22e042e2aaa9aba9f389f1e17008171d898";
-      aarch64-apple-darwin = "3be74c31ee8dc4f1d49e2f2888228de374138eaeca1876d0c1b1a61df6023b3b";
-      powerpc64le-unknown-linux-gnu = "c5aedb12c552daa18072e386697205fb7b91cef1e8791fe6fb74834723851388";
-      riscv64gc-unknown-linux-gnu = "847a925ace172d4c0a8d3da8d755b8678071ef73e659886128a3103bb896dcd9";
-      x86_64-unknown-freebsd = "b9cc84c60deb8da08a6c876426f8721758f4c7e7c553b4554385752ad37c63df";
+      i686-unknown-linux-gnu = "0a1e371809446cd77dba7abce2afb4efac8d8b2e63483cfe19f1c98bf9ab7855";
+      x86_64-unknown-linux-gnu = "628efa8ef0658a7c4199883ee132281f19931448d3cfee4ecfd768898fe74c18";
+      x86_64-unknown-linux-musl = "2e4b0e40d027e2b31a40163986b4c04dfd0bce41c706a99f2e82ba473a4383de";
+      arm-unknown-linux-gnueabihf = "ce8d8d296277a06e0d2f63a21a0586717e09be3df28c0d1a04bc2c6f85eecc15";
+      armv7-unknown-linux-gnueabihf = "31968f88b22058e384dfb3cdf3efe7f60c03481d790300fcffc420d5ba3851f2";
+      aarch64-unknown-linux-gnu = "f7d3b31581331b54af97cf3162e65b8c26c8aa14d42f71c1ce9adc1078ef54e5";
+      aarch64-unknown-linux-musl = "f8100c806754cd21600ded26546467a1a242db9b9ab8a6a666656e3cc4edfa52";
+      x86_64-apple-darwin = "62f018aad30bafa0ef8bff0ed60d5d45e6cadc799769aad9d945509203e9f921";
+      aarch64-apple-darwin = "e70a9362975b94df7dbc6e2ed5ceab4254dd32f72ba497ff4a70440ace3f729f";
+      powerpc64le-unknown-linux-gnu = "9865eeebb5bb20006367d3148d9116576499ec958d847e22b645f008a1bc4170";
+      riscv64gc-unknown-linux-gnu = "c8d38e600ef4dea8b375df2d08153393816ffd3dcab18e4d081ddc19e28b5a40";
+      x86_64-unknown-freebsd = "3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d";
     };
 
-    selectRustPackage = pkgs: pkgs.rust_1_79;
+    selectRustPackage = pkgs: pkgs.rust_1_80;
 
     rustcPatches = [ ];
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d33b6db140b30..cd1755f642022 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16051,11 +16051,11 @@ with pkgs;
   wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args;
   wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
 
-  rust_1_79 = callPackage ../development/compilers/rust/1_79.nix {
+  rust_1_80 = callPackage ../development/compilers/rust/1_80.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
     llvm_18 = llvmPackages_18.libllvm;
   };
-  rust = rust_1_79;
+  rust = rust_1_80;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
@@ -16063,8 +16063,8 @@ with pkgs;
     openssl = openssl_1_1;
   };
 
-  rustPackages_1_79 = rust_1_79.packages.stable;
-  rustPackages = rustPackages_1_79;
+  rustPackages_1_80 = rust_1_80.packages.stable;
+  rustPackages = rustPackages_1_80;
 
   inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
 

From 5e12a4df29d652aafd3df1e76aa1e9a0fa20eea0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 00:50:50 +0200
Subject: [PATCH 201/342] python312Packages.django: 4.2.14 -> 4.2.15

https://docs.djangoproject.com/en/4.2/releases/4.2.15/
https://www.djangoproject.com/weblog/2024/aug/06/security-releases/

Fixes: CVE-2024-41989, CVE-2024-41990, CVE-2024-41991, CVE-2024-42005
---
 pkgs/development/python-modules/django/4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 34f2075a442af..398e0516b7d48 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.14";
+  version = "4.2.15";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-Nt+dVIikfe7gJY6/qJzkolkXeSFNBCbCEMSaKYmvCz4=";
+    hash = "sha256-SWENMUsTgP3X3EvFiTgpKCZO0/KaZ1x1stSyp2kM/P4=";
   };
 
   patches =

From e1a55fe1b70243191088dcf9f645ae8871292f2a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 7 Aug 2024 11:33:59 +0300
Subject: [PATCH 202/342] mesa: use upstream version of patch

---
 pkgs/development/libraries/mesa/default.nix         |  8 +++++---
 pkgs/development/libraries/mesa/vcn-pagefault.patch | 10 ----------
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa/vcn-pagefault.patch

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 6f3f7b45b569e..3941606e3e9a2 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -139,10 +139,12 @@ in stdenv.mkDerivation {
   patches = [
     ./opencl.patch
 
-    # Manual backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30510
     # Fixes video corruption / crashes when decoding video on AMD iGPUs
-    # FIXME: remove when merged
-    ./vcn-pagefault.patch
+    # FIXME: remove in the next update
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/8b35da91b23afc65256b78a59d116fd09544cd28.patch";
+      hash = "sha256-z0KKBtot3VxXiS16YcmwZbeg8HSCLzEbvWdufI/fOk8=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/mesa/vcn-pagefault.patch b/pkgs/development/libraries/mesa/vcn-pagefault.patch
deleted file mode 100644
index 9b8c7b99c564e..0000000000000
--- a/pkgs/development/libraries/mesa/vcn-pagefault.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
-+++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c
-@@ -1390,6 +1390,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn
-                            dummy->dpb.res;
-                addr = dec->ws->buffer_get_virtual_address(dummy_res->buf);
-             }
-+            dec->ws->cs_add_buffer(&dec->cs, d->dpb.res->buf, RADEON_USAGE_READWRITE | RADEON_USAGE_SYNCHRONIZED, RADEON_DOMAIN_VRAM);
-             dynamic_dpb_t2->dpbAddrLo[i] = addr;
-             dynamic_dpb_t2->dpbAddrHi[i] = addr >> 32;
-             ++dynamic_dpb_t2->dpbArraySize;

From 83fa6dab8e2f5ffb575d287d862beb5c47591bac Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Sun, 4 Aug 2024 15:48:51 +0200
Subject: [PATCH 203/342] cosmic-comp: unstable-2023-11-13 -> 1.0.0-alpha.1

---
 pkgs/by-name/co/cosmic-comp/Cargo.lock  | 3588 +++++++++++++++--------
 pkgs/by-name/co/cosmic-comp/package.nix |   27 +-
 2 files changed, 2333 insertions(+), 1282 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-comp/Cargo.lock b/pkgs/by-name/co/cosmic-comp/Cargo.lock
index 10627f9f08e5e..443bc0ac423c9 100644
--- a/pkgs/by-name/co/cosmic-comp/Cargo.lock
+++ b/pkgs/by-name/co/cosmic-comp/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.23"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225"
+checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -30,9 +30,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -45,34 +45,23 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom",
  "once_cell",
  "serde",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -85,9 +74,9 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "almost"
@@ -97,12 +86,12 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14"
 
 [[package]]
 name = "android-activity"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052ad56e336bcc615a214bffbeca6c181ee9550acec193f0327e0b103b033a4d"
+checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cc",
  "cesu8",
  "jni",
@@ -122,6 +111,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -133,9 +128,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 dependencies = [
  "backtrace",
 ]
@@ -172,15 +167,15 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
 
 [[package]]
 name = "arrayvec"
@@ -190,9 +185,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "as-raw-xcb-connection"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5f312b0a56c5cdf967c0aeb67f6289603354951683bc97ddc595ab974ba9aa"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
 
 [[package]]
 name = "ash"
@@ -203,11 +198,158 @@ dependencies = [
  "libloading 0.7.4",
 ]
 
+[[package]]
+name = "ash"
+version = "0.38.0+1.3.281"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
+dependencies = [
+ "libloading 0.8.5",
+]
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "async-task"
-version = "4.5.0"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
 
 [[package]]
 name = "atomic-waker"
@@ -218,8 +360,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 [[package]]
 name = "atomicwrites"
 version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a"
+source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768"
 dependencies = [
  "rustix",
  "tempfile",
@@ -228,15 +369,15 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -255,18 +396,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
-name = "bincode"
-version = "1.3.3"
+name = "base64"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bit-set"
@@ -297,9 +435,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -320,48 +458,57 @@ dependencies = [
 ]
 
 [[package]]
-name = "block-sys"
-version = "0.2.0"
+name = "block2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dd7cf50912cddc06dc5ea7c08c5e81c1b2c842a70d19def1848d54c586fed92"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
- "objc-sys",
+ "objc2",
 ]
 
 [[package]]
-name = "block2"
-version = "0.3.0"
+name = "blocking"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
 dependencies = [
- "block-sys",
- "objc2",
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "by_address"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.5.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
+checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -372,18 +519,17 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "calloop"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf"
+checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "async-task",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "log",
  "polling",
  "rustix",
@@ -391,23 +537,37 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "calloop"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10"
+dependencies = [
+ "async-task",
+ "bitflags 2.6.0",
+ "log",
+ "polling",
+ "rustix",
+ "slab",
+]
+
 [[package]]
 name = "calloop-wayland-source"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
+checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
 dependencies = [
- "calloop",
+ "calloop 0.13.0",
  "rustix",
- "wayland-backend 0.3.2",
- "wayland-client 0.31.1",
+ "wayland-backend",
+ "wayland-client",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
 dependencies = [
  "jobserver",
  "libc",
@@ -431,6 +591,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "cgmath"
 version = "0.18.0"
@@ -441,18 +607,71 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "clipboard-win"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
+dependencies = [
+ "error-code",
+]
+
+[[package]]
+name = "clipboard_macos"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+dependencies = [
+ "objc",
+ "objc-foundation",
+ "objc_id",
+]
+
+[[package]]
+name = "clipboard_wayland"
+version = "0.2.2"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+dependencies = [
+ "dnd",
+ "mime 0.1.0",
+ "smithay-clipboard",
+]
+
+[[package]]
+name = "clipboard_x11"
+version = "0.4.2"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+dependencies = [
+ "thiserror",
+ "x11rb",
+]
+
 [[package]]
 name = "cocoa"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
 dependencies = [
  "bitflags 1.3.2",
  "block",
  "cocoa-foundation",
  "core-foundation",
- "core-graphics 0.22.3",
- "foreign-types 0.3.2",
+ "core-graphics",
+ "foreign-types",
  "libc",
  "objc",
 ]
@@ -488,16 +707,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
-name = "com-rs"
-version = "0.2.1"
+name = "com"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
+dependencies = [
+ "com_macros",
+]
+
+[[package]]
+name = "com_macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
+dependencies = [
+ "com_macros_support",
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "com_macros_support"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
 
 [[package]]
 name = "combine"
-version = "4.6.6"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "memchr",
@@ -505,60 +749,67 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
-name = "core-foundation"
-version = "0.9.3"
+name = "const-random"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 dependencies = [
- "core-foundation-sys",
- "libc",
+ "const-random-macro",
 ]
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.4"
+name = "const-random-macro"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "tiny-keccak",
+]
 
 [[package]]
-name = "core-graphics"
-version = "0.22.3"
+name = "core-foundation"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.3.2",
+ "core-foundation-sys",
  "libc",
 ]
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
 [[package]]
 name = "core-graphics"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
 ]
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
@@ -570,21 +821,22 @@ name = "cosmic-comp"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "bytemuck",
- "calloop",
+ "calloop 0.14.0",
  "cosmic-comp-config",
  "cosmic-config",
  "cosmic-protocols",
+ "cosmic-settings-config",
  "edid-rs",
  "egui",
  "egui_plot",
- "glow",
+ "glow 0.12.3",
  "i18n-embed",
  "i18n-embed-fl",
  "iced_tiny_skia",
  "id_tree",
- "indexmap 2.1.0",
+ "indexmap 2.3.0",
  "keyframe",
  "lazy_static",
  "libc",
@@ -594,33 +846,38 @@ dependencies = [
  "once_cell",
  "ordered-float",
  "png",
- "puffin",
- "puffin_egui",
+ "profiling",
  "regex",
- "renderdoc",
  "ron",
  "rust-embed",
+ "rustix",
+ "sanitize-filename",
  "sendfd",
  "serde",
  "serde_json",
+ "smallvec",
  "smithay",
  "smithay-egui",
  "thiserror",
- "tiny-skia 0.10.0",
+ "time",
+ "tiny-skia 0.11.4",
  "tracing",
  "tracing-journald",
  "tracing-subscriber",
- "wayland-backend 0.3.2",
- "wayland-scanner 0.31.0",
+ "wayland-backend",
+ "wayland-scanner",
  "xcursor",
  "xdg",
- "xkbcommon",
+ "xdg-user",
+ "xkbcommon 0.7.0",
+ "zbus",
 ]
 
 [[package]]
 name = "cosmic-comp-config"
 version = "0.1.0"
 dependencies = [
+ "cosmic-config",
  "input",
  "serde",
 ]
@@ -628,22 +885,26 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
  "atomicwrites",
- "calloop",
+ "calloop 0.14.0",
  "cosmic-config-derive",
- "dirs 5.0.1",
+ "dirs",
  "iced_futures",
+ "known-folders",
  "notify",
+ "once_cell",
  "ron",
  "serde",
+ "tracing",
+ "xdg",
 ]
 
 [[package]]
 name = "cosmic-config-derive"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
  "quote",
  "syn 1.0.109",
@@ -652,29 +913,45 @@ dependencies = [
 [[package]]
 name = "cosmic-protocols"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41"
+source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#de2fead49d6af3a221db153642e4d7c2235aafc4"
 dependencies = [
- "bitflags 2.4.1",
- "wayland-backend 0.3.2",
+ "bitflags 2.6.0",
+ "wayland-backend",
  "wayland-protocols",
- "wayland-scanner 0.31.0",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
  "wayland-server",
 ]
 
 [[package]]
-name = "cosmic-text"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9"
+name = "cosmic-settings-config"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/cosmic-settings-daemon#362c77f9faaeb7f1b9e4aa79a7d5588001f04874"
 dependencies = [
- "aliasable",
- "fontdb",
- "libm",
+ "cosmic-config",
+ "serde",
+ "serde_with",
+ "thiserror",
+ "tracing",
+ "xkbcommon 0.7.0",
+]
+
+[[package]]
+name = "cosmic-text"
+version = "0.12.1"
+source = "git+https://github.com/pop-os/cosmic-text.git#e16b39f29c84773a05457fe39577a602de27855c"
+dependencies = [
+ "bitflags 2.6.0",
+ "fontdb",
  "log",
  "rangemap",
- "rustybuzz 0.8.0",
+ "rayon",
+ "rustc-hash",
+ "rustybuzz 0.14.1",
+ "self_cell 1.0.4",
  "swash",
  "sys-locale",
+ "ttf-parser 0.21.1",
  "unicode-bidi",
  "unicode-linebreak",
  "unicode-script",
@@ -684,77 +961,71 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
  "almost",
  "cosmic-config",
  "csscolorparser",
+ "dirs",
  "lazy_static",
  "palette",
  "ron",
  "serde",
+ "serde_json",
+ "thiserror",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
- "memoffset 0.9.0",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
@@ -774,9 +1045,9 @@ dependencies = [
 
 [[package]]
 name = "css-color"
-version = "0.2.5"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4"
+checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a"
 
 [[package]]
 name = "csscolorparser"
@@ -788,6 +1059,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ctor-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b"
+
 [[package]]
 name = "cursor-icon"
 version = "1.1.0"
@@ -796,20 +1073,19 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 
 [[package]]
 name = "d3d12"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.4",
+ "bitflags 2.6.0",
+ "libloading 0.8.5",
  "winapi",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -817,27 +1093,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
- "syn 2.0.39",
+ "strsim 0.11.1",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -847,10 +1123,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.9",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -859,13 +1135,20 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
 
+[[package]]
+name = "data-url"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
+
 [[package]]
 name = "deranged"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
+ "serde",
 ]
 
 [[package]]
@@ -877,7 +1160,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -891,33 +1174,13 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys 0.3.7",
-]
-
 [[package]]
 name = "dirs"
 version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys 0.4.1",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -940,13 +1203,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
 [[package]]
 name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -955,42 +1218,86 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.1",
+ "libloading 0.8.5",
 ]
 
 [[package]]
 name = "dlv-list"
-version = "0.3.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+dependencies = [
+ "const-random",
+]
+
+[[package]]
+name = "dnd"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+dependencies = [
+ "bitflags 2.6.0",
+ "mime 0.1.0",
+ "raw-window-handle",
+ "smithay-client-toolkit",
+ "smithay-clipboard",
+]
 
 [[package]]
 name = "downcast-rs"
-version = "1.2.0"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "dpi"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
 
 [[package]]
 name = "drm"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87"
+checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "bytemuck",
- "drm-ffi",
+ "drm-ffi 0.7.1",
  "drm-fourcc",
- "nix 0.27.1",
+ "rustix",
+]
+
+[[package]]
+name = "drm"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1"
+dependencies = [
+ "bitflags 2.6.0",
+ "bytemuck",
+ "drm-ffi 0.8.0",
+ "drm-fourcc",
+ "rustix",
 ]
 
 [[package]]
 name = "drm-ffi"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d"
+checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
 dependencies = [
- "drm-sys",
- "nix 0.27.1",
+ "drm-sys 0.6.1",
+ "rustix",
+]
+
+[[package]]
+name = "drm-ffi"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53"
+dependencies = [
+ "drm-sys 0.7.0",
+ "rustix",
 ]
 
 [[package]]
@@ -1001,9 +1308,23 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
 
 [[package]]
 name = "drm-sys"
-version = "0.5.0"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
+dependencies = [
+ "libc",
+ "linux-raw-sys 0.6.4",
+]
+
+[[package]]
+name = "drm-sys"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae"
+checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986"
+dependencies = [
+ "libc",
+ "linux-raw-sys 0.6.4",
+]
 
 [[package]]
 name = "ecolor"
@@ -1028,7 +1349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7"
 dependencies = [
  "accesskit",
- "ahash 0.8.6",
+ "ahash",
  "epaint",
  "nohash-hasher",
  "serde",
@@ -1058,7 +1379,7 @@ checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc"
 dependencies = [
  "bytemuck",
  "egui",
- "glow",
+ "glow 0.12.3",
  "log",
  "memoffset 0.6.5",
  "wasm-bindgen",
@@ -1076,9 +1397,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "emath"
@@ -1092,18 +1413,24 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
 [[package]]
 name = "enum-map"
-version = "2.7.0"
+version = "2.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53337c2dbf26a3c31eccc73a37b10c1614e8d4ae99b6a50d553e8936423c1f16"
+checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
 dependencies = [
  "enum-map-derive",
  "serde",
@@ -1111,24 +1438,45 @@ dependencies = [
 
 [[package]]
 name = "enum-map-derive"
-version = "0.14.0"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "enumflags2"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "enumn"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1138,12 +1486,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e"
 dependencies = [
  "ab_glyph",
- "ahash 0.8.6",
+ "ahash",
  "bytemuck",
  "ecolor",
  "emath",
  "nohash-hasher",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "serde",
 ]
 
@@ -1155,19 +1503,25 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.5"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "error-code"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+
 [[package]]
 name = "etagere"
-version = "0.2.9"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf70b9ea3a235a7432b4f481854815e2d4fb2fe824c1f5fb09b8985dd06b3e9"
+checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495"
 dependencies = [
  "euclid",
  "svg_fmt",
@@ -1175,18 +1529,39 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.22.9"
+version = "0.22.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
+checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "exr"
-version = "1.6.4"
+version = "1.72.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56"
+checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
 dependencies = [
  "bit_field",
  "flume",
@@ -1206,38 +1581,29 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
 dependencies = [
  "simd-adler32",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1251,9 +1617,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1264,9 +1630,6 @@ name = "float-cmp"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-dependencies = [
- "num-traits",
-]
 
 [[package]]
 name = "float_next_after"
@@ -1276,9 +1639,9 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
 
 [[package]]
 name = "fluent"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7"
+checksum = "bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a"
 dependencies = [
  "fluent-bundle",
  "unic-langid",
@@ -1286,16 +1649,16 @@ dependencies = [
 
 [[package]]
 name = "fluent-bundle"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd"
+checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493"
 dependencies = [
  "fluent-langneg",
  "fluent-syntax",
  "intl-memoizer",
  "intl_pluralrules",
  "rustc-hash",
- "self_cell",
+ "self_cell 0.10.3",
  "smallvec",
  "unic-langid",
 ]
@@ -1311,23 +1674,19 @@ dependencies = [
 
 [[package]]
 name = "fluent-syntax"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78"
+checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "flume"
-version = "0.10.14"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
- "futures-core",
- "futures-sink",
- "nanorand",
- "pin-project",
  "spin",
 ]
 
@@ -1337,36 +1696,36 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "font-types"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "fontconfig-parser"
-version = "0.5.3"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4"
+checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
 dependencies = [
- "roxmltree 0.18.1",
+ "roxmltree 0.20.0",
 ]
 
 [[package]]
 name = "fontdb"
-version = "0.14.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e"
+checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
 dependencies = [
  "fontconfig-parser",
  "log",
- "memmap2 0.6.2",
+ "memmap2 0.9.4",
  "slotmap",
  "tinyvec",
- "ttf-parser 0.19.2",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared 0.1.1",
+ "ttf-parser 0.20.0",
 ]
 
 [[package]]
@@ -1376,7 +1735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared 0.3.1",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -1387,15 +1746,9 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -1404,18 +1757,18 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
 
 [[package]]
 name = "fraction"
-version = "0.13.1"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678"
+checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7"
 dependencies = [
  "lazy_static",
  "num",
@@ -1423,11 +1776,11 @@ dependencies = [
 
 [[package]]
 name = "freedesktop-icons"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e"
+checksum = "a8ef34245e0540c9a3ce7a28340b98d2c12b75da0d446da4e8224923fcaa0c16"
 dependencies = [
- "dirs 4.0.0",
+ "dirs",
  "once_cell",
  "rust-ini",
  "thiserror",
@@ -1445,9 +1798,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1460,9 +1813,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1470,15 +1823,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1488,38 +1841,51 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1535,69 +1901,68 @@ dependencies = [
 
 [[package]]
 name = "gbm"
-version = "0.13.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c97c1672f2d951da311cd20b148794c4157a8879c7650e65f76c7826e2b1c1"
+checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a"
 dependencies = [
- "bitflags 1.3.2",
- "drm",
+ "bitflags 2.6.0",
+ "drm 0.12.0",
  "drm-fourcc",
  "gbm-sys",
  "libc",
- "wayland-backend 0.3.2",
- "wayland-server",
 ]
 
 [[package]]
 name = "gbm-sys"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67"
+checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58"
 dependencies = [
  "libc",
 ]
 
 [[package]]
-name = "generic-array"
-version = "0.14.7"
+name = "generator"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "979f00864edc7516466d6b3157706e06c032f22715700ddd878228a91d02bc56"
 dependencies = [
- "typenum",
- "version_check",
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows 0.58.0",
 ]
 
 [[package]]
-name = "gethostname"
-version = "0.2.3"
+name = "generic-array"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
- "libc",
- "winapi",
+ "typenum",
+ "version_check",
 ]
 
 [[package]]
 name = "gethostname"
-version = "0.3.0"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
 dependencies = [
  "libc",
- "winapi",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -1611,10 +1976,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "gimli"
-version = "0.28.0"
+name = "gif"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "gimli"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "gl_generator"
@@ -1646,10 +2021,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "glyphon"
-version = "0.3.0"
+name = "glow"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
+dependencies = [
+ "js-sys",
+ "slotmap",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "glutin_wgl_sys"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a"
+checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+dependencies = [
+ "gl_generator",
+]
+
+[[package]]
+name = "glyphon"
+version = "0.5.0"
+source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8"
 dependencies = [
  "cosmic-text",
  "etagere",
@@ -1659,34 +2054,34 @@ dependencies = [
 
 [[package]]
 name = "gpu-alloc"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "gpu-alloc-types",
 ]
 
 [[package]]
 name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "gpu-allocator"
-version = "0.22.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
 dependencies = [
- "backtrace",
  "log",
+ "presser",
  "thiserror",
  "winapi",
- "windows",
+ "windows 0.52.0",
 ]
 
 [[package]]
@@ -1695,9 +2090,9 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "gpu-descriptor-types",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -1706,7 +2101,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -1727,9 +2122,9 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.3.1"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -1740,30 +2135,27 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.7",
-]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.6",
+ "ahash",
  "allocator-api2",
 ]
 
 [[package]]
 name = "hassle-rs"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
 dependencies = [
- "bitflags 1.3.2",
- "com-rs",
+ "bitflags 2.6.0",
+ "com",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.5",
  "thiserror",
  "widestring",
  "winapi",
@@ -1777,9 +2169,21 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hexf-parse"
@@ -1796,6 +2200,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "i18n-config"
 version = "0.4.6"
@@ -1806,7 +2219,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "thiserror",
- "toml 0.8.6",
+ "toml 0.8.19",
  "unic-langid",
 ]
 
@@ -1825,7 +2238,7 @@ dependencies = [
  "lazy_static",
  "locale_config",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "rust-embed",
  "thiserror",
  "unic-langid",
@@ -1834,9 +2247,9 @@ dependencies = [
 
 [[package]]
 name = "i18n-embed-fl"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2"
+checksum = "8241a781f49e923415e106fcd1f89c3fab92cc9f699a521c56e95dee273903d3"
 dependencies = [
  "dashmap",
  "find-crate",
@@ -1848,54 +2261,87 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "strsim",
- "syn 2.0.39",
+ "strsim 0.10.0",
+ "syn 2.0.72",
  "unic-langid",
 ]
 
 [[package]]
 name = "i18n-embed-impl"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b"
+checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58"
 dependencies = [
  "find-crate",
  "i18n-config",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core 0.52.0",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
 ]
 
 [[package]]
 name = "iced"
-version = "0.10.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
+ "dnd",
  "iced_core",
  "iced_futures",
  "iced_renderer",
  "iced_widget",
  "image",
+ "mime 0.1.0",
  "thiserror",
+ "window_clipboard",
 ]
 
 [[package]]
 name = "iced_core"
-version = "0.10.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
- "bitflags 1.3.2",
- "instant",
+ "bitflags 2.6.0",
+ "dnd",
  "log",
+ "mime 0.1.0",
+ "num-traits",
  "palette",
+ "raw-window-handle",
+ "serde",
+ "smol_str",
  "thiserror",
- "twox-hash",
+ "web-time 0.2.4",
+ "window_clipboard",
+ "xxhash-rust",
 ]
 
 [[package]]
 name = "iced_futures"
-version = "0.7.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
  "futures",
  "iced_core",
@@ -1906,49 +2352,56 @@ dependencies = [
 
 [[package]]
 name = "iced_graphics"
-version = "0.9.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "bytemuck",
+ "cosmic-text",
  "glam",
  "half",
  "iced_core",
+ "iced_futures",
  "image",
  "kamadak-exif",
  "log",
  "lyon_path",
- "raw-window-handle 0.5.2",
+ "once_cell",
+ "raw-window-handle",
+ "rustc-hash",
  "thiserror",
+ "unicode-segmentation",
+ "xxhash-rust",
 ]
 
 [[package]]
 name = "iced_renderer"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
  "iced_wgpu",
  "log",
- "raw-window-handle 0.5.2",
  "thiserror",
 ]
 
 [[package]]
 name = "iced_runtime"
-version = "0.1.1"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
+ "dnd",
  "iced_core",
  "iced_futures",
  "thiserror",
+ "window_clipboard",
 ]
 
 [[package]]
 name = "iced_style"
-version = "0.9.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
  "iced_core",
  "once_cell",
@@ -1957,28 +2410,28 @@ dependencies = [
 
 [[package]]
 name = "iced_tiny_skia"
-version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
  "bytemuck",
  "cosmic-text",
  "iced_graphics",
  "kurbo 0.9.5",
  "log",
- "raw-window-handle 0.5.2",
- "resvg 0.35.0",
+ "resvg 0.37.0",
  "rustc-hash",
  "softbuffer",
- "tiny-skia 0.10.0",
- "twox-hash",
+ "tiny-skia 0.11.4",
+ "xxhash-rust",
 ]
 
 [[package]]
 name = "iced_wgpu"
-version = "0.11.1"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
- "bitflags 1.3.2",
+ "as-raw-xcb-connection",
+ "bitflags 2.6.0",
  "bytemuck",
  "futures",
  "glam",
@@ -1988,18 +2441,25 @@ dependencies = [
  "log",
  "lyon",
  "once_cell",
- "raw-window-handle 0.5.2",
- "resvg 0.35.0",
- "rustc-hash",
- "twox-hash",
+ "raw-window-handle",
+ "resvg 0.37.0",
+ "rustix",
+ "smithay-client-toolkit",
+ "tiny-xlib",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-sys",
  "wgpu",
+ "x11rb",
 ]
 
 [[package]]
 name = "iced_widget"
-version = "0.1.3"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+version = "0.12.0"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
+ "dnd",
  "iced_renderer",
  "iced_runtime",
  "iced_style",
@@ -2007,17 +2467,7 @@ dependencies = [
  "ouroboros",
  "thiserror",
  "unicode-segmentation",
-]
-
-[[package]]
-name = "icrate"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
-dependencies = [
- "block2",
- "dispatch",
- "objc2",
+ "window_clipboard",
 ]
 
 [[package]]
@@ -2036,9 +2486,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -2046,17 +2496,16 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
  "exr",
- "gif",
+ "gif 0.13.1",
  "jpeg-decoder",
- "num-rational",
  "num-traits",
  "png",
  "qoi",
@@ -2088,12 +2537,13 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.5",
+ "serde",
 ]
 
 [[package]]
@@ -2118,41 +2568,38 @@ dependencies = [
 
 [[package]]
 name = "input"
-version = "0.8.3"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059"
+checksum = "7911ce3db9c10c5ab4a35c49af778a5f9a827bd0f7371d9be56175d8dd2740d0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "input-sys",
  "io-lifetimes 1.0.11",
  "libc",
  "log",
- "udev 0.7.0",
+ "udev",
 ]
 
 [[package]]
 name = "input-sys"
-version = "1.17.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f6c2a17e8aba7217660e32863af87b0febad811d4b8620ef76b386603fddc2"
-dependencies = [
- "libc",
-]
+checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0"
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "intl-memoizer"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f"
+checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda"
 dependencies = [
  "type-map",
  "unic-langid",
@@ -2173,22 +2620,22 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "io-lifetimes"
-version = "2.0.2"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c"
+checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c"
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jni"
@@ -2214,27 +2661,27 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.27"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 dependencies = [
  "rayon",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2260,12 +2707,12 @@ dependencies = [
 
 [[package]]
 name = "khronos-egl"
-version = "4.1.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.5",
  "pkg-config",
 ]
 
@@ -2275,6 +2722,15 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
+[[package]]
+name = "known-folders"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "kqueue"
 version = "1.0.8"
@@ -2315,9 +2771,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lebe"
@@ -2327,16 +2783,17 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libcosmic"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a"
+source = "git+https://github.com/pop-os/libcosmic/#b40839638ab0e1d96de3f817eded647e6952db40"
 dependencies = [
  "apply",
+ "chrono",
  "cosmic-config",
  "cosmic-theme",
  "css-color",
@@ -2353,6 +2810,7 @@ dependencies = [
  "iced_widget",
  "lazy_static",
  "palette",
+ "serde",
  "slotmap",
  "taffy",
  "thiserror",
@@ -2373,12 +2831,12 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.1"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-sys 0.48.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2389,24 +2847,23 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libredox"
-version = "0.0.1"
+version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "libc",
  "redox_syscall 0.4.1",
 ]
 
 [[package]]
 name = "libredox"
-version = "0.0.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.4.1",
 ]
 
 [[package]]
@@ -2431,14 +2888,14 @@ dependencies = [
 
 [[package]]
 name = "libsystemd"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b9597a67aa1c81a6624603e6bd0bcefb9e0f94c9c54970ec53771082104b4e"
+checksum = "c592dc396b464005f78a5853555b9f240bc5378bf5221acc4e129910b2678869"
 dependencies = [
  "hmac",
  "libc",
  "log",
- "nix 0.26.4",
+ "nix 0.27.1",
  "nom",
  "once_cell",
  "serde",
@@ -2459,9 +2916,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4"
 
 [[package]]
 name = "locale_config"
@@ -2478,9 +2941,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2488,9 +2951,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "log-panics"
@@ -2502,13 +2965,26 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "lru"
-version = "0.11.1"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
+checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
 dependencies = [
- "hashbrown 0.14.2",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -2523,9 +2999,9 @@ dependencies = [
 
 [[package]]
 name = "lyon_algorithms"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e"
+checksum = "a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623"
 dependencies = [
  "lyon_path",
  "num-traits",
@@ -2533,9 +3009,9 @@ dependencies = [
 
 [[package]]
 name = "lyon_geom"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad"
+checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9"
 dependencies = [
  "arrayvec",
  "euclid",
@@ -2544,9 +3020,9 @@ dependencies = [
 
 [[package]]
 name = "lyon_path"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45"
+checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7"
 dependencies = [
  "lyon_geom",
  "num-traits",
@@ -2554,21 +3030,15 @@ dependencies = [
 
 [[package]]
 name = "lyon_tessellation"
-version = "1.0.11"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bcac20d47825850fabf1e869bf7c2bbe2daefa0776c3cd2eb7cb74635f6e4a"
+checksum = "579d42360a4b09846eff2feef28f538696c7d6c7439bfa65874ff3cbe0951b2c"
 dependencies = [
  "float_next_after",
  "lyon_path",
- "thiserror",
+ "num-traits",
 ]
 
-[[package]]
-name = "lz4_flex"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8"
-
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -2589,18 +3059,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "memmap2"
-version = "0.6.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872"
-dependencies = [
- "libc",
-]
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -2613,9 +3074,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.9.0"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
 dependencies = [
  "libc",
 ]
@@ -2631,34 +3092,34 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "metal"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "block",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types",
  "log",
  "objc",
+ "paste",
+]
+
+[[package]]
+name = "mime"
+version = "0.1.0"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+dependencies = [
+ "smithay-clipboard",
 ]
 
 [[package]]
@@ -2669,11 +3130,11 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
- "mime",
+ "mime 0.3.17",
  "unicase",
 ]
 
@@ -2685,9 +3146,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -2701,9 +3162,9 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
@@ -2719,15 +3180,15 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
 
 [[package]]
 name = "naga"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
+ "arrayvec",
  "bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "codespan-reporting",
  "hexf-parse",
- "indexmap 1.9.3",
+ "indexmap 2.3.0",
  "log",
  "num-traits",
  "rustc-hash",
@@ -2737,33 +3198,18 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "natord"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
-
 [[package]]
 name = "ndk"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "jni-sys",
  "log",
  "ndk-sys",
  "num_enum",
- "raw-window-handle 0.6.0",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -2775,48 +3221,36 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
 [[package]]
 name = "ndk-sys"
-version = "0.5.0+25.2.9519653"
+version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
  "jni-sys",
 ]
 
 [[package]]
 name = "nix"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "autocfg",
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "cfg-if",
  "libc",
- "memoffset 0.6.5",
+ "memoffset 0.9.1",
 ]
 
 [[package]]
 name = "nix"
-version = "0.26.4"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "memoffset 0.7.1",
- "pin-utils",
-]
-
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cfg-if",
+ "cfg_aliases 0.2.1",
  "libc",
+ "memoffset 0.9.1",
 ]
 
 [[package]]
@@ -2841,7 +3275,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
@@ -2866,9 +3300,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -2880,39 +3314,43 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2921,11 +3359,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -2933,9 +3370,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
@@ -2947,29 +3384,38 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
 ]
 
 [[package]]
@@ -2995,25 +3441,206 @@ dependencies = [
 
 [[package]]
 name = "objc-sys"
-version = "0.3.1"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
 
 [[package]]
 name = "objc2"
-version = "0.4.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
 dependencies = [
  "objc-sys",
  "objc2-encode",
 ]
 
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-foundation",
+ "objc2-quartz-core",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-contacts"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-contacts",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-encode"
-version = "3.0.0"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "dispatch",
+ "libc",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-link-presentation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-symbols"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-foundation",
+ "objc2-link-presentation",
+ "objc2-quartz-core",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+]
 
 [[package]]
 name = "objc_exception"
@@ -3035,18 +3662,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "option-ext"
@@ -3065,21 +3692,31 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "4.1.1"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8"
+checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
 name = "ordered-multimap"
-version = "0.4.3"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
+checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
 dependencies = [
  "dlv-list",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -3103,7 +3740,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3114,18 +3751,18 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.20.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7"
+checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
 dependencies = [
- "ttf-parser 0.20.0",
+ "ttf-parser 0.24.0",
 ]
 
 [[package]]
 name = "palette"
-version = "0.7.3"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc"
+checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
 dependencies = [
  "approx 0.5.1",
  "fast-srgb8",
@@ -3136,15 +3773,22 @@ dependencies = [
 
 [[package]]
 name = "palette_derive"
-version = "0.7.3"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a"
+checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
 dependencies = [
+ "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
+[[package]]
+name = "parking"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -3158,12 +3802,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.9",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -3182,22 +3826,28 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.3",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "phf"
@@ -3229,7 +3879,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3249,29 +3899,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -3279,17 +3929,46 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "pixman"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d24a24da0bec14f4e43a495c1837a3c358b87532e7fe66bd75c348b89f0451b6"
+dependencies = [
+ "drm-fourcc",
+ "paste",
+ "pixman-sys",
+ "thiserror",
+]
+
+[[package]]
+name = "pixman-sys"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a0483e89e81d7915defe83c51f23f6800594d64f6f4a21253ce87fd8444ada"
+
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "png"
-version = "0.17.10"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -3300,16 +3979,17 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.3.0"
+version = "3.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
+ "hermit-abi 0.4.0",
  "pin-project-lite",
  "rustix",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3320,17 +4000,26 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
+dependencies = [
+ "zerocopy 0.6.6",
+]
+
+[[package]]
+name = "presser"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
@@ -3359,62 +4048,31 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.11"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
+checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
 dependencies = [
  "profiling-procmacros",
+ "tracy-client",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.11"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f"
+checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
 dependencies = [
  "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "puffin"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39009d69b9d547c3ffa974a20648fa02f447c05bd0a664012b1ba5a5b06fb14e"
-dependencies = [
- "anyhow",
- "bincode",
- "byteorder",
- "cfg-if",
- "lz4_flex",
- "once_cell",
- "parking_lot 0.12.1",
- "serde",
-]
-
-[[package]]
-name = "puffin_egui"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5af236782d21bdd5a6eb2f8cc9a91f8d601c073b7f7d568c95c26604cc12b87"
-dependencies = [
- "egui",
- "indexmap 1.9.3",
- "natord",
- "once_cell",
- "puffin",
- "time",
- "vec1",
- "web-time",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3428,27 +4086,18 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.28.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.30.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
+checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -3491,27 +4140,21 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
 name = "rangemap"
-version = "1.4.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991"
+checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
 
 [[package]]
 name = "raw-window-handle"
-version = "0.5.2"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
 [[package]]
-name = "raw-window-handle"
-version = "0.6.0"
+name = "rayon"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544"
-
-[[package]]
-name = "rayon"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -3519,9 +4162,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -3533,6 +4176,16 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
 
+[[package]]
+name = "read-fonts"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd"
+dependencies = [
+ "bytemuck",
+ "font-types",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -3544,43 +4197,43 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
  "getrandom",
- "libredox 0.0.1",
+ "libredox 0.1.3",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -3594,13 +4247,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -3611,30 +4264,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "renderdoc"
-version = "0.11.0"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12"
-dependencies = [
- "bitflags 1.3.2",
- "float-cmp",
- "libloading 0.7.4",
- "once_cell",
- "renderdoc-sys",
- "winapi",
- "wio",
-]
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "renderdoc-sys"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
+checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
 [[package]]
 name = "resvg"
@@ -3652,26 +4290,26 @@ dependencies = [
 
 [[package]]
 name = "resvg"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1"
+checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4"
 dependencies = [
- "gif",
+ "gif 0.12.0",
  "jpeg-decoder",
  "log",
  "pico-args",
  "png",
  "rgb",
- "svgtypes 0.11.0",
- "tiny-skia 0.10.0",
- "usvg 0.35.0",
+ "svgtypes 0.13.0",
+ "tiny-skia 0.11.4",
+ "usvg 0.37.0",
 ]
 
 [[package]]
 name = "rgb"
-version = "0.8.37"
+version = "0.8.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
 dependencies = [
  "bytemuck",
 ]
@@ -3682,8 +4320,8 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.21.5",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.6.0",
  "serde",
  "serde_derive",
 ]
@@ -3699,18 +4337,21 @@ dependencies = [
 
 [[package]]
 name = "roxmltree"
-version = "0.18.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302"
-dependencies = [
- "xmlparser",
-]
+checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+
+[[package]]
+name = "roxmltree"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
 [[package]]
 name = "rust-embed"
-version = "8.0.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40"
+checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
 dependencies = [
  "rust-embed-impl",
  "rust-embed-utils",
@@ -3719,22 +4360,22 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.0.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29"
+checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
 dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.39",
+ "syn 2.0.72",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.0.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada"
+checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
 dependencies = [
  "sha2",
  "walkdir",
@@ -3742,9 +4383,9 @@ dependencies = [
 
 [[package]]
 name = "rust-ini"
-version = "0.18.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
+checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a"
 dependencies = [
  "cfg-if",
  "ordered-multimap",
@@ -3752,9 +4393,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -3764,55 +4405,61 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "errno",
  "libc",
- "linux-raw-sys",
- "windows-sys 0.48.0",
+ "linux-raw-sys 0.4.14",
+ "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
 [[package]]
 name = "rustybuzz"
-version = "0.7.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a"
+checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "bytemuck",
  "smallvec",
- "ttf-parser 0.18.1",
- "unicode-bidi-mirroring",
- "unicode-ccc",
- "unicode-general-category",
+ "ttf-parser 0.20.0",
+ "unicode-bidi-mirroring 0.1.0",
+ "unicode-ccc 0.1.2",
+ "unicode-properties",
  "unicode-script",
 ]
 
 [[package]]
 name = "rustybuzz"
-version = "0.8.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250"
+checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "bytemuck",
  "libm",
  "smallvec",
- "ttf-parser 0.19.2",
- "unicode-bidi-mirroring",
- "unicode-ccc",
- "unicode-general-category",
+ "ttf-parser 0.21.1",
+ "unicode-bidi-mirroring 0.2.0",
+ "unicode-ccc 0.2.0",
+ "unicode-properties",
  "unicode-script",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -3823,6 +4470,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "sanitize-filename"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
 [[package]]
 name = "scan_fmt"
 version = "0.2.6"
@@ -3843,9 +4500,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "self_cell"
-version = "0.10.2"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d"
+dependencies = [
+ "self_cell 1.0.4",
+]
+
+[[package]]
+name = "self_cell"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"
+checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
 
 [[package]]
 name = "sendfd"
@@ -3858,42 +4524,96 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.190"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.190"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
 dependencies = [
+ "indexmap 2.3.0",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
 [[package]]
 name = "serde_spanned"
-version = "0.6.4"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
 dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.3.0",
  "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
 ]
 
 [[package]]
@@ -3916,6 +4636,15 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -3937,6 +4666,16 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
+[[package]]
+name = "skrifa"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23"
+dependencies = [
+ "bytemuck",
+ "read-fonts",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -3948,48 +4687,48 @@ dependencies = [
 
 [[package]]
 name = "slotmap"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
 dependencies = [
  "version_check",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smithay"
 version = "0.3.0"
-source = "git+https://github.com/smithay//smithay?rev=d5b352b#d5b352b33525d21b38ad8d7ebd54c99d39246464"
+source = "git+https://github.com/smithay//smithay?rev=e7f0857#e7f08570bceab6107863267ae168d0afb018e8f5"
 dependencies = [
  "appendlist",
- "ash",
- "bitflags 2.4.1",
- "calloop",
+ "ash 0.38.0+1.3.281",
+ "bitflags 2.6.0",
+ "calloop 0.14.0",
  "cc",
  "cgmath",
  "cursor-icon",
  "downcast-rs",
- "drm",
- "drm-ffi",
+ "drm 0.12.0",
+ "drm-ffi 0.8.0",
  "drm-fourcc",
  "encoding_rs",
  "errno",
  "gbm",
  "gl_generator",
- "glow",
- "indexmap 2.1.0",
+ "glow 0.12.3",
+ "indexmap 2.3.0",
  "input",
  "lazy_static",
  "libc",
- "libloading 0.8.1",
+ "libloading 0.8.5",
  "libseat",
- "nix 0.27.1",
  "once_cell",
+ "pixman",
  "pkg-config",
  "profiling",
  "rand",
@@ -4000,44 +4739,58 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tracing",
- "udev 0.8.0",
- "wayland-backend 0.3.2",
+ "udev",
+ "wayland-client",
+ "wayland-cursor",
  "wayland-egl",
  "wayland-protocols",
  "wayland-protocols-misc",
  "wayland-protocols-wlr",
  "wayland-server",
- "wayland-sys 0.31.1",
  "winit",
- "x11rb 0.12.0",
- "xkbcommon",
+ "x11rb",
+ "xkbcommon 0.8.0",
 ]
 
 [[package]]
 name = "smithay-client-toolkit"
-version = "0.18.0"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f"
+checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.4.1",
- "calloop",
+ "bitflags 2.6.0",
+ "bytemuck",
+ "calloop 0.13.0",
  "calloop-wayland-source",
  "cursor-icon",
  "libc",
  "log",
- "memmap2 0.9.0",
+ "memmap2 0.9.4",
+ "pkg-config",
  "rustix",
  "thiserror",
- "wayland-backend 0.3.2",
- "wayland-client 0.31.1",
+ "wayland-backend",
+ "wayland-client",
  "wayland-csd-frame",
  "wayland-cursor",
  "wayland-protocols",
  "wayland-protocols-wlr",
- "wayland-scanner 0.31.0",
+ "wayland-scanner",
+ "xkbcommon 0.7.0",
  "xkeysym",
 ]
 
+[[package]]
+name = "smithay-clipboard"
+version = "0.8.0"
+source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007def49eb678d1144850c9ee04b80707c56a"
+dependencies = [
+ "libc",
+ "raw-window-handle",
+ "smithay-client-toolkit",
+ "wayland-backend",
+]
+
 [[package]]
 name = "smithay-egui"
 version = "0.1.0"
@@ -4049,16 +4802,16 @@ dependencies = [
  "egui_glow",
  "image",
  "log",
- "memoffset 0.9.0",
+ "memoffset 0.9.1",
  "smithay",
- "xkbcommon",
+ "xkbcommon 0.7.0",
 ]
 
 [[package]]
 name = "smol_str"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
+checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
 dependencies = [
  "serde",
 ]
@@ -4071,29 +4824,32 @@ checksum = "27207bb65232eda1f588cf46db2fee75c0808d557f6b3cf19a75f5d6d7c94df1"
 
 [[package]]
 name = "softbuffer"
-version = "0.2.0"
-source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723"
+version = "0.4.1"
+source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#6e75b1ad7e98397d37cb187886d05969bc480995"
 dependencies = [
+ "as-raw-xcb-connection",
  "bytemuck",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
  "cocoa",
- "core-graphics 0.22.3",
- "fastrand 1.9.0",
- "foreign-types 0.3.2",
+ "core-graphics",
+ "drm 0.11.1",
+ "fastrand",
+ "foreign-types",
+ "js-sys",
  "log",
- "nix 0.26.4",
+ "memmap2 0.9.4",
  "objc",
- "raw-window-handle 0.5.2",
- "redox_syscall 0.3.5",
- "thiserror",
+ "raw-window-handle",
+ "redox_syscall 0.4.1",
+ "rustix",
+ "tiny-xlib",
  "wasm-bindgen",
- "wayland-backend 0.1.2",
- "wayland-client 0.30.2",
- "wayland-sys 0.30.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-sys",
  "web-sys",
- "windows-sys 0.42.0",
- "x11-dl",
- "x11rb 0.11.1",
+ "windows-sys 0.52.0",
+ "x11rb",
 ]
 
 [[package]]
@@ -4107,12 +4863,11 @@ dependencies = [
 
 [[package]]
 name = "spirv"
-version = "0.2.0+1.5.4"
+version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 1.3.2",
- "num-traits",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -4136,17 +4891,23 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "svg_fmt"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
+checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
 
 [[package]]
 name = "svgtypes"
@@ -4159,9 +4920,9 @@ dependencies = [
 
 [[package]]
 name = "svgtypes"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7"
+checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
 dependencies = [
  "kurbo 0.9.5",
  "siphasher",
@@ -4169,10 +4930,11 @@ dependencies = [
 
 [[package]]
 name = "swash"
-version = "0.1.8"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f"
+checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac"
 dependencies = [
+ "skrifa",
  "yazi",
  "zeno",
 ]
@@ -4190,9 +4952,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4211,7 +4973,7 @@ dependencies = [
 [[package]]
 name = "taffy"
 version = "0.3.11"
-source = "git+https://github.com/DioxusLabs/taffy#1876f72bee5e376023eaa518aa7b8a34c769bd1b"
+source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885"
 dependencies = [
  "arrayvec",
  "grid",
@@ -4221,51 +4983,50 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.1",
- "redox_syscall 0.4.1",
+ "fastrand",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4273,9 +5034,9 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
 dependencies = [
  "flate2",
  "jpeg-decoder",
@@ -4284,12 +5045,15 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
+ "libc",
+ "num-conv",
+ "num_threads",
  "powerfmt",
  "serde",
  "time-core",
@@ -4304,13 +5068,23 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tiny-skia"
 version = "0.8.4"
@@ -4327,9 +5101,9 @@ dependencies = [
 
 [[package]]
 name = "tiny-skia"
-version = "0.10.0"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc"
+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -4337,7 +5111,7 @@ dependencies = [
  "cfg-if",
  "log",
  "png",
- "tiny-skia-path 0.10.0",
+ "tiny-skia-path 0.11.4",
 ]
 
 [[package]]
@@ -4353,29 +5127,42 @@ dependencies = [
 
 [[package]]
 name = "tiny-skia-path"
-version = "0.10.0"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
 dependencies = [
  "arrayref",
  "bytemuck",
  "strict-num",
 ]
 
+[[package]]
+name = "tiny-xlib"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c"
+dependencies = [
+ "as-raw-xcb-connection",
+ "ctor-lite",
+ "libloading 0.8.5",
+ "pkg-config",
+ "tracing",
+]
+
 [[package]]
 name = "tinystr"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
  "displaydoc",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4397,36 +5184,47 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.6"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.22.20",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.7"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.3.0",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.3.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.18",
 ]
 
 [[package]]
@@ -4448,7 +5246,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4474,9 +5272,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.4"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
  "log",
  "once_cell",
@@ -4485,9 +5283,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -4502,16 +5300,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "ttf-parser"
-version = "0.18.1"
+name = "tracy-client"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
+checksum = "63de1e1d4115534008d8fd5788b39324d6f58fc707849090533828619351d855"
+dependencies = [
+ "loom",
+ "once_cell",
+ "tracy-client-sys",
+]
 
 [[package]]
-name = "ttf-parser"
-version = "0.19.2"
+name = "tracy-client-sys"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
+checksum = "98b98232a2447ce0a58f9a0bfb5f5e39647b5c597c994b63945fcccd1306fafb"
+dependencies = [
+ "cc",
+]
 
 [[package]]
 name = "ttf-parser"
@@ -4520,21 +5326,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
 
 [[package]]
-name = "twox-hash"
-version = "1.6.3"
+name = "ttf-parser"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if",
- "rand",
- "static_assertions",
-]
+checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
+
+[[package]]
+name = "ttf-parser"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a"
 
 [[package]]
 name = "type-map"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46"
+checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
 dependencies = [
  "rustc-hash",
 ]
@@ -4547,41 +5354,41 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "udev"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a"
+checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1"
 dependencies = [
+ "io-lifetimes 1.0.11",
  "libc",
  "libudev-sys",
  "pkg-config",
 ]
 
 [[package]]
-name = "udev"
-version = "0.8.0"
+name = "uds_windows"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1"
+checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
 dependencies = [
- "io-lifetimes 1.0.11",
- "libc",
- "libudev-sys",
- "pkg-config",
+ "memoffset 0.9.1",
+ "tempfile",
+ "winapi",
 ]
 
 [[package]]
 name = "unic-langid"
-version = "0.9.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f"
+checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44"
 dependencies = [
  "unic-langid-impl",
 ]
 
 [[package]]
 name = "unic-langid-impl"
-version = "0.9.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff"
+checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5"
 dependencies = [
  "serde",
  "tinystr",
@@ -4598,9 +5405,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-bidi-mirroring"
@@ -4608,6 +5415,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694"
 
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
+
 [[package]]
 name = "unicode-ccc"
 version = "0.1.2"
@@ -4615,10 +5428,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
 
 [[package]]
-name = "unicode-general-category"
-version = "0.6.0"
+name = "unicode-ccc"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
+checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
 
 [[package]]
 name = "unicode-ident"
@@ -4634,24 +5447,30 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
-name = "unicode-script"
-version = "0.5.5"
+name = "unicode-properties"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+
+[[package]]
+name = "unicode-script"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
+checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-vo"
@@ -4661,9 +5480,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
@@ -4673,9 +5492,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -4689,7 +5508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b5b7c2b30845b3348c067ca3d09e20cc6e327c288f0ca4c48698712abf432e9"
 dependencies = [
  "base64 0.13.1",
- "data-url",
+ "data-url 0.2.0",
  "flate2",
  "imagesize 0.10.1",
  "kurbo 0.8.3",
@@ -4704,11 +5523,11 @@ dependencies = [
 
 [[package]]
 name = "usvg"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6"
+checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "log",
  "pico-args",
  "usvg-parser",
@@ -4719,32 +5538,32 @@ dependencies = [
 
 [[package]]
 name = "usvg-parser"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408"
+checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc"
 dependencies = [
- "data-url",
+ "data-url 0.3.1",
  "flate2",
  "imagesize 0.12.0",
  "kurbo 0.9.5",
  "log",
- "roxmltree 0.18.1",
+ "roxmltree 0.19.0",
  "simplecss",
  "siphasher",
- "svgtypes 0.11.0",
+ "svgtypes 0.13.0",
  "usvg-tree",
 ]
 
 [[package]]
 name = "usvg-text-layout"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4"
+checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c"
 dependencies = [
  "fontdb",
  "kurbo 0.9.5",
  "log",
- "rustybuzz 0.7.0",
+ "rustybuzz 0.12.1",
  "unicode-bidi",
  "unicode-script",
  "unicode-vo",
@@ -4753,21 +5572,21 @@ dependencies = [
 
 [[package]]
 name = "usvg-tree"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92"
+checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3"
 dependencies = [
  "rctree",
  "strict-num",
- "svgtypes 0.11.0",
- "tiny-skia-path 0.10.0",
+ "svgtypes 0.13.0",
+ "tiny-skia-path 0.11.4",
 ]
 
 [[package]]
 name = "uuid"
-version = "1.5.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "serde",
 ]
@@ -4778,23 +5597,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "vec1"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c"
-
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -4808,9 +5621,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -4818,24 +5631,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.38"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4845,9 +5658,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4855,22 +5668,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-timer"
@@ -4889,55 +5702,28 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.1.2"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8"
+checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
 dependencies = [
  "cc",
  "downcast-rs",
- "io-lifetimes 1.0.11",
- "nix 0.26.4",
- "scoped-tls",
- "smallvec",
- "wayland-sys 0.30.1",
-]
-
-[[package]]
-name = "wayland-backend"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4"
-dependencies = [
- "cc",
- "downcast-rs",
- "nix 0.26.4",
+ "rustix",
  "scoped-tls",
  "smallvec",
- "wayland-sys 0.31.1",
-]
-
-[[package]]
-name = "wayland-client"
-version = "0.30.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8"
-dependencies = [
- "bitflags 1.3.2",
- "nix 0.26.4",
- "wayland-backend 0.1.2",
- "wayland-scanner 0.30.1",
+ "wayland-sys",
 ]
 
 [[package]]
 name = "wayland-client"
-version = "0.31.1"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3"
+checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
 dependencies = [
- "bitflags 2.4.1",
- "nix 0.26.4",
- "wayland-backend 0.3.2",
- "wayland-scanner 0.31.0",
+ "bitflags 2.6.0",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
 ]
 
 [[package]]
@@ -4946,152 +5732,137 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cursor-icon",
- "wayland-backend 0.3.2",
+ "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.0"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b"
+checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95"
 dependencies = [
- "nix 0.26.4",
- "wayland-client 0.31.1",
+ "rustix",
+ "wayland-client",
  "xcursor",
 ]
 
 [[package]]
 name = "wayland-egl"
-version = "0.32.0"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2"
+checksum = "f878665a24396ce3a8509116e03fb19d5401620e59daa303e256a657ee096204"
 dependencies = [
- "wayland-backend 0.3.2",
- "wayland-sys 0.31.1",
+ "wayland-backend",
+ "wayland-sys",
 ]
 
 [[package]]
 name = "wayland-protocols"
-version = "0.31.0"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c"
+checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
 dependencies = [
- "bitflags 2.4.1",
- "wayland-backend 0.3.2",
- "wayland-client 0.31.1",
- "wayland-scanner 0.31.0",
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
  "wayland-server",
 ]
 
 [[package]]
 name = "wayland-protocols-misc"
-version = "0.2.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e"
+checksum = "dfe44d48a0e51909c89da297f6b43bb814b881c78b69e254a4558a5fa8752887"
 dependencies = [
- "bitflags 2.4.1",
- "wayland-backend 0.3.2",
+ "bitflags 2.6.0",
+ "wayland-backend",
  "wayland-protocols",
- "wayland-scanner 0.31.0",
+ "wayland-scanner",
  "wayland-server",
 ]
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.2.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
+checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4"
 dependencies = [
- "bitflags 2.4.1",
- "wayland-backend 0.3.2",
- "wayland-client 0.31.1",
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
  "wayland-protocols",
- "wayland-scanner 0.31.0",
+ "wayland-scanner",
 ]
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.2.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
 dependencies = [
- "bitflags 2.4.1",
- "wayland-backend 0.3.2",
- "wayland-client 0.31.1",
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
  "wayland-protocols",
- "wayland-scanner 0.31.0",
+ "wayland-scanner",
  "wayland-server",
 ]
 
 [[package]]
 name = "wayland-scanner"
-version = "0.30.1"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e"
+checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.28.2",
- "quote",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c"
-dependencies = [
- "proc-macro2",
- "quick-xml 0.30.0",
+ "quick-xml",
  "quote",
 ]
 
 [[package]]
 name = "wayland-server"
-version = "0.31.0"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce"
+checksum = "2f0a4bab6d420ee4a609b63ef4d5f9b5d309c6b93a029fccab70f2594c0cb3ae"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "downcast-rs",
- "io-lifetimes 2.0.2",
- "nix 0.26.4",
- "wayland-backend 0.3.2",
- "wayland-scanner 0.31.0",
+ "io-lifetimes 2.0.3",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.30.1"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06"
+checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
 dependencies = [
  "dlib",
- "lazy_static",
  "log",
+ "once_cell",
  "pkg-config",
 ]
 
 [[package]]
-name = "wayland-sys"
-version = "0.31.1"
+name = "web-sys"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
- "dlib",
- "libc",
- "log",
- "memoffset 0.9.0",
- "once_cell",
- "pkg-config",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "web-sys"
-version = "0.3.65"
+name = "web-time"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5099,9 +5870,9 @@ dependencies = [
 
 [[package]]
 name = "web-time"
-version = "0.2.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5109,24 +5880,24 @@ dependencies = [
 
 [[package]]
 name = "weezl"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "arrayvec",
  "cfg-if",
+ "cfg_aliases 0.1.1",
  "js-sys",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "profiling",
- "raw-window-handle 0.5.2",
+ "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
@@ -5139,19 +5910,21 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
+ "cfg_aliases 0.1.1",
  "codespan-reporting",
+ "indexmap 2.3.0",
  "log",
  "naga",
- "parking_lot 0.12.1",
+ "once_cell",
+ "parking_lot 0.12.3",
  "profiling",
- "raw-window-handle 0.5.2",
+ "raw-window-handle",
  "rustc-hash",
  "smallvec",
  "thiserror",
@@ -5162,20 +5935,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
  "android_system_properties",
  "arrayvec",
- "ash",
+ "ash 0.37.3+1.3.251",
  "bit-set",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "block",
+ "cfg_aliases 0.1.1",
  "core-graphics-types",
  "d3d12",
- "foreign-types 0.3.2",
- "glow",
+ "glow 0.13.1",
+ "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
@@ -5183,15 +5956,16 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.1",
+ "libloading 0.8.5",
  "log",
  "metal",
  "naga",
  "objc",
- "parking_lot 0.12.1",
+ "once_cell",
+ "parking_lot 0.12.3",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.5.2",
+ "raw-window-handle",
  "renderdoc-sys",
  "rustc-hash",
  "smallvec",
@@ -5204,20 +5978,19 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
+version = "0.19.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "js-sys",
  "web-sys",
 ]
 
 [[package]]
 name = "widestring"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
@@ -5237,50 +6010,115 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "winapi-wsapoll"
-version = "0.1.1"
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
-dependencies = [
- "winapi",
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "window_clipboard"
+version = "0.4.1"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+dependencies = [
+ "clipboard-win",
+ "clipboard_macos",
+ "clipboard_wayland",
+ "clipboard_x11",
+ "dnd",
+ "mime 0.1.0",
+ "raw-window-handle",
+ "thiserror",
 ]
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
+name = "windows"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+dependencies = [
+ "windows-core 0.52.0",
+ "windows-targets 0.52.6",
+]
 
 [[package]]
 name = "windows"
-version = "0.44.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5301,6 +6139,15 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -5331,6 +6178,22 @@ dependencies = [
  "windows_x86_64_msvc 0.48.5",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -5343,6 +6206,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -5355,6 +6224,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -5367,6 +6242,18 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -5379,6 +6266,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -5391,6 +6284,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -5403,6 +6302,12 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -5415,69 +6320,79 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
 [[package]]
 name = "winit"
-version = "0.29.3"
+version = "0.30.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161598019a9da35ab6c34dc46cd13546cba9dbf9816475d4dd9a639455016563"
+checksum = "4225ddd8ab67b8b59a2fee4b34889ebf13c0460c1c3fa297c58e21eb87801b33"
 dependencies = [
- "ahash 0.8.6",
+ "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
+ "block2",
  "bytemuck",
- "calloop",
- "cfg_aliases",
+ "calloop 0.13.0",
+ "cfg_aliases 0.2.1",
+ "concurrent-queue",
  "core-foundation",
- "core-graphics 0.23.1",
+ "core-graphics",
  "cursor-icon",
- "icrate",
+ "dpi",
  "js-sys",
  "libc",
- "log",
- "memmap2 0.9.0",
+ "memmap2 0.9.4",
  "ndk",
- "ndk-sys",
  "objc2",
- "once_cell",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-ui-kit",
  "orbclient",
  "percent-encoding",
- "raw-window-handle 0.6.0",
- "redox_syscall 0.3.5",
+ "pin-project",
+ "raw-window-handle",
+ "redox_syscall 0.4.1",
  "rustix",
  "smithay-client-toolkit",
  "smol_str",
+ "tracing",
  "unicode-segmentation",
  "wasm-bindgen",
  "wasm-bindgen-futures",
- "wayland-backend 0.3.2",
- "wayland-client 0.31.1",
+ "wayland-backend",
+ "wayland-client",
  "wayland-protocols",
  "wayland-protocols-plasma",
  "web-sys",
- "web-time",
- "windows-sys 0.48.0",
+ "web-time 1.1.0",
+ "windows-sys 0.52.0",
  "x11-dl",
- "x11rb 0.12.0",
+ "x11rb",
  "xkbcommon-dl",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.5.19"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wio"
-version = "0.2.2"
+name = "winnow"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
- "winapi",
+ "memchr",
 ]
 
 [[package]]
@@ -5493,69 +6408,56 @@ dependencies = [
 
 [[package]]
 name = "x11rb"
-version = "0.11.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617"
+checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
 dependencies = [
- "gethostname 0.2.3",
+ "as-raw-xcb-connection",
+ "gethostname",
  "libc",
- "libloading 0.7.4",
- "nix 0.25.1",
+ "libloading 0.8.5",
  "once_cell",
- "winapi",
- "winapi-wsapoll",
- "x11rb-protocol 0.11.1",
+ "rustix",
+ "x11rb-protocol",
 ]
 
 [[package]]
-name = "x11rb"
-version = "0.12.0"
+name = "x11rb-protocol"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
-dependencies = [
- "as-raw-xcb-connection",
- "gethostname 0.3.0",
- "libc",
- "libloading 0.7.4",
- "nix 0.26.4",
- "once_cell",
- "winapi",
- "winapi-wsapoll",
- "x11rb-protocol 0.12.0",
-]
+checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
 [[package]]
-name = "x11rb-protocol"
-version = "0.11.1"
+name = "xcursor"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56"
-dependencies = [
- "nix 0.25.1",
-]
+checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7"
 
 [[package]]
-name = "x11rb-protocol"
-version = "0.12.0"
+name = "xdg"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc"
-dependencies = [
- "nix 0.26.4",
-]
+checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
 
 [[package]]
-name = "xcursor"
-version = "0.3.4"
+name = "xdg-home"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
 dependencies = [
- "nom",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "xdg"
-version = "2.5.2"
+name = "xdg-user"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
+checksum = "a1d5cd803f28ce5a488c8b129858222998c0a06bbec81f9d1b71faed1f9f9f0e"
+dependencies = [
+ "home",
+ "libc",
+]
 
 [[package]]
 name = "xkbcommon"
@@ -5568,13 +6470,24 @@ dependencies = [
  "xkeysym",
 ]
 
+[[package]]
+name = "xkbcommon"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9"
+dependencies = [
+ "libc",
+ "memmap2 0.9.4",
+ "xkeysym",
+]
+
 [[package]]
 name = "xkbcommon-dl"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699"
+checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "dlib",
  "log",
  "once_cell",
@@ -5583,15 +6496,18 @@ dependencies = [
 
 [[package]]
 name = "xkeysym"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+dependencies = [
+ "bytemuck",
+]
 
 [[package]]
 name = "xml-rs"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
+checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
 
 [[package]]
 name = "xmlparser"
@@ -5605,12 +6521,80 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
+[[package]]
+name = "xxhash-rust"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
+
 [[package]]
 name = "yazi"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
 
+[[package]]
+name = "zbus"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "rand",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
+
 [[package]]
 name = "zeno"
 version = "0.2.3"
@@ -5619,22 +6603,43 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.25"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive 0.6.6",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557"
+checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
 dependencies = [
- "zerocopy-derive",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.25"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5645,3 +6650,40 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
 dependencies = [
  "simd-adler32",
 ]
+
+[[package]]
+name = "zvariant"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 50f30dcd85f85..5bd04bf2db4ae 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -3,6 +3,7 @@
 , rustPlatform
 , fetchFromGitHub
 , makeBinaryWrapper
+, pixman
 , pkg-config
 , libinput
 , libglvnd
@@ -18,27 +19,34 @@
 , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "cosmic-comp";
-  version = "unstable-2023-11-13";
+  version = "1.0.0-alpha.1";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
-    rev = "d051d141979820f50b75bd686c745fb7f84fcd05";
-    hash = "sha256-8okRiVVPzmuPJjnv1YoQPQFI8g0j1DQhwUoO51dHgGA=";
+    rev = "epoch-${version}";
+    hash = "sha256-4NAIpyaITFNaTDBcsleIwKPq8nHNa77C7y+5hCIYXZE=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "cosmic-config-0.1.0" = "sha256-5WajbfcfCc0ZRpJfysqEydthOsF04ipb35QVWuWKrEs=";
-      "cosmic-protocols-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8=";
+      "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
+      "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
+      "cosmic-config-0.1.0" = "sha256-nZCefRCq40K0Mcsav+akZbX89kHnliqAkB7vKx5WIwY=";
+      "cosmic-protocols-0.1.0" = "sha256-qgo8FMKo/uCbhUjfykRRN8KSavbyhZpu82M8npLcIPI=";
+      "cosmic-settings-config-0.1.0" = "sha256-/Qav6r4VQ8ZDSs/tqHeutxYH3u4HiTBFWTfAYUSl2HQ=";
+      "cosmic-text-0.12.1" = "sha256-x0XTxzbmtE2d4XCG/Nuq3DzBpz15BbnjRRlirfNJEiU=";
+      "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
+      "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
       "id_tree-1.8.0" = "sha256-uKdKHRfPGt3vagOjhnri3aYY5ar7O3rp2/ivTfM2jT0=";
-      "smithay-0.3.0" = "sha256-e6BSrsrVSBcOuF8m21m74h7DWZnYHGIYs/4D4ABvqNM=";
+      "smithay-0.3.0" = "sha256-puo6xbWRTIco8luz3Jz83VXoRMkyb0ZH7kKHGlTzS5Q=";
+      "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";
       "smithay-egui-0.1.0" = "sha256-FcSoKCwYk3okwQURiQlDUcfk9m/Ne6pSblGAzHDaVHg=";
-      "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY=";
-      "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw=";
+      "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
+      "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
     };
   };
 
@@ -50,6 +58,7 @@ rustPlatform.buildRustPackage {
       libinput
       libxkbcommon
       mesa
+      pixman
       seatd
       udev
       wayland

From c7129d13c73f3f6350686f153e8bb01da1d4e56d Mon Sep 17 00:00:00 2001
From: Picnoir <picnoir@alternativebit.fr>
Date: Tue, 6 Aug 2024 12:30:36 +0200
Subject: [PATCH 204/342] nsncd: unstable-2024-03-18 ->
 1.4.1-unstable-2024-04-10

Fixes nsncd for rustc > 1.80.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../linux/nsncd/0001-cargo-bump.patch         | 197 ++++++++++++++++++
 pkgs/os-specific/linux/nsncd/default.nix      |  18 +-
 2 files changed, 210 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch

diff --git a/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch b/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch
new file mode 100644
index 0000000000000..2afea887428fe
--- /dev/null
+++ b/pkgs/os-specific/linux/nsncd/0001-cargo-bump.patch
@@ -0,0 +1,197 @@
+From b68e8356cf85fa75582237b4bc02f47efc40e8f0 Mon Sep 17 00:00:00 2001
+From: Picnoir <picnoir@alternativebit.fr>
+Date: Tue, 6 Aug 2024 11:43:34 +0200
+Subject: [PATCH] cargo.lock: bump time version
+
+Bumping time to 0.3.36. Fix the build for rustc > 1.80.
+
+Fix https://github.com/twosigma/nsncd/issues/118
+---
+ Cargo.lock | 74 ++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 55 insertions(+), 19 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index a043bde..f6ce6f4 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -205,6 +205,15 @@ version = "0.8.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+ 
++[[package]]
++name = "deranged"
++version = "0.3.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
++dependencies = [
++ "powerfmt",
++]
++
+ [[package]]
+ name = "dirs-next"
+ version = "2.0.0"
+@@ -426,6 +435,12 @@ dependencies = [
+  "temp-env",
+ ]
+ 
++[[package]]
++name = "num-conv"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
++
+ [[package]]
+ name = "num-derive"
+ version = "0.3.3"
+@@ -434,7 +449,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -519,20 +534,26 @@ dependencies = [
+  "plotters-backend",
+ ]
+ 
++[[package]]
++name = "powerfmt"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
++
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.64"
++version = "1.0.86"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+ dependencies = [
+  "unicode-ident",
+ ]
+ 
+ [[package]]
+ name = "quote"
+-version = "1.0.23"
++version = "1.0.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
++checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+ dependencies = [
+  "proc-macro2",
+ ]
+@@ -652,22 +673,22 @@ checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32"
+ 
+ [[package]]
+ name = "serde"
+-version = "1.0.154"
++version = "1.0.204"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e"
++checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+ dependencies = [
+  "serde_derive",
+ ]
+ 
+ [[package]]
+ name = "serde_derive"
+-version = "1.0.154"
++version = "1.0.204"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217"
++checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 2.0.72",
+ ]
+ 
+ [[package]]
+@@ -745,6 +766,17 @@ dependencies = [
+  "unicode-ident",
+ ]
+ 
++[[package]]
++name = "syn"
++version = "2.0.72"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-ident",
++]
++
+ [[package]]
+ name = "take_mut"
+ version = "0.2.2"
+@@ -788,7 +820,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -803,11 +835,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.20"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
++ "deranged",
+  "itoa",
++ "num-conv",
++ "powerfmt",
+  "serde",
+  "time-core",
+  "time-macros",
+@@ -815,16 +850,17 @@ dependencies = [
+ 
+ [[package]]
+ name = "time-core"
+-version = "0.1.0"
++version = "0.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.8"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
++ "num-conv",
+  "time-core",
+ ]
+ 
+@@ -882,7 +918,7 @@ dependencies = [
+  "once_cell",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+  "wasm-bindgen-shared",
+ ]
+ 
+@@ -904,7 +940,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+  "wasm-bindgen-backend",
+  "wasm-bindgen-shared",
+ ]
diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix
index 80dfdb5457fa7..0d6e14dee7632 100644
--- a/pkgs/os-specific/linux/nsncd/default.nix
+++ b/pkgs/os-specific/linux/nsncd/default.nix
@@ -2,21 +2,29 @@
 , stdenv
 , fetchFromGitHub
 , rustPlatform
-, nix-gitignore
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "nsncd";
-  version = "unstable-2024-03-18";
+  version = "1.4.1-unstable-2024-04-10";
 
   src = fetchFromGitHub {
     owner = "twosigma";
     repo = "nsncd";
-    rev =  "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427";
+    rev = "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427";
     hash = "sha256-Bd7qE9MP5coBCkr70TdoJfwYhQpdrn/zmN4KoARcaMI=";
   };
 
-  cargoHash = "sha256-i1rmc5wxtc631hZy2oM4d6r7od0w8GrG7+/pdM6Gqco=";
+  cargoHash = "sha256-N7U9YsyGh8+fLT973GGZTmVXcdnWhpqkeYTxzJ0rzdo=";
+
+  # TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged.
+  cargoPatches = [
+    ./0001-cargo-bump.patch
+  ];
+
+  # TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged.
+  RUSTFLAGS = "-A dead_code";
+
   checkFlags = [
     # Relies on the test environment to be able to resolve "localhost"
     # on IPv4. That's not the case in the Nix sandbox somehow. Works

From 5da570137e281b6168ab9b1d36a04cfb5858ba36 Mon Sep 17 00:00:00 2001
From: Picnoir <picnoir@alternativebit.fr>
Date: Wed, 7 Aug 2024 10:09:29 +0200
Subject: [PATCH 205/342] nsncd: nixfmt

---
 pkgs/os-specific/linux/nsncd/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix
index 0d6e14dee7632..9acef3cd9342b 100644
--- a/pkgs/os-specific/linux/nsncd/default.nix
+++ b/pkgs/os-specific/linux/nsncd/default.nix
@@ -1,7 +1,8 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
 }:
 
 rustPlatform.buildRustPackage {
@@ -18,9 +19,7 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-N7U9YsyGh8+fLT973GGZTmVXcdnWhpqkeYTxzJ0rzdo=";
 
   # TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged.
-  cargoPatches = [
-    ./0001-cargo-bump.patch
-  ];
+  cargoPatches = [ ./0001-cargo-bump.patch ];
 
   # TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged.
   RUSTFLAGS = "-A dead_code";
@@ -40,7 +39,10 @@ rustPlatform.buildRustPackage {
     '';
     homepage = "https://github.com/twosigma/nsncd";
     license = licenses.asl20;
-    maintainers = with maintainers; [ flokli picnoir ];
+    maintainers = with maintainers; [
+      flokli
+      picnoir
+    ];
     # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
     broken = stdenv.isDarwin;
   };

From 6ba7b01271e0530a58c2e97c5b2aee1eef2bad8c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 02:00:38 +0200
Subject: [PATCH 206/342] python312Packages.aiohappyeyeballs: 2.3.4 -> 2.3.5

https://github.com/bdraco/aiohappyeyeballs/blob/v2.3.5/CHANGELOG.md
---
 .../python-modules/aiohappyeyeballs/default.nix   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
index 7a778be238beb..b91d78c4db583 100644
--- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix
+++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix
@@ -15,12 +15,13 @@
 
   # tests
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "aiohappyeyeballs";
-  version = "2.3.4";
+  version = "2.3.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -29,7 +30,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "aiohappyeyeballs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yzhxO/f9s6cKt5V3/qzqg+f0+iFx7MxuqUqryAY5Xac=";
+    hash = "sha256-elWMUOrR7wVi3C+BBpz1T8jiEg7LiJDw6hSlnr5kNxU=";
   };
 
   outputs = [
@@ -37,14 +38,9 @@ buildPythonPackage rec {
     "doc"
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --cov=aiohappyeyeballs --cov-report=term-missing:skip-covered" ""
-  '';
+  nativeBuildInputs = [ poetry-core ] ++ optional-dependencies.docs;
 
-  nativeBuildInputs = [ poetry-core ] ++ passthru.optional-dependencies.docs;
-
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     docs = [
       furo
       myst-parser
@@ -55,6 +51,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
   ];
 

From d15083e985373113af8543e8e67ff3db9a5248fb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 7 Aug 2024 18:37:44 +0200
Subject: [PATCH 207/342] zed-editor: 0.146.5 -> 0.147.2

Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.146.5...0.147.2

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.147.2
---
 pkgs/by-name/ze/zed-editor/Cargo.lock  | 1462 +++++++++++++-----------
 pkgs/by-name/ze/zed-editor/package.nix |   16 +-
 2 files changed, 790 insertions(+), 688 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock
index a168d805772b1..56743cde4ce52 100644
--- a/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/pkgs/by-name/ze/zed-editor/Cargo.lock
@@ -21,11 +21,11 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
- "gimli",
+ "gimli 0.29.0",
 ]
 
 [[package]]
@@ -41,7 +41,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
- "cipher 0.4.4",
+ "cipher",
  "cpufeatures",
  "zeroize",
 ]
@@ -59,9 +59,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "const-random",
@@ -73,9 +73,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -86,7 +86,7 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6d1ea4484c8676f295307a4892d478c70ac8da1dbd8c7c10830a504b7f1022f"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "bitflags 2.6.0",
  "home",
  "libc",
@@ -109,7 +109,7 @@ name = "alacritty_terminal"
 version = "0.24.1-dev"
 source = "git+https://github.com/alacritty/alacritty?rev=cacdb5bb3b72bad2c729227537979d95af75978f#cacdb5bb3b72bad2c729227537979d95af75978f"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "bitflags 2.6.0",
  "home",
  "libc",
@@ -203,8 +203,23 @@ dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
- "anstyle-wincon",
+ "anstyle-wincon 2.1.0",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon 3.0.4",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
@@ -242,6 +257,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "anthropic"
 version = "0.1.0"
@@ -259,15 +284,15 @@ dependencies = [
 
 [[package]]
 name = "any_vec"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78f17bacc1bc7b91fef7b1885c10772eb2b9e4e989356f6f0f6a972240f97cd"
+checksum = "34cd60c5e3152cef0a592f1b296f1cc93715d89d2551d85315828c3a09575ff4"
 
 [[package]]
 name = "anyhow"
-version = "1.0.83"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "approx"
@@ -381,11 +406,9 @@ dependencies = [
  "clock",
  "collections",
  "command_palette_hooks",
- "completion",
  "ctor",
  "editor",
  "env_logger",
- "feature_flags",
  "fs",
  "futures 0.3.28",
  "fuzzy",
@@ -410,21 +433,22 @@ dependencies = [
  "rand 0.8.5",
  "regex",
  "rope",
- "roxmltree 0.20.0",
  "schemars",
  "search",
  "semantic_index",
  "serde",
  "serde_json",
+ "serde_json_lenient",
  "settings",
  "similar",
  "smol",
+ "strsim 0.11.1",
  "telemetry_events",
  "terminal",
  "terminal_view",
  "text",
  "theme",
- "toml 0.8.10",
+ "toml 0.8.16",
  "ui",
  "unindent",
  "util",
@@ -446,27 +470,6 @@ dependencies = [
  "workspace",
 ]
 
-[[package]]
-name = "assistant_tooling"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "futures 0.3.28",
- "gpui",
- "log",
- "project",
- "repair_json",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "sum_tree",
- "ui",
- "unindent",
- "util",
-]
-
 [[package]]
 name = "async-attributes"
 version = "1.1.2"
@@ -479,9 +482,9 @@ dependencies = [
 
 [[package]]
 name = "async-broadcast"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
 dependencies = [
  "event-listener 5.1.0",
  "event-listener-strategy 0.5.0",
@@ -515,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "async-compat"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b48b4ff0c2026db683dea961cd8ea874737f56cffca86fa84415eaddc51c00d"
+checksum = "7bab94bde396a3f7b4962e396fdad640e241ed797d4d8d77fc8c237d14c58fc0"
 dependencies = [
  "futures-core",
  "futures-io",
@@ -616,7 +619,7 @@ dependencies = [
  "log",
  "parking",
  "polling 2.8.0",
- "rustix 0.37.23",
+ "rustix 0.37.27",
  "slab",
  "socket2 0.4.9",
  "waker-fn",
@@ -661,18 +664,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "async-native-tls"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33"
-dependencies = [
- "async-std",
- "native-tls",
- "thiserror",
- "url",
-]
-
 [[package]]
 name = "async-native-tls"
 version = "0.5.0"
@@ -730,7 +721,7 @@ dependencies = [
  "cfg-if",
  "event-listener 2.5.3",
  "futures-lite 1.13.0",
- "rustix 0.37.23",
+ "rustix 0.37.27",
  "signal-hook",
  "windows-sys 0.48.0",
 ]
@@ -843,6 +834,27 @@ dependencies = [
  "syn 2.0.59",
 ]
 
+[[package]]
+name = "async-stripe"
+version = "0.37.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2f14b5943a52cf051bbbbb68538e93a69d1e291934174121e769f4b181113f5"
+dependencies = [
+ "chrono",
+ "futures-util",
+ "http-types",
+ "hyper",
+ "hyper-rustls",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_qs 0.10.1",
+ "smart-default",
+ "smol_str",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "async-tar"
 version = "0.4.2"
@@ -876,17 +888,17 @@ dependencies = [
 
 [[package]]
 name = "async-tungstenite"
-version = "0.16.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5682ea0913e5c20780fe5785abacb85a411e7437bf52a1bedb93ddb3972cb8dd"
+checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc"
 dependencies = [
- "async-native-tls 0.3.3",
+ "async-native-tls",
  "async-std",
  "futures-io",
  "futures-util",
  "log",
  "pin-project-lite",
- "tungstenite 0.16.0",
+ "tungstenite",
 ]
 
 [[package]]
@@ -1191,14 +1203,14 @@ dependencies = [
  "crypto-bigint 0.5.5",
  "form_urlencoded",
  "hex",
- "hmac 0.12.1",
+ "hmac",
  "http 0.2.9",
  "http 1.0.0",
  "once_cell",
  "p256",
  "percent-encoding",
  "ring",
- "sha2 0.10.7",
+ "sha2",
  "subtle",
  "time",
  "tracing",
@@ -1233,7 +1245,7 @@ dependencies = [
  "md-5",
  "pin-project-lite",
  "sha1",
- "sha2 0.10.7",
+ "sha2",
  "tracing",
 ]
 
@@ -1452,16 +1464,16 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object",
+ "object 0.36.2",
  "rustc-demangle",
 ]
 
@@ -1485,9 +1497,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64-simd"
@@ -1694,15 +1706,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -1797,6 +1800,12 @@ version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
+[[package]]
+name = "by_address"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
+
 [[package]]
 name = "bytecheck"
 version = "0.6.11"
@@ -1841,9 +1850,9 @@ dependencies = [
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "byteorder-lite"
@@ -1927,6 +1936,15 @@ dependencies = [
  "wayland-client",
 ]
 
+[[package]]
+name = "camino"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "cap-fs-ext"
 version = "3.0.0"
@@ -2004,14 +2022,37 @@ dependencies = [
  "winx",
 ]
 
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "cargo_toml"
-version = "0.20.2"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cb1d556b8b8f36e5ca74938008be3ac102f5dcb5b68a0477e4249ae2291cd3"
+checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965"
 dependencies = [
  "serde",
- "toml 0.8.10",
+ "toml 0.8.16",
 ]
 
 [[package]]
@@ -2032,7 +2073,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
 dependencies = [
- "cipher 0.4.4",
+ "cipher",
 ]
 
 [[package]]
@@ -2055,12 +2096,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2"
 dependencies = [
  "jobserver",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
@@ -2141,7 +2183,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2177,15 +2219,6 @@ dependencies = [
  "half",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -2224,10 +2257,10 @@ version = "4.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
 dependencies = [
- "anstream",
+ "anstream 0.5.0",
  "anstyle",
  "clap_lex",
- "strsim",
+ "strsim 0.10.0",
 ]
 
 [[package]]
@@ -2316,7 +2349,7 @@ name = "client"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "async-native-tls 0.5.0",
+ "async-native-tls",
  "async-recursion 0.3.2",
  "async-tungstenite",
  "chrono",
@@ -2341,7 +2374,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
- "sha2 0.10.7",
+ "sha2",
  "smol",
  "sysinfo",
  "telemetry_events",
@@ -2352,7 +2385,7 @@ dependencies = [
  "tiny_http",
  "url",
  "util",
- "windows 0.57.0",
+ "windows 0.58.0",
  "worktree",
 ]
 
@@ -2366,6 +2399,12 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "cobs"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
+
 [[package]]
 name = "cocoa"
 version = "0.25.0"
@@ -2413,6 +2452,7 @@ dependencies = [
  "anthropic",
  "anyhow",
  "assistant",
+ "async-stripe",
  "async-trait",
  "async-tungstenite",
  "audio",
@@ -2420,7 +2460,7 @@ dependencies = [
  "aws-sdk-s3",
  "axum",
  "axum-extra",
- "base64 0.13.1",
+ "base64 0.22.1",
  "call",
  "channel",
  "chrono",
@@ -2429,9 +2469,8 @@ dependencies = [
  "clock",
  "collab_ui",
  "collections",
- "completion",
  "ctor",
- "dashmap",
+ "dashmap 6.0.1",
  "dev_server_projects",
  "editor",
  "env_logger",
@@ -2481,7 +2520,7 @@ dependencies = [
  "serde_json",
  "session",
  "settings",
- "sha2 0.10.7",
+ "sha2",
  "sqlx",
  "subtle",
  "supermaven_api",
@@ -2490,7 +2529,7 @@ dependencies = [
  "theme",
  "time",
  "tokio",
- "toml 0.8.10",
+ "toml 0.8.16",
  "tower",
  "tower-http 0.4.4",
  "tracing",
@@ -2541,7 +2580,7 @@ dependencies = [
  "time",
  "time_format",
  "title_bar",
- "tree-sitter-markdown",
+ "tree-sitter-md",
  "ui",
  "util",
  "vcs_menu",
@@ -2614,28 +2653,6 @@ dependencies = [
  "gpui",
 ]
 
-[[package]]
-name = "completion"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "ctor",
- "editor",
- "env_logger",
- "futures 0.3.28",
- "gpui",
- "language",
- "language_model",
- "project",
- "rand 0.8.5",
- "serde",
- "settings",
- "smol",
- "text",
- "ui",
- "unindent",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.2.0"
@@ -2707,6 +2724,7 @@ dependencies = [
  "async-compression",
  "async-std",
  "async-tar",
+ "chrono",
  "client",
  "clock",
  "collections",
@@ -2717,6 +2735,7 @@ dependencies = [
  "gpui",
  "http_client",
  "indoc",
+ "isahc",
  "language",
  "lsp",
  "menu",
@@ -2725,10 +2744,13 @@ dependencies = [
  "paths",
  "project",
  "rpc",
+ "schemars",
  "serde",
  "serde_json",
  "settings",
  "smol",
+ "strum",
+ "task",
  "theme",
  "ui",
  "util",
@@ -2889,18 +2911,18 @@ dependencies = [
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b57d4f3ffc28bbd6ef1ca7b50b20126717232f97487efe027d135d9d87eb29c"
+checksum = "29daf137addc15da6bab6eae2c4a11e274b1d270bf2759508e62f6145e863ef6"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1f7d0ac7fd53f2c29db3ff9a063f6ff5a8be2abaa8f6942aceb6e1521e70df7"
+checksum = "de619867d5de4c644b7fd9904d6e3295269c93d8a71013df796ab338681222d4"
 dependencies = [
  "bumpalo",
  "cranelift-bforest",
@@ -2909,43 +2931,44 @@ dependencies = [
  "cranelift-control",
  "cranelift-entity",
  "cranelift-isle",
- "gimli",
+ "gimli 0.28.0",
  "hashbrown 0.14.5",
  "log",
  "regalloc2",
+ "rustc-hash",
  "smallvec",
  "target-lexicon",
 ]
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b40bf21460a600178956cb7fd900a7408c6587fbb988a8063f7215361801a1da"
+checksum = "29f5cf277490037d8dae9513d35e0ee8134670ae4a964a5ed5b198d4249d7c10"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d792ecc1243b7ebec4a7f77d9ed428ef27456eeb1f8c780587a6f5c38841be19"
+checksum = "8c3e22ecad1123343a3c09ac6ecc532bb5c184b6fcb7888df0ea953727f79924"
 
 [[package]]
 name = "cranelift-control"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea2808043df964b73ad7582e09afbbe06a31f3fb9db834d53e74b4e16facaeb"
+checksum = "53ca3ec6d30bce84ccf59c81fead4d16381a3ef0ef75e8403bc1e7385980da09"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1930946836da6f514da87625cd1a0331f3908e0de454628c24a0b97b130c4d4"
+checksum = "7eabb8d36b0ca8906bec93c78ea516741cac2d7e6b266fa7b0ffddcc09004990"
 dependencies = [
  "serde",
  "serde_derive",
@@ -2953,9 +2976,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5482a5fcdf98f2f31b21093643bdcfe9030866b8be6481117022e7f52baa0f2b"
+checksum = "44b42630229e49a8cfcae90bdc43c8c4c08f7a7aa4618b67f79265cd2f996dd2"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -2965,15 +2988,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f6e1869b6053383bdb356900e42e33555b4c9ebee05699469b7c53cdafc82ea"
+checksum = "918d1e36361805dfe0b6cdfd5a5ffdb5d03fa796170c5717d2727cbe623b93a0"
 
 [[package]]
 name = "cranelift-native"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91446e8045f1c4bc164b7bba68e2419c623904580d4b730877a663c6da38964"
+checksum = "75aea85a0d7e1800b14ce9d3f53adf8ad4d1ee8a9e23b0269bdc50285e93b9b3"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -2982,9 +3005,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.106.2"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8b17979b862d3b0d52de6ae3294ffe4d86c36027b56ad0443a7c8c8f921d14f"
+checksum = "dac491fd3473944781f0cf9528c90cc899d18ad438da21961a839a3a44d57dfb"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -2992,7 +3015,7 @@ dependencies = [
  "itertools 0.12.1",
  "log",
  "smallvec",
- "wasmparser",
+ "wasmparser 0.207.0",
  "wasmtime-types",
 ]
 
@@ -3157,21 +3180,11 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "ctor"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
+checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
 dependencies = [
  "quote",
  "syn 2.0.59",
@@ -3236,6 +3249,20 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "dasp_sample"
 version = "0.11.0"
@@ -3322,15 +3349,15 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 1.0.109",
+ "syn 2.0.59",
 ]
 
 [[package]]
@@ -3364,13 +3391,11 @@ dependencies = [
  "ctor",
  "editor",
  "env_logger",
- "feature_flags",
  "futures 0.3.28",
  "gpui",
  "language",
  "log",
  "lsp",
- "multi_buffer",
  "pretty_assertions",
  "project",
  "rand 0.8.5",
@@ -3405,22 +3430,13 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.4",
+ "block-buffer",
  "const-oid",
  "crypto-common",
  "subtle",
@@ -3605,7 +3621,7 @@ dependencies = [
  "base16ct",
  "crypto-bigint 0.4.9",
  "der 0.6.1",
- "digest 0.10.7",
+ "digest",
  "ff",
  "generic-array",
  "group",
@@ -3625,11 +3641,17 @@ dependencies = [
  "cc",
  "memchr",
  "rustc_version",
- "toml 0.8.10",
+ "toml 0.8.16",
  "vswhom",
  "winreg 0.52.0",
 ]
 
+[[package]]
+name = "embedded-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
+
 [[package]]
 name = "emojis"
 version = "0.6.1"
@@ -3681,17 +3703,27 @@ dependencies = [
  "syn 2.0.59",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
 [[package]]
 name = "env_logger"
-version = "0.10.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
+ "anstream 0.6.15",
+ "anstyle",
+ "env_filter",
  "humantime",
- "is-terminal",
  "log",
- "regex",
- "termcolor",
 ]
 
 [[package]]
@@ -3863,7 +3895,6 @@ dependencies = [
  "async-compression",
  "async-tar",
  "async-trait",
- "cap-std",
  "client",
  "collections",
  "ctor",
@@ -3891,12 +3922,12 @@ dependencies = [
  "snippet_provider",
  "task",
  "theme",
- "toml 0.8.10",
+ "toml 0.8.16",
  "ui",
  "url",
  "util",
- "wasm-encoder",
- "wasmparser",
+ "wasm-encoder 0.201.0",
+ "wasmparser 0.201.0",
  "wasmtime",
  "wasmtime-wasi",
  "wit-component",
@@ -3920,7 +3951,7 @@ dependencies = [
  "serde_json",
  "theme",
  "tokio",
- "toml 0.8.10",
+ "toml 0.8.16",
  "tree-sitter",
  "wasmtime",
 ]
@@ -4213,7 +4244,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
 dependencies = [
- "roxmltree 0.19.0",
+ "roxmltree",
 ]
 
 [[package]]
@@ -4330,7 +4361,7 @@ dependencies = [
  "text",
  "time",
  "util",
- "windows 0.57.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -4624,6 +4655,12 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+
 [[package]]
 name = "git"
 version = "0.1.0"
@@ -4650,7 +4687,7 @@ dependencies = [
  "unindent",
  "url",
  "util",
- "windows 0.57.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -4760,8 +4797,10 @@ dependencies = [
  "anyhow",
  "futures 0.3.28",
  "http_client",
+ "schemars",
  "serde",
  "serde_json",
+ "strum",
 ]
 
 [[package]]
@@ -4815,6 +4854,7 @@ dependencies = [
  "cocoa",
  "collections",
  "core-foundation",
+ "core-foundation-sys 0.8.6",
  "core-graphics",
  "core-text",
  "cosmic-text",
@@ -4873,8 +4913,8 @@ dependencies = [
  "wayland-cursor",
  "wayland-protocols",
  "wayland-protocols-plasma",
- "windows 0.57.0",
- "windows-core 0.57.0",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
  "x11-clipboard",
  "x11rb",
  "xim",
@@ -4951,7 +4991,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
 ]
 
 [[package]]
@@ -4960,7 +5000,7 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
@@ -5045,9 +5085,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "heed"
-version = "0.20.1"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f7acb9683d7c7068aa46d47557bfa4e35a277964b350d9504a87b03610163fd"
+checksum = "2bc30da4a93ff8cb98e535d595d6de42731d4719d707bc1c86f579158751a24e"
 dependencies = [
  "bitflags 2.6.0",
  "byteorder",
@@ -5070,9 +5110,9 @@ checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff"
 
 [[package]]
 name = "heed-types"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb0d6ba3700c9a57e83c013693e3eddb68a6d9b6781cacafc62a0d992e8ddb3"
+checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114"
 dependencies = [
  "bincode",
  "byteorder",
@@ -5116,17 +5156,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
 dependencies = [
- "hmac 0.12.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac",
- "digest 0.9.0",
+ "hmac",
 ]
 
 [[package]]
@@ -5135,7 +5165,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -5230,6 +5260,27 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
+[[package]]
+name = "http-types"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
+dependencies = [
+ "anyhow",
+ "async-channel 1.9.0",
+ "base64 0.13.1",
+ "futures-lite 1.13.0",
+ "http 0.2.9",
+ "infer",
+ "pin-project-lite",
+ "rand 0.7.3",
+ "serde",
+ "serde_json",
+ "serde_qs 0.8.5",
+ "serde_urlencoded",
+ "url",
+]
+
 [[package]]
 name = "http_client"
 version = "0.1.0"
@@ -5484,9 +5535,15 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "1.0.9"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
+[[package]]
+name = "infer"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
+checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
 
 [[package]]
 name = "inherent"
@@ -5675,6 +5732,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "isahc"
 version = "1.7.2"
@@ -5771,9 +5834,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
@@ -5810,18 +5873,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "jwt"
-version = "0.16.0"
+name = "jsonwebtoken"
+version = "9.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6204285f77fe7d9784db3fdc449ecce1a0114927a51d5a41c4c7a292011c015f"
+checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
 dependencies = [
- "base64 0.13.1",
- "crypto-common",
- "digest 0.10.7",
- "hmac 0.12.1",
- "serde",
- "serde_json",
- "sha2 0.10.7",
+ "base64 0.21.7",
+ "js-sys",
+ "pem",
+ "ring",
+ "serde",
+ "serde_json",
+ "simple_asn1",
 ]
 
 [[package]]
@@ -5918,7 +5981,7 @@ dependencies = [
  "tree-sitter-heex",
  "tree-sitter-html",
  "tree-sitter-json",
- "tree-sitter-markdown",
+ "tree-sitter-md",
  "tree-sitter-ruby",
  "tree-sitter-rust",
  "tree-sitter-typescript",
@@ -5935,13 +5998,16 @@ dependencies = [
  "anyhow",
  "client",
  "collections",
+ "copilot",
  "ctor",
  "editor",
  "env_logger",
  "feature_flags",
  "futures 0.3.28",
+ "google_ai",
  "gpui",
  "http_client",
+ "inline_completion_button",
  "language",
  "log",
  "menu",
@@ -5954,6 +6020,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
+ "smol",
  "strum",
  "text",
  "theme",
@@ -6024,6 +6091,7 @@ dependencies = [
  "node_runtime",
  "paths",
  "project",
+ "protols-tree-sitter-proto",
  "regex",
  "rope",
  "rust-embed",
@@ -6034,7 +6102,7 @@ dependencies = [
  "task",
  "text",
  "theme",
- "toml 0.8.10",
+ "toml 0.8.16",
  "tree-sitter",
  "tree-sitter-bash",
  "tree-sitter-c",
@@ -6045,8 +6113,7 @@ dependencies = [
  "tree-sitter-gowork",
  "tree-sitter-jsdoc",
  "tree-sitter-json",
- "tree-sitter-markdown",
- "tree-sitter-proto",
+ "tree-sitter-md",
  "tree-sitter-python",
  "tree-sitter-regex",
  "tree-sitter-rust",
@@ -6086,9 +6153,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -6232,7 +6299,7 @@ dependencies = [
  "postage",
  "serde",
  "serde_json",
- "sha2 0.10.7",
+ "sha2",
  "simplelog",
 ]
 
@@ -6242,22 +6309,20 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "hmac 0.12.1",
- "jwt",
+ "jsonwebtoken",
  "log",
  "prost",
  "prost-build",
  "prost-types",
  "reqwest",
  "serde",
- "sha2 0.10.7",
 ]
 
 [[package]]
 name = "lmdb-master-sys"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc9048db3a58c0732d7236abc4909058f9d2708cfb6d7d047eb895fddec6419a"
+checksum = "57640c190703d5ccf4a86aff4aeb749b2d287a8cb1723c76b51f39d77ab53b24"
 dependencies = [
  "cc",
  "doxygen-rs",
@@ -6276,9 +6341,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 dependencies = [
  "serde",
  "value-bag",
@@ -6313,7 +6378,7 @@ dependencies = [
  "serde_json",
  "smol",
  "util",
- "windows 0.57.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -6354,20 +6419,11 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
-[[package]]
-name = "mach"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "mach2"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
+checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
 dependencies = [
  "libc",
 ]
@@ -6484,7 +6540,7 @@ version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
 dependencies = [
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -6793,7 +6849,7 @@ dependencies = [
  "tempfile",
  "util",
  "walkdir",
- "windows 0.57.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -7066,9 +7122,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d"
 dependencies = [
  "crc32fast",
  "hashbrown 0.14.5",
@@ -7076,6 +7132,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "object"
+version = "0.36.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "oboe"
 version = "0.5.0"
@@ -7120,28 +7185,32 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oo7"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82"
+checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24"
 dependencies = [
  "aes",
  "async-fs 2.1.1",
  "async-io 2.3.1",
  "async-lock 3.3.0",
+ "async-net 2.0.0",
  "blocking",
  "cbc",
- "cipher 0.4.4",
- "digest 0.10.7",
+ "cipher",
+ "digest",
+ "endi",
  "futures-lite 2.2.0",
  "futures-util",
  "hkdf",
- "hmac 0.12.1",
+ "hmac",
+ "md-5",
  "num",
  "num-bigint-dig",
- "pbkdf2 0.12.2",
+ "pbkdf2",
  "rand 0.8.5",
  "serde",
- "sha2 0.10.7",
+ "sha2",
+ "subtle",
  "zbus",
  "zeroize",
  "zvariant",
@@ -7153,12 +7222,6 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
 [[package]]
 name = "open"
 version = "5.3.0"
@@ -7365,7 +7428,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
- "sha2 0.10.7",
+ "sha2",
 ]
 
 [[package]]
@@ -7380,9 +7443,9 @@ dependencies = [
 
 [[package]]
 name = "palette"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a"
+checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
 dependencies = [
  "approx",
  "fast-srgb8",
@@ -7391,10 +7454,11 @@ dependencies = [
 
 [[package]]
 name = "palette_derive"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d"
+checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
 dependencies = [
+ "by_address",
  "proc-macro2",
  "quote",
  "syn 2.0.59",
@@ -7445,9 +7509,9 @@ dependencies = [
 
 [[package]]
 name = "password-hash"
-version = "0.2.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1a5d4e9c205d2c1ae73b84aab6240e98218c0e72e63b50422cfb2d1ca952282"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
 dependencies = [
  "base64ct",
  "rand_core 0.6.4",
@@ -7493,23 +7557,14 @@ dependencies = [
  "util",
 ]
 
-[[package]]
-name = "pbkdf2"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
-dependencies = [
- "crypto-mac",
-]
-
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
- "digest 0.10.7",
- "hmac 0.12.1",
+ "digest",
+ "hmac",
 ]
 
 [[package]]
@@ -7518,6 +7573,16 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
+[[package]]
+name = "pem"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
+dependencies = [
+ "base64 0.22.1",
+ "serde",
+]
+
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -7722,7 +7787,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "indexmap 2.2.6",
  "quick-xml 0.32.0",
  "serde",
@@ -7823,6 +7888,17 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "postcard"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8"
+dependencies = [
+ "cobs",
+ "embedded-io",
+ "serde",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -7991,7 +8067,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
- "sha2 0.10.7",
+ "sha2",
  "shellexpand 2.1.2",
  "shlex",
  "similar",
@@ -8147,6 +8223,16 @@ version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
+[[package]]
+name = "protols-tree-sitter-proto"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bac092da66e21a71eb832925de7b542f8ac34f75fd05cd2fc3e272863e3fd2b"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "psm"
 version = "0.1.21"
@@ -8227,6 +8313,7 @@ dependencies = [
  "assistant",
  "editor",
  "gpui",
+ "markdown_preview",
  "repl",
  "search",
  "settings",
@@ -8437,18 +8524,24 @@ name = "recent_projects"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "auto_update",
  "client",
  "dev_server_projects",
  "editor",
+ "futures 0.3.28",
  "fuzzy",
  "gpui",
  "language",
+ "log",
  "markdown",
  "menu",
  "ordered-float 2.10.0",
  "picker",
  "project",
+ "release_channel",
+ "remote",
  "rpc",
+ "schemars",
  "serde",
  "serde_json",
  "settings",
@@ -8521,9 +8614,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -8625,8 +8718,9 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
+ "shellexpand 2.1.2",
  "smol",
- "toml 0.8.10",
+ "toml 0.8.16",
  "util",
  "worktree",
 ]
@@ -8640,15 +8734,6 @@ dependencies = [
  "bytecheck",
 ]
 
-[[package]]
-name = "repair_json"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee191e184125fe72cb59b74160e25584e3908f2aaa84cbda1e161347102aa15"
-dependencies = [
- "thiserror",
-]
-
 [[package]]
 name = "repl"
 version = "0.1.0"
@@ -8656,7 +8741,7 @@ dependencies = [
  "alacritty_terminal 0.23.0",
  "anyhow",
  "async-dispatcher",
- "base64 0.13.1",
+ "base64 0.22.1",
  "client",
  "collections",
  "command_palette_hooks",
@@ -8668,6 +8753,7 @@ dependencies = [
  "image",
  "indoc",
  "language",
+ "languages",
  "log",
  "multi_buffer",
  "project",
@@ -8679,6 +8765,9 @@ dependencies = [
  "smol",
  "terminal_view",
  "theme",
+ "tree-sitter-md",
+ "tree-sitter-python",
+ "tree-sitter-typescript",
  "ui",
  "util",
  "uuid",
@@ -8743,7 +8832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 dependencies = [
  "crypto-bigint 0.4.9",
- "hmac 0.12.1",
+ "hmac",
  "zeroize",
 ]
 
@@ -8849,6 +8938,8 @@ version = "0.1.0"
 dependencies = [
  "arrayvec",
  "criterion",
+ "ctor",
+ "env_logger",
  "gpui",
  "log",
  "rand 0.8.5",
@@ -8864,19 +8955,13 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
 
-[[package]]
-name = "roxmltree"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
-
 [[package]]
 name = "rpc"
 version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-tungstenite",
- "base64 0.13.1",
+ "base64 0.22.1",
  "chrono",
  "collections",
  "env_logger",
@@ -8888,7 +8973,7 @@ dependencies = [
  "rsa",
  "serde",
  "serde_json",
- "sha2 0.10.7",
+ "sha2",
  "strum",
  "tracing",
  "util",
@@ -8902,7 +8987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
 dependencies = [
  "const-oid",
- "digest 0.10.7",
+ "digest",
  "num-bigint-dig",
  "num-integer",
  "num-traits",
@@ -8924,7 +9009,7 @@ dependencies = [
  "anyhow",
  "async-dispatcher",
  "async-std",
- "base64 0.22.0",
+ "base64 0.22.1",
  "bytes 1.5.0",
  "chrono",
  "data-encoding",
@@ -8972,7 +9057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32"
 dependencies = [
  "globset",
- "sha2 0.10.7",
+ "sha2",
  "walkdir",
 ]
 
@@ -8994,9 +9079,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -9015,9 +9100,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.37.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
 dependencies = [
  "bitflags 1.3.2",
  "errno 0.3.8",
@@ -9127,11 +9212,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "salsa20"
-version = "0.8.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
 dependencies = [
- "cipher 0.3.0",
+ "cipher",
 ]
 
 [[package]]
@@ -9191,16 +9276,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scrypt"
-version = "0.7.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879588d8f90906e73302547e20fffefdd240eb3e0e744e142321f5d49dea0518"
+checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
 dependencies = [
- "base64ct",
- "hmac 0.11.0",
  "password-hash",
- "pbkdf2 0.8.0",
+ "pbkdf2",
  "salsa20",
- "sha2 0.9.9",
+ "sha2",
 ]
 
 [[package]]
@@ -9228,9 +9311,9 @@ dependencies = [
 
 [[package]]
 name = "sea-orm"
-version = "0.12.3"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da5b2d70c255bc5cbe1d49f69c3c8eadae0fbbaeb18ee978edbf2f75775cb94d"
+checksum = "c8814e37dc25de54398ee62228323657520b7f29713b8e238649385dbe473ee0"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -9256,9 +9339,9 @@ dependencies = [
 
 [[package]]
 name = "sea-orm-macros"
-version = "0.12.3"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c8d455fad40194fb9774fdc4810c0f2700ff0dc0e93bd5ce9d641cc3f5dd75"
+checksum = "5e115c6b078e013aa963cc2d38c196c2c40b05f03d0ac872fe06b6e0d5265603"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -9270,9 +9353,9 @@ dependencies = [
 
 [[package]]
 name = "sea-query"
-version = "0.30.2"
+version = "0.30.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3e6bba153bb198646c8762c48414942a38db27d142e44735a133cabddcc820"
+checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b"
 dependencies = [
  "bigdecimal",
  "chrono",
@@ -9396,7 +9479,6 @@ dependencies = [
  "client",
  "clock",
  "collections",
- "completion",
  "env_logger",
  "fs",
  "futures 0.3.28",
@@ -9413,7 +9495,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
- "sha2 0.10.7",
+ "sha2",
  "smol",
  "tempfile",
  "theme",
@@ -9435,24 +9517,27 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.18"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "serde"
-version = "1.0.202"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.202"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9481,12 +9566,13 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
 dependencies = [
  "indexmap 2.2.6",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -9513,6 +9599,28 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_qs"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
+dependencies = [
+ "percent-encoding",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "serde_qs"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa"
+dependencies = [
+ "percent-encoding",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "serde_repr"
 version = "0.1.16"
@@ -9526,9 +9634,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -9550,6 +9658,8 @@ name = "session"
 version = "0.1.0"
 dependencies = [
  "db",
+ "gpui",
+ "serde_json",
  "util",
  "uuid",
 ]
@@ -9565,6 +9675,7 @@ dependencies = [
  "gpui",
  "indoc",
  "lazy_static",
+ "log",
  "paths",
  "pretty_assertions",
  "release_channel",
@@ -9586,29 +9697,15 @@ name = "settings_ui"
 version = "0.1.0"
 dependencies = [
  "command_palette_hooks",
+ "editor",
  "feature_flags",
- "fs",
  "gpui",
- "project",
  "settings",
  "theme",
  "ui",
  "workspace",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -9617,7 +9714,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -9628,26 +9725,13 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "sha2"
-version = "0.9.9"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "block-buffer 0.9.0",
  "cfg-if",
  "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -9714,7 +9798,7 @@ version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "rand_core 0.6.4",
 ]
 
@@ -9724,7 +9808,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
 dependencies = [
- "digest 0.10.7",
+ "digest",
  "rand_core 0.6.4",
 ]
 
@@ -9755,6 +9839,18 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec"
 
+[[package]]
+name = "simple_asn1"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror",
+ "time",
+]
+
 [[package]]
 name = "simplecss"
 version = "0.2.1"
@@ -9834,9 +9930,23 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "smart-default"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
 
 [[package]]
 name = "smol"
@@ -9855,6 +9965,15 @@ dependencies = [
  "futures-lite 1.13.0",
 ]
 
+[[package]]
+name = "smol_str"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "snippet"
 version = "0.1.0"
@@ -10015,7 +10134,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
  "atoi",
  "bigdecimal",
  "byteorder",
@@ -10044,7 +10163,7 @@ dependencies = [
  "rustls-pemfile",
  "serde",
  "serde_json",
- "sha2 0.10.7",
+ "sha2",
  "smallvec",
  "sqlformat",
  "thiserror",
@@ -10085,7 +10204,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "sha2 0.10.7",
+ "sha2",
  "sqlx-core",
  "sqlx-mysql",
  "sqlx-postgres",
@@ -10110,7 +10229,7 @@ dependencies = [
  "bytes 1.5.0",
  "chrono",
  "crc",
- "digest 0.10.7",
+ "digest",
  "dotenvy",
  "either",
  "futures-channel",
@@ -10120,7 +10239,7 @@ dependencies = [
  "generic-array",
  "hex",
  "hkdf",
- "hmac 0.12.1",
+ "hmac",
  "itoa",
  "log",
  "md-5",
@@ -10132,7 +10251,7 @@ dependencies = [
  "rust_decimal",
  "serde",
  "sha1",
- "sha2 0.10.7",
+ "sha2",
  "smallvec",
  "sqlx-core",
  "stringprep",
@@ -10164,7 +10283,7 @@ dependencies = [
  "futures-util",
  "hex",
  "hkdf",
- "hmac 0.12.1",
+ "hmac",
  "home",
  "itoa",
  "log",
@@ -10177,7 +10296,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha1",
- "sha2 0.10.7",
+ "sha2",
  "smallvec",
  "sqlx-core",
  "stringprep",
@@ -10314,6 +10433,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "strum"
 version = "0.25.0"
@@ -10571,7 +10696,7 @@ dependencies = [
  "cfg-expr",
  "heck 0.5.0",
  "pkg-config",
- "toml 0.8.10",
+ "toml 0.8.16",
  "version-compare",
 ]
 
@@ -10607,7 +10732,6 @@ dependencies = [
  "project",
  "serde",
  "serde_json",
- "terminal_view",
  "theme",
  "ui",
  "util",
@@ -10658,7 +10782,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json_lenient",
- "sha2 0.10.7",
+ "sha2",
  "shellexpand 2.1.2",
  "util",
 ]
@@ -10745,7 +10869,6 @@ dependencies = [
  "schemars",
  "serde",
  "serde_derive",
- "serde_json",
  "settings",
  "smol",
  "sysinfo",
@@ -10753,7 +10876,7 @@ dependencies = [
  "theme",
  "thiserror",
  "util",
- "windows 0.57.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -11036,9 +11159,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -11061,6 +11184,7 @@ dependencies = [
  "dev_server_projects",
  "editor",
  "extensions_ui",
+ "feature_flags",
  "feedback",
  "gpui",
  "http_client",
@@ -11075,11 +11199,11 @@ dependencies = [
  "story",
  "theme",
  "theme_selector",
- "tree-sitter-markdown",
+ "tree-sitter-md",
  "ui",
  "util",
  "vcs_menu",
- "windows 0.57.0",
+ "windows 0.58.0",
  "workspace",
  "zed_actions",
 ]
@@ -11165,7 +11289,7 @@ dependencies = [
  "futures-util",
  "log",
  "tokio",
- "tungstenite 0.20.1",
+ "tungstenite",
 ]
 
 [[package]]
@@ -11206,21 +11330,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.10"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.6",
+ "toml_edit 0.22.17",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db"
 dependencies = [
  "serde",
 ]
@@ -11251,9 +11375,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.6"
+version = "0.22.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
+checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
@@ -11414,19 +11538,20 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.20.100"
-source = "git+https://github.com/tree-sitter/tree-sitter?rev=7b4894ba2ae81b988846676f54c0988d4027ef4f#7b4894ba2ae81b988846676f54c0988d4027ef4f"
+version = "0.22.6"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f4a57817d58a2f134fe863674acad6bbf007228#7f4a57817d58a2f134fe863674acad6bbf007228"
 dependencies = [
  "cc",
  "regex",
+ "tree-sitter-language",
  "wasmtime-c-api-impl",
 ]
 
 [[package]]
 name = "tree-sitter-bash"
-version = "0.20.5"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da2032c37eb2ce29fd18df7d3b94355fec8d6d854d8f80934955df542b5906"
+checksum = "b5244703ad2e08a616d859a0557d7aa290adcd5e0990188a692e628ffe9dce40"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11434,9 +11559,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-c"
-version = "0.20.6"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b03bdf218020057abee831581a74bff8c298323d6c6cd1a70556430ded9f4b"
+checksum = "f956d5351d62652864a4ff3ae861747e7a1940dc96c9998ae400ac0d3ce30427"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11444,9 +11569,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-cpp"
-version = "0.20.5"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46b04a5ada71059afb9895966a6cc1094acc8d2ea1971006db26573e7dfebb74"
+checksum = "1d509a22a992790d38f2c291961ff8a1ff016c437c7ec6befc9220b8eec8918c"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11454,9 +11579,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-css"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3306ddefa1d2681adda2613d11974ffabfbeb215e23235da6c862f3493a04fd"
+checksum = "e2f806f96136762b0121f5fdd7172a3dcd8f42d37a2f23ed7f11b35895e20eb4"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11464,9 +11589,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-elixir"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc0b1f3e6d9f12ca22ae5171f32fd154e3aea29dff565d05ef785c28931415b"
+checksum = "df94bf7f057768b1cab2ee1f14812ed4ae33f9e04d09254043eeaa797db4ef70"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11484,8 +11609,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-go"
-version = "0.20.0"
-source = "git+https://github.com/tree-sitter/tree-sitter-go?rev=b82ab803d887002a0af11f6ce63d72884580bf33#b82ab803d887002a0af11f6ce63d72884580bf33"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cb318be5ccf75f44e054acf6898a5c95d59b53443eed578e16be0cd7ec037f"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11493,9 +11619,8 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-gomod"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31d0a848a3a4a383fb97ef91241d972c3b996567cdc59040ad2c6fc48b874992"
+version = "1.0.2"
+source = "git+https://github.com/camdencheek/tree-sitter-go-mod?rev=1f55029bacd0a6a11f6eb894c4312d429dcf735c#1f55029bacd0a6a11f6eb894c4312d429dcf735c"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11504,7 +11629,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter-gowork"
 version = "0.0.1"
-source = "git+https://github.com/d1y/tree-sitter-go-work#a2a4b99b53b3740855ff33f0b54cab0bb4ce6f45"
+source = "git+https://github.com/d1y/tree-sitter-go-work?rev=dcbabff454703c3a4bc98a23cf8778d4be46fd22#dcbabff454703c3a4bc98a23cf8778d4be46fd22"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11513,7 +11638,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter-heex"
 version = "0.0.1"
-source = "git+https://github.com/phoenixframework/tree-sitter-heex?rev=2e1348c3cf2c9323e87c2744796cf3f3868aa82a#2e1348c3cf2c9323e87c2744796cf3f3868aa82a"
+source = "git+https://github.com/phoenixframework/tree-sitter-heex?rev=6dd0303acf7138dd2b9b432a229e16539581c701#6dd0303acf7138dd2b9b432a229e16539581c701"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11521,9 +11646,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-html"
-version = "0.19.0"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "184e6b77953a354303dc87bf5fe36558c83569ce92606e7b382a0dc1b7443443"
+checksum = "95b3492b08a786bf5cc79feb0ef2ff3b115d5174364e0ddfd7860e0b9b088b53"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11531,8 +11656,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-jsdoc"
-version = "0.20.0"
-source = "git+https://github.com/tree-sitter/tree-sitter-jsdoc?rev=6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55#6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d07920101ff12a59574890318a37fa7e18d9c06d9aa4be334aa24adbb480f18"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11540,27 +11666,23 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-json"
-version = "0.20.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d"
+checksum = "5b737dcb73c35d74b7d64a5f3dde158113c86a012bf3cee2bfdf2150d23b05db"
 dependencies = [
  "cc",
  "tree-sitter",
 ]
 
 [[package]]
-name = "tree-sitter-markdown"
-version = "0.0.1"
-source = "git+https://github.com/MDeiml/tree-sitter-markdown?rev=330ecab87a3e3a7211ac69bbadc19eabecdb1cca#330ecab87a3e3a7211ac69bbadc19eabecdb1cca"
-dependencies = [
- "cc",
- "tree-sitter",
-]
+name = "tree-sitter-language"
+version = "0.1.0"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f4a57817d58a2f134fe863674acad6bbf007228#7f4a57817d58a2f134fe863674acad6bbf007228"
 
 [[package]]
-name = "tree-sitter-proto"
-version = "0.0.2"
-source = "git+https://github.com/rewinfrey/tree-sitter-proto?rev=36d54f288aee112f13a67b550ad32634d0c2cb52#36d54f288aee112f13a67b550ad32634d0c2cb52"
+name = "tree-sitter-md"
+version = "0.2.3"
+source = "git+https://github.com/zed-industries/tree-sitter-markdown?rev=e3855e37f8f2c71aa7513c18a9c95fb7461b1b10#e3855e37f8f2c71aa7513c18a9c95fb7461b1b10"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11568,9 +11690,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-python"
-version = "0.20.4"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5"
+checksum = "b4066c6cf678f962f8c2c4561f205945c84834cce73d981e71392624fdc390a9"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11578,9 +11700,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-regex"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb5a53e9c990757895476216796b170fd81e4d173d08f8b082279c4e6ff8c5c"
+checksum = "5ff1286fe9651b2797484839ffa37aa76c8618d4ccb6836d7e31765dfd60c0d5"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11588,9 +11710,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-ruby"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ac30cbb1560363ae76e1ccde543d6d99087421e228cc47afcec004b86bb711a"
+checksum = "c0031f687c0772f2dad7b77104c43428611099a1804c81244ada21560f41f0b1"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11598,9 +11720,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-rust"
-version = "0.20.4"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594"
+checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11608,9 +11730,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-typescript"
-version = "0.20.5"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8bc1d2c24276a48ef097a71b56888ac9db63717e8f8d0b324668a27fd619670"
+checksum = "ecb35d98a688378e56c18c9c159824fd16f730ccbea19aacf4f206e5d5438ed9"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11618,9 +11740,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-yaml"
-version = "0.0.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324767d0ad6bc588467aa4b98f6f5cd6eda64ece1eae568f8fcf5b899bcf0fe9"
+checksum = "aad27ec46ad343d8b514f64dd3fdffb478c592ece561b6c935d90ef55589c6b6"
 dependencies = [
  "cc",
  "tree-sitter",
@@ -11638,26 +11760,6 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
 
-[[package]]
-name = "tungstenite"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1"
-dependencies = [
- "base64 0.13.1",
- "byteorder",
- "bytes 1.5.0",
- "http 0.2.9",
- "httparse",
- "log",
- "native-tls",
- "rand 0.8.5",
- "sha-1",
- "thiserror",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.20.1"
@@ -11670,6 +11772,7 @@ dependencies = [
  "http 0.2.9",
  "httparse",
  "log",
+ "native-tls",
  "rand 0.8.5",
  "sha1",
  "thiserror",
@@ -11714,7 +11817,7 @@ dependencies = [
  "story",
  "strum",
  "theme",
- "windows 0.57.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -11739,9 +11842,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-bidi-mirroring"
@@ -11769,9 +11872,9 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
@@ -11826,9 +11929,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -11848,14 +11951,14 @@ version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "data-url",
  "flate2",
  "imagesize",
  "kurbo",
  "log",
  "pico-args",
- "roxmltree 0.19.0",
+ "roxmltree",
  "simplecss",
  "siphasher 1.0.1",
  "strict-num",
@@ -11902,9 +12005,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom 0.2.10",
  "serde",
@@ -12012,6 +12115,7 @@ dependencies = [
  "indoc",
  "itertools 0.11.0",
  "language",
+ "lazy_static",
  "log",
  "lsp",
  "multi_buffer",
@@ -12093,9 +12197,9 @@ dependencies = [
 
 [[package]]
 name = "waker-fn"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "walkdir"
@@ -12209,6 +12313,15 @@ dependencies = [
  "leb128",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.207.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d996306fb3aeaee0d9157adbe2f670df0236caf19f6728b221e92d0f27b3fe17"
+dependencies = [
+ "leb128",
+]
+
 [[package]]
 name = "wasm-metadata"
 version = "0.201.0"
@@ -12221,8 +12334,8 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "spdx",
- "wasm-encoder",
- "wasmparser",
+ "wasm-encoder 0.201.0",
+ "wasmparser 0.201.0",
 ]
 
 [[package]]
@@ -12236,68 +12349,89 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "wasmparser"
+version = "0.207.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c"
+dependencies = [
+ "ahash 0.8.11",
+ "bitflags 2.6.0",
+ "hashbrown 0.14.5",
+ "indexmap 2.2.6",
+ "semver",
+]
+
 [[package]]
 name = "wasmprinter"
-version = "0.201.0"
+version = "0.207.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67e66da702706ba08729a78e3c0079085f6bfcb1a62e4799e97bbf728c2c265"
+checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115"
 dependencies = [
  "anyhow",
- "wasmparser",
+ "wasmparser 0.207.0",
 ]
 
 [[package]]
 name = "wasmtime"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e300c0e3f19dc9064e3b17ce661088646c70dbdde36aab46470ed68ba58db7d"
+checksum = "f92a1370c66a0022e6d92dcc277e2c84f5dece19569670b8ce7db8162560d8b6"
 dependencies = [
  "anyhow",
  "async-trait",
- "bincode",
  "bumpalo",
+ "cc",
  "cfg-if",
  "encoding_rs",
- "gimli",
+ "hashbrown 0.14.5",
  "indexmap 2.2.6",
  "libc",
+ "libm",
  "log",
- "object",
+ "mach2",
+ "memfd",
+ "memoffset",
+ "object 0.33.0",
  "once_cell",
  "paste",
+ "postcard",
+ "psm",
  "rustix 0.38.32",
  "semver",
  "serde",
  "serde_derive",
- "serde_json",
+ "smallvec",
+ "sptr",
  "target-lexicon",
- "wasmparser",
+ "wasmparser 0.207.0",
+ "wasmtime-asm-macros",
  "wasmtime-component-macro",
  "wasmtime-component-util",
  "wasmtime-cranelift",
  "wasmtime-environ",
  "wasmtime-fiber",
  "wasmtime-jit-icache-coherence",
- "wasmtime-runtime",
  "wasmtime-slab",
+ "wasmtime-versioned-export-macros",
  "wasmtime-winch",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "110aa598e02a136fb095ca70fa96367fc16bab55256a131e66f9b58f16c73daf"
+checksum = "6dee8679c974a7f258c03d60d3c747c426ed219945b6d08cbc77fd2eab15b2d1"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "wasmtime-c-api-impl"
-version = "19.0.0"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67dea28073e105735210b9e932b5e654198d5e28ed31f1314037cd7664ceda2b"
+checksum = "76af8b62c8d2814b7d5975c5dc140122e4c086150db6c15d25a4b76f11c929dd"
 dependencies = [
  "anyhow",
  "log",
@@ -12309,9 +12443,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-c-api-macros"
-version = "19.0.0"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cfe12050fa28b17ab8434ab757fee281dd0d5c7715fa1bc5e4c0b29d1705415"
+checksum = "d74b92f917c9ced9c6262a00e9cb982ebac183e6900b4d44e2480f936b9495eb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12319,9 +12453,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-component-macro"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "091f32ce586251ac4d07019388fb665b010d9518ffe47be1ddbabb162eed6007"
+checksum = "32cae30035f1cf97dcc6657c979cf39f99ce6be93583675eddf4aeaa5548509c"
 dependencies = [
  "anyhow",
  "proc-macro2",
@@ -12329,20 +12463,20 @@ dependencies = [
  "syn 2.0.59",
  "wasmtime-component-util",
  "wasmtime-wit-bindgen",
- "wit-parser",
+ "wit-parser 0.207.0",
 ]
 
 [[package]]
 name = "wasmtime-component-util"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd17dc1ebc0b28fd24b6b9d07638f55b82ae908918ff08fd221f8b0fefa9125"
+checksum = "f7ae611f08cea620c67330925be28a96115bf01f8f393a6cbdf4856a86087134"
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e923262451a4b5b39fe02f69f1338d56356db470e289ea1887346b9c7f592738"
+checksum = "b2909406a6007e28be964067167890bca4574bd48a9ff18f1fa9f4856d89ea40"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -12352,54 +12486,36 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli",
+ "gimli 0.28.0",
  "log",
- "object",
+ "object 0.33.0",
  "target-lexicon",
  "thiserror",
- "wasmparser",
- "wasmtime-cranelift-shared",
+ "wasmparser 0.207.0",
  "wasmtime-environ",
  "wasmtime-versioned-export-macros",
 ]
 
-[[package]]
-name = "wasmtime-cranelift-shared"
-version = "19.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "508898cbbea0df81a5d29cfc1c7c72431a1bc4c9e89fd9514b4c868474c05c7a"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "cranelift-control",
- "cranelift-native",
- "gimli",
- "object",
- "target-lexicon",
- "wasmtime-environ",
-]
-
 [[package]]
 name = "wasmtime-environ"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e3f2aa72dbb64c19708646e1ff97650f34e254598b82bad5578ea9c80edd30"
+checksum = "40e227f9ed2f5421473723d6c0352b5986e6e6044fde5410a274a394d726108f"
 dependencies = [
  "anyhow",
- "bincode",
  "cpp_demangle",
  "cranelift-entity",
- "gimli",
+ "gimli 0.28.0",
  "indexmap 2.2.6",
  "log",
- "object",
+ "object 0.33.0",
+ "postcard",
  "rustc-demangle",
  "serde",
  "serde_derive",
  "target-lexicon",
- "thiserror",
- "wasm-encoder",
- "wasmparser",
+ "wasm-encoder 0.207.0",
+ "wasmparser 0.207.0",
  "wasmprinter",
  "wasmtime-component-util",
  "wasmtime-types",
@@ -12407,9 +12523,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-fiber"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9235b643527bcbac808216ed342e1fba324c95f14a62762acfa6f2e6ca5edbd6"
+checksum = "42edb392586d07038c1638e854382db916b6ca7845a2e6a7f8dc49e08907acdd"
 dependencies = [
  "anyhow",
  "cc",
@@ -12422,68 +12538,40 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c22ca2ef4d87b23d400660373453e274b2251bc2d674e3102497f690135e04b0"
-dependencies = [
- "cfg-if",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "wasmtime-runtime"
-version = "19.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1806ee242ca4fd183309b7406e4e83ae7739b7569f395d56700de7c7ef9f5eb8"
+checksum = "afe088f9b56bb353adaf837bf7e10f1c2e1676719dd5be4cac8e37f2ba1ee5bc"
 dependencies = [
  "anyhow",
- "cc",
  "cfg-if",
- "encoding_rs",
- "indexmap 2.2.6",
  "libc",
- "log",
- "mach",
- "memfd",
- "memoffset",
- "paste",
- "psm",
- "rustix 0.38.32",
- "sptr",
- "wasm-encoder",
- "wasmtime-asm-macros",
- "wasmtime-environ",
- "wasmtime-fiber",
- "wasmtime-versioned-export-macros",
- "wasmtime-wmemcheck",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "wasmtime-slab"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c58bef9ce877fd06acb58f08d003af17cb05cc51225b455e999fbad8e584c0"
+checksum = "4ff75cafffe47b04b036385ce3710f209153525b0ed19d57b0cf44a22d446460"
 
 [[package]]
 name = "wasmtime-types"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cebe297aa063136d9d2e5b347c1528868aa43c2c8d0e1eb0eec144567e38fe0f"
+checksum = "2f2fa462bfea3220711c84e2b549f147e4df89eeb49b8a2a3d89148f6cc4a8b1"
 dependencies = [
  "cranelift-entity",
  "serde",
  "serde_derive",
- "thiserror",
- "wasmparser",
+ "smallvec",
+ "wasmparser 0.207.0",
 ]
 
 [[package]]
 name = "wasmtime-versioned-export-macros"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffaafa5c12355b1a9ee068e9295d50c4ca0a400c721950cdae4f5b54391a2da5"
+checksum = "d4cedc5bfef3db2a85522ee38564b47ef3b7fc7c92e94cacbce99808e63cdd47"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12492,9 +12580,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wasi"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b95961546319d4019625920756967a929879d1d46c4e5f89a74e9f4405655b0c"
+checksum = "bdbbe94245904d4c96c7c5f7b55bad896cc27908644efd9442063c0748b631fc"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -12523,39 +12611,33 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-winch"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d618b4e90d3f259b1b77411ce573c9f74aade561957102132e169918aabdc863"
+checksum = "97b27054fed6be4f3800aba5766f7ef435d4220ce290788f021a08d4fa573108"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
- "gimli",
- "object",
+ "gimli 0.28.0",
+ "object 0.33.0",
  "target-lexicon",
- "wasmparser",
- "wasmtime-cranelift-shared",
+ "wasmparser 0.207.0",
+ "wasmtime-cranelift",
  "wasmtime-environ",
  "winch-codegen",
 ]
 
 [[package]]
 name = "wasmtime-wit-bindgen"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c7a253c8505edd7493603e548bff3af937b0b7dbf2b498bd5ff2131b651af72"
+checksum = "c936a52ce69c28de2aa3b5fb4f2dbbb2966df304f04cccb7aca4ba56d915fda0"
 dependencies = [
  "anyhow",
  "heck 0.4.1",
  "indexmap 2.2.6",
- "wit-parser",
+ "wit-parser 0.207.0",
 ]
 
-[[package]]
-name = "wasmtime-wmemcheck"
-version = "19.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9a8c62e9df8322b2166d2a6f096fbec195ddb093748fd74170dcf25ef596769"
-
 [[package]]
 name = "wast"
 version = "35.0.2"
@@ -12737,9 +12819,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899d3fe5fbacd02f114cacdaa1cca9040280c4153c71833a77b9609c60ccf72b"
+checksum = "a89ea6f74ece6d1cfbd089783006b8eb69a0219ca83cad22068f0d9fa9df3f91"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -12752,9 +12834,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle-generate"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2df5887f452cff44ffe1e1aba69b7fafe812deed38498446fa7a46b55e962cd5"
+checksum = "36beda94813296ecaf0d91b7ada9da073fd41865ba339bdd3b7764e2e785b8e9"
 dependencies = [
  "anyhow",
  "heck 0.4.1",
@@ -12767,9 +12849,9 @@ dependencies = [
 
 [[package]]
 name = "wiggle-macro"
-version = "19.0.2"
+version = "21.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdb12de36507498abaa3a042f895a43ee00a2f6125b6901b9a27edf72bfdbe7"
+checksum = "0b47d2b4442ce93106dba5d1a9c59d5f85b5732878bb3d0598d3c93c0d01b16b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12810,17 +12892,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "winch-codegen"
-version = "0.17.2"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d15869abc9e3bb29c017c003dbe007a08e9910e8ff9023a962aa13c1b2ee6af"
+checksum = "1dc69899ccb2da7daa4df31426dcfd284b104d1a85e1dae35806df0c46187f87"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
- "gimli",
+ "gimli 0.28.0",
  "regalloc2",
  "smallvec",
  "target-lexicon",
- "wasmparser",
+ "wasmparser 0.207.0",
+ "wasmtime-cranelift",
  "wasmtime-environ",
 ]
 
@@ -12849,17 +12932,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
  "windows-core 0.52.0",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows"
-version = "0.57.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
 dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.5",
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -12868,26 +12951,27 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.57.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
  "windows-implement",
  "windows-interface",
  "windows-result",
- "windows-targets 0.52.5",
+ "windows-strings",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.57.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12896,9 +12980,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.57.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12907,11 +12991,21 @@ dependencies = [
 
 [[package]]
 name = "windows-result"
-version = "0.1.1"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -12938,7 +13032,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -12973,18 +13067,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -13001,9 +13095,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -13019,9 +13113,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -13037,15 +13131,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -13061,9 +13155,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -13079,9 +13173,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -13097,9 +13191,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -13115,9 +13209,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -13204,7 +13298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e85e72719ffbccf279359ad071497e47eb0675fe22106dea4ed2d8a7fcb60ba4"
 dependencies = [
  "anyhow",
- "wit-parser",
+ "wit-parser 0.201.0",
 ]
 
 [[package]]
@@ -13254,10 +13348,10 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "wasm-encoder",
+ "wasm-encoder 0.201.0",
  "wasm-metadata",
- "wasmparser",
- "wit-parser",
+ "wasmparser 0.201.0",
+ "wit-parser 0.201.0",
 ]
 
 [[package]]
@@ -13275,7 +13369,25 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "unicode-xid",
- "wasmparser",
+ "wasmparser 0.201.0",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.207.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c83dab33a9618d86cfe3563cc864deffd08c17efc5db31a3b7cd1edeffe6e1"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap 2.2.6",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser 0.207.0",
 ]
 
 [[package]]
@@ -13326,6 +13438,7 @@ dependencies = [
  "smallvec",
  "sqlez",
  "task",
+ "tempfile",
  "theme",
  "ui",
  "util",
@@ -13434,7 +13547,7 @@ name = "xim"
 version = "0.4.0"
 source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
  "hashbrown 0.14.5",
  "log",
  "x11rb",
@@ -13503,9 +13616,9 @@ name = "xtask"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "cargo_metadata",
  "cargo_toml",
  "clap",
- "toml 0.8.10",
 ]
 
 [[package]]
@@ -13597,7 +13710,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.146.5"
+version = "0.147.2"
 dependencies = [
  "activity_indicator",
  "anyhow",
@@ -13685,7 +13798,7 @@ dependencies = [
  "terminal_view",
  "theme",
  "theme_selector",
- "tree-sitter-markdown",
+ "tree-sitter-md",
  "tree-sitter-rust",
  "ui",
  "url",
@@ -13709,7 +13822,7 @@ dependencies = [
 
 [[package]]
 name = "zed_astro"
-version = "0.0.3"
+version = "0.1.0"
 dependencies = [
  "serde",
  "zed_extension_api 0.0.6",
@@ -13726,7 +13839,7 @@ dependencies = [
 name = "zed_csharp"
 version = "0.0.2"
 dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
@@ -13738,7 +13851,7 @@ dependencies = [
 
 [[package]]
 name = "zed_deno"
-version = "0.0.1"
+version = "0.0.2"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13761,7 +13874,7 @@ dependencies = [
 name = "zed_emmet"
 version = "0.0.3"
 dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
@@ -13771,15 +13884,6 @@ dependencies = [
  "zed_extension_api 0.0.6",
 ]
 
-[[package]]
-name = "zed_extension_api"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5c51cad4152bb5eb35b20dccdcbfb36f48d8952a2ed2d3e25b70361007d953b"
-dependencies = [
- "wit-bindgen",
-]
-
 [[package]]
 name = "zed_extension_api"
 version = "0.0.6"
@@ -13854,14 +13958,14 @@ dependencies = [
 name = "zed_prisma"
 version = "0.0.3"
 dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
 name = "zed_purescript"
 version = "0.0.1"
 dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
@@ -13895,7 +13999,7 @@ dependencies = [
 
 [[package]]
 name = "zed_terraform"
-version = "0.0.3"
+version = "0.0.4"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13918,7 +14022,7 @@ dependencies = [
 name = "zed_uiua"
 version = "0.0.1"
 dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
@@ -13931,7 +14035,7 @@ dependencies = [
 
 [[package]]
 name = "zed_zig"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13994,7 +14098,7 @@ dependencies = [
  "asynchronous-codec",
  "bytes 1.5.0",
  "crossbeam-queue",
- "dashmap",
+ "dashmap 5.5.3",
  "futures-channel",
  "futures-io",
  "futures-task",
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index da892f56950f6..56b1b872611c6 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;
 
 rustPlatform.buildRustPackage rec {
   pname = "zed";
-  version = "0.146.5";
+  version = "0.147.2";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rHdvANczB2ccLOCNh1ZgkkknCNbTaPPODT72WjuOezs=";
+    hash = "sha256-Qjorf5cqfEnvlKX0WaE0VNJr99AGJsAJ/BEf8yfPv7E=";
     fetchSubmodules = true;
   };
 
@@ -55,13 +55,11 @@ rustPlatform.buildRustPackage rec {
       "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo=";
       "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";
       "nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8=";
-      "tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE=";
-      "tree-sitter-go-0.20.0" = "sha256-/mE21JSa3LWEiOgYPJcq0FYzTbBuNwp9JdZTZqmDIUU=";
-      "tree-sitter-gowork-0.0.1" = "sha256-lM4L4Ap/c8uCr4xUw9+l/vaGb3FxxnuZI0+xKYFDPVg=";
-      "tree-sitter-heex-0.0.1" = "sha256-6LREyZhdTDt3YHVRPDyqCaDXqcsPlHOoMFDb2B3+3xM=";
-      "tree-sitter-jsdoc-0.20.0" = "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y=";
-      "tree-sitter-markdown-0.0.1" = "sha256-F8VVd7yYa4nCrj/HEC13BTC7lkV3XSb2Z3BNi/VfSbs=";
-      "tree-sitter-proto-0.0.2" = "sha256-W0diP2ByAXYrc7Mu/sbqST6lgVIyHeSBmH7/y/X3NhU=";
+      "tree-sitter-0.22.6" = "sha256-P9pQcofDCIhOYWA1OC8TzB5UgWpD5GlDzX2DOS8SsH0=";
+      "tree-sitter-gomod-1.0.2" = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE=";
+      "tree-sitter-gowork-0.0.1" = "sha256-803ujH5qwejQ2vQDDpma4JDC9a+vFX8ZQmr+77VyL2M=";
+      "tree-sitter-heex-0.0.1" = "sha256-VakMZtWQ/h7dNy5ehk2Bh14a5s878AUgwY3Ipq8tPec=";
+      "tree-sitter-md-0.2.3" = "sha256-Fa73P1h5GvKV3SxXr0KzHuNp4xa5wxUzI8ecXbGdrYE=";
       "xim-0.4.0" = "sha256-vxu3tjkzGeoRUj7vyP0vDGI7fweX8Drgy9hwOUOEQIA=";
       "xkbcommon-0.7.0" = "sha256-2RjZWiAaz8apYTrZ82qqH4Gv20WyCtPT+ldOzm0GWMo=";
     };

From e92efd8a53ba44743aa2c4af4fa0ba650093f1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 8 Aug 2024 13:30:49 +0200
Subject: [PATCH 208/342] Revert "ladybird: fix compilation by adding no longer
 propagated libraries"

This reverts commit 757c9420fdc15f63313c89e059e68d9dfe5c7c80.
---
 .../applications/networking/browsers/ladybird/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix
index 033b20dca5ad2..e6067f1da4aa2 100644
--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -8,13 +8,10 @@
 , unicode-emoji
 , unicode-character-database
 , cmake
-, dav1d
 , ninja
 , pkg-config
-, libaom
 , libavif
 , libxcrypt
-, libyuv
 , python3
 , qt6Packages
 , woff2
@@ -121,12 +118,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = with qt6Packages; [
-    dav1d
     ffmpeg
-    libaom
     libavif
     libxcrypt
-    libyuv
     qtbase
     qtmultimedia
     skia
@@ -159,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # Only Ladybird and WebContent need wrapped, if Qt is enabled.
-  # On linux we end up wrapping some non-Qt apps, like headless-browser.
+  # On linux we end up wraping some non-Qt apps, like headless-browser.
   dontWrapQtApps = stdenv.isDarwin;
 
   passthru.tests = {

From 149a15141ad00c1b525ac02dacdb526b62c53e50 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 01:40:29 +0200
Subject: [PATCH 209/342] python312Packages.aiohttp: 3.10.1 -> 3.10.2

https://github.com/aio-libs/aiohttp/blob/v3.10.2/CHANGES.rst
---
 pkgs/development/python-modules/aiohttp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 83b35614aa4e0..e54494b7907ab 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.10.1";
+  version = "3.10.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiohttp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+1Qu5Y1FwrsqWuvhOANdYXamxZJ9Z41EXaiEhyvtFUE=";
+    hash = "sha256-jetgFHFD9l2hW7FWbGESM6Tqeav+2rM8C2TCV0bPJwU=";
   };
 
   patches = [

From 27d4ae6645e18bf5513af3bc2c24342c9a24bc18 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 9 Aug 2024 10:29:38 +0300
Subject: [PATCH 210/342] rustc: 1.80.0 -> 1.80.1, add zlib dependency on
 Darwin

---
 pkgs/development/compilers/rust/1_80.nix  | 4 ++--
 pkgs/development/compilers/rust/rustc.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rust/1_80.nix b/pkgs/development/compilers/rust/1_80.nix
index b995c329963e2..f1a5bb8d61eaf 100644
--- a/pkgs/development/compilers/rust/1_80.nix
+++ b/pkgs/development/compilers/rust/1_80.nix
@@ -46,8 +46,8 @@ let
 in
 import ./default.nix
   {
-    rustcVersion = "1.80.0";
-    rustcSha256 = "sha256-b2BsGT8jD2ssrkV297JNUPX5sl3/Edv5si94fTUh1nI=";
+    rustcVersion = "1.80.1";
+    rustcSha256 = "sha256-LAuPZDlC3LgQy8xQ8pJWSxtuRNtdX0UJEVOZbfldLcQ=";
 
     llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
     llvmSharedForHost = llvmSharedFor pkgsBuildHost;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index ef7b92efc535e..8cbe04532fb9e 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -2,7 +2,7 @@
 , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
 , runCommandLocal, fetchurl, file, python3
 , darwin, cargo, cmake, rustc, rustfmt
-, pkg-config, openssl, xz
+, pkg-config, openssl, xz, zlib
 , libiconv
 , which, libffi
 , withBundledLLVM ? false
@@ -255,7 +255,7 @@ in stdenv.mkDerivation (finalAttrs: {
     ++ optionals fastCross [ lndir makeWrapper ];
 
   buildInputs = [ openssl ]
-    ++ optionals stdenv.isDarwin [ libiconv Security ]
+    ++ optionals stdenv.isDarwin [ libiconv Security zlib ]
     ++ optional (!withBundledLLVM) llvmShared.lib
     ++ optional (useLLVM && !withBundledLLVM) [
       llvmPackages.libunwind

From dc0e4f9ec5f97e9516ec2877929c42c49caffd42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Jul 2024 11:22:24 +0000
Subject: [PATCH 211/342] python312Packages.aioairzone: 0.7.7 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix
index 49684006ca864..5f9c16e8d1106 100644
--- a/pkgs/development/python-modules/aioairzone/default.nix
+++ b/pkgs/development/python-modules/aioairzone/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aioairzone";
-  version = "0.7.7";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = "aioairzone";
     rev = "refs/tags/${version}";
-    hash = "sha256-0YChwHxxINwvhOAmDPn0IUMOItMDDRx6mGbsz6uSIEU=";
+    hash = "sha256-mi8zRnZ9fZEOzX+ZqKsQ+OpvzGRKa4qyInENh+KVoNg=";
   };
 
   nativeBuildInputs = [ setuptools ];

From d3b5c8d43a885648d536c64e17a6c01516899c29 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 7 Aug 2024 20:11:20 +1000
Subject: [PATCH 212/342] python312Packages.aioairzone-cloud: 0.5.5 -> 0.6.1

https://github.com/Noltari/aioairzone-cloud/releases/tag/0.6.1
---
 .../development/python-modules/aioairzone-cloud/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix
index 27567cab2e234..56efb548aa096 100644
--- a/pkgs/development/python-modules/aioairzone-cloud/default.nix
+++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "aioairzone-cloud";
-  version = "0.5.5";
+  version = "0.6.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "aioairzone-cloud";
     rev = "refs/tags/${version}";
-    hash = "sha256-8IMEolbeXzqUHo139B9hu4FwelLZ4ENEDLHcaUjU/KE=";
+    hash = "sha256-0aqY8Bg/kDSaNGSQ8hrlUQpfwYM3sVxQHm75/khgRTM=";
   };
 
   build-system = [ setuptools ];

From 004157a551ff248f2d0cfce27279e1e906eaadb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2024 09:46:21 +0000
Subject: [PATCH 213/342] python312Packages.aioautomower: 2024.6.4 -> 2024.7.3

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

diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index 19744f9aa3baa..39fe9d62672b3 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2024.6.4";
+  version = "2024.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     rev = "refs/tags/${version}";
-    hash = "sha256-v+wg/2JRBJ0VgRYOey92WGwVzHmxU9h/ev2oICefaMg=";
+    hash = "sha256-tjdpQglhg78DsmtIHo5QDsP1U8f0fnaasF0IYUtrGh4=";
   };
 
   postPatch = ''

From b57ff914d875c677dfaedeeabe24094a34c92d9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 12:18:54 +0200
Subject: [PATCH 214/342] python312Packages.chacha20poly1305-reuseable: relax
 cryptogrpahy constraint

---
 .../python-modules/chacha20poly1305-reuseable/default.nix       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
index f0acd8ea7dab2..c51f2fe077240 100644
--- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
+++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
@@ -40,6 +40,8 @@ buildPythonPackage {
     setuptools
   ];
 
+  pythonRelaxDeps = [ "cryptography" ];
+
   propagatedBuildInputs = [ cryptography ];
 
   pythonImportsCheck = [ "chacha20poly1305_reuseable" ];

From a0e49d9d2ff843a295f7f47a6e54914c03e68b21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 12:21:41 +0200
Subject: [PATCH 215/342] python312Packages.aioesphomeapi: 24.6.1 -> 25.0.0

https://github.com/esphome/aioesphomeapi/releases/tag/v25.0.0
---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index fa2ee1ee7e464..4dd4377245420 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "24.6.1";
+  version = "25.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wvfAkV+EjGytPog3ik7NAC0rW8nkHufenGfapeQr1X0=";
+    hash = "sha256-XV7hVBtruQxhJ154/hPrsjqxwI9nBfBgvcgGWW6BBKk=";
   };
 
   build-system = [
@@ -43,6 +43,8 @@ buildPythonPackage rec {
     cython
   ];
 
+  pythonRelaxDeps = [ "cryptography" ];
+
   dependencies = [
     aiohappyeyeballs
     async-interrupt

From ab33b20d07748adb49470583e9fd3d3cf2ddf3bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Jul 2024 01:15:33 +0000
Subject: [PATCH 216/342] python312Packages.aiohomekit: 3.1.5 -> 3.2.1

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

diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index 94bd0c7dcd07e..03b73922d4f5e 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomekit";
-  version = "3.1.5";
+  version = "3.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "Jc2k";
     repo = "aiohomekit";
     rev = "refs/tags/${version}";
-    hash = "sha256-F3PhZsuIgT3x1Y3/kx9juPwN2WKxvdbahrRm+r6ZPps=";
+    hash = "sha256-bv+xt6rp3cs8FhAw8b8Que5ABeD5+7z+LOb5C1PbzXI=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 4e9cb7b071d5abccd1c287a0175e00b24473c5f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 12:24:43 +0200
Subject: [PATCH 217/342] python312Packages.aiolifx-themes: 0.4.27 -> 0.5.1

https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v0.5.1
---
 .../python-modules/aiolifx-themes/default.nix       | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix
index cfad7ea83e964..626ed50579ca7 100644
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/pkgs/development/python-modules/aiolifx-themes/default.nix
@@ -6,13 +6,14 @@
   fetchFromGitHub,
   poetry-core,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "aiolifx-themes";
-  version = "0.4.27";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,16 +22,9 @@ buildPythonPackage rec {
     owner = "Djelibeybi";
     repo = "aiolifx-themes";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5wUyp1g1O0Ar+2sE+/XSi7l9CmvGLgT1b0IWI4bnTbg=";
+    hash = "sha256-mqYFLn+QrFCt8t5XUm0sfJxCRfqC20RFnhdzQMQUXbk=";
   };
 
-  prePatch = ''
-    # Don't run coverage, or depend on typer for no reason.
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=aiolifx_themes --cov-report=term-missing:skip-covered" "" \
-      --replace-fail "typer = " "# unused: typer = "
-  '';
-
   build-system = [ poetry-core ];
 
   dependencies = [ aiolifx ];
@@ -39,6 +33,7 @@ buildPythonPackage rec {
     async-timeout
     pytestCheckHook
     pytest-asyncio
+    pytest-cov-stub
   ];
 
   pythonImportsCheck = [ "aiolifx_themes" ];

From f3785710c87fa72efb5b32ce85e4140bd5c3b315 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 5 Aug 2024 23:33:14 +0200
Subject: [PATCH 218/342] python312Packages.aioqsw: 0.3.5 -> 0.4.0

Diff: https://github.com/Noltari/aioqsw/compare/refs/tags/0.3.5...0.4.0

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

diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix
index 0ec8f1697ca35..04c248cffe891 100644
--- a/pkgs/development/python-modules/aioqsw/default.nix
+++ b/pkgs/development/python-modules/aioqsw/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aioqsw";
-  version = "0.3.5";
+  version = "0.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.11";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-kSwTHwVSMGyXA0SF74f9gyBN82XhdjdN6DWrQV0PiaU=";
+    hash = "sha256-xXbOIG9gw1rO+iWdXNWWmweM83FpTLMuaDTcRZoMvL8=";
   };
 
   nativeBuildInputs = [

From 82b1b33a97d613e26cab9173ca02df7a75f53f61 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 3 Aug 2024 18:39:29 +0200
Subject: [PATCH 219/342] python312Packages.bimmer-connected: 0.15.3 -> 0.16.1

Changelog: https://github.com/bimmerconnected/bimmer_connected/releases/tag/0.16.1
---
 pkgs/development/python-modules/bimmer-connected/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index 2b7f334b989d5..86573d8c19f42 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "bimmer-connected";
-  version = "0.15.3";
+  version = "0.16.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "bimmerconnected";
     repo = "bimmer_connected";
     rev = "refs/tags/${version}";
-    hash = "sha256-0Z7W9Z5zl7N0WbvfOTs8wcloI5VfqrZ+OBWocFAnjwY=";
+    hash = "sha256-rklWek0XDedJXxVlRLLVMOkU0wMOlv8+Uzn8aVAmc2k=";
   };
 
   build-system = [
@@ -66,6 +66,7 @@ buildPythonPackage rec {
 
   preCheck = ''
     export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo
+    export PATH=$out/bin:$PATH
   '';
 
   pythonImportsCheck = [ "bimmer_connected" ];

From 0af9ccec78db5c28d8f1021cf9f24d2896b69658 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 12:30:37 +0200
Subject: [PATCH 220/342] python312Packages.bluetooth-data-tools: 1.19.3 ->
 1.19.4

https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v1.19.4/CHANGELOG.md
---
 .../bluetooth-data-tools/default.nix            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
index 9b10c329ce153..12b9d8f048c87 100644
--- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix
+++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
@@ -5,6 +5,8 @@
   cryptography,
   cython,
   poetry-core,
+  pytest-benchmark,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -12,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "bluetooth-data-tools";
-  version = "1.19.3";
+  version = "1.19.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ofcGdHHd1P+R9ykJGtwHURTzHCeiJ603EqtgUgLPnmM=";
+    hash = "sha256-VoldKrlD/1Crw0tJcHoMGiLR8uTUI25IlwZ/1AICx84=";
   };
 
   # The project can build both an optimized cython version and an unoptimized
@@ -36,12 +38,13 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ cryptography ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-benchmark
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --cov=bluetooth_data_tools --cov-report=term-missing:skip-covered" ""
-  '';
+  pytestFlagsArray = [ "--benchmark-disable" ];
 
   pythonImportsCheck = [ "bluetooth_data_tools" ];
 

From 645948e10a12efece4fbc8dc4741bc6ae1d07980 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 12:38:27 +0200
Subject: [PATCH 221/342] python312Packages.deebot-client: 8.2.0 -> 8.3.0

https://github.com/DeebotUniverse/client.py/releases/tag/8.3.0
---
 pkgs/development/python-modules/deebot-client/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index ed70dd98468c4..64b3f1db8ba48 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "deebot-client";
-  version = "8.2.0";
+  version = "8.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "DeebotUniverse";
     repo = "client.py";
     rev = "refs/tags/${version}";
-    hash = "sha256-foIRWZcv+i/UZMMr1LjNiUpvJVD9UOWHPKHpcGHXfxQ=";
+    hash = "sha256-a6gFy+w+5FEs4YwS2Pfcyiv0grLcSzFpxxbcZ0AYIL4=";
   };
 
   build-system = [
@@ -38,6 +38,8 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [ "aiohttp" ];
+
   dependencies = [
     aiohttp
     aiomqtt

From 96e6c810531899bad25357591f33eb375cb19ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 10 Jul 2024 07:46:07 -0700
Subject: [PATCH 222/342] python312Packages.doorbirdpy: 2.2.2 -> 3.0.2

Diff: https://gitlab.com/klikini/doorbirdpy/-/compare/2.2.2...3.0.2

Changelog: https://gitlab.com/klikini/doorbirdpy/-/tags/3.0.0
---
 .../python-modules/doorbirdpy/default.nix     | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix
index b673e19ca4833..6ec81ea67fbe1 100644
--- a/pkgs/development/python-modules/doorbirdpy/default.nix
+++ b/pkgs/development/python-modules/doorbirdpy/default.nix
@@ -2,33 +2,39 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
-  requests,
+  setuptools,
+  aiohttp,
+  aioresponses,
+  pytest-asyncio,
   pytestCheckHook,
-  requests-mock,
 }:
 
 buildPythonPackage rec {
   pname = "doorbirdpy";
-  version = "2.2.2";
-  format = "setuptools";
+  version = "3.0.2";
+  pyproject = true;
 
   src = fetchFromGitLab {
     owner = "klikini";
     repo = "doorbirdpy";
-    rev = version;
-    hash = "sha256-pgL4JegD1gANefp7jLYb74N9wgpkDgQc/Fe+NyLBrkA=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-6B4EMK41vEpmLoQLD+XN9yStLdxyHHk/Mym9J0o7Qvc=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
     pytestCheckHook
-    requests-mock
   ];
 
   pythonImportsCheck = [ "doorbirdpy" ];
 
   meta = with lib; {
+    changelog = "https://gitlab.com/klikini/doorbirdpy/-/tags/${version}";
     description = "Python wrapper for the DoorBird LAN API";
     homepage = "https://gitlab.com/klikini/doorbirdpy";
     license = licenses.mit;

From c5394e00f53c270e0d60a7702c4f7d9a988b941a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 14 Jul 2024 16:07:00 +0200
Subject: [PATCH 223/342] python312Packages.dsmr-parser: 1.4.1 -> 1.4.2

Diff: https://github.com/ndokter/dsmr_parser/compare/refs/tags/v1.4.1...v1.4.2

Changelog: https://github.com/ndokter/dsmr_parser/releases/tag/v1.4.2
---
 .../python-modules/dsmr-parser/default.nix    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix
index 70cc28459df35..81d5e0376b58c 100644
--- a/pkgs/development/python-modules/dsmr-parser/default.nix
+++ b/pkgs/development/python-modules/dsmr-parser/default.nix
@@ -4,18 +4,19 @@
   dlms-cosem,
   fetchFromGitHub,
   pyserial,
-  pyserial-asyncio,
+  pyserial-asyncio-fast,
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
   pytz,
+  setuptools,
   tailer,
 }:
 
 buildPythonPackage rec {
   pname = "dsmr-parser";
-  version = "1.4.1";
-  format = "setuptools";
+  version = "1.4.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -23,13 +24,17 @@ buildPythonPackage rec {
     owner = "ndokter";
     repo = "dsmr_parser";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lP4KU3k7dGYHv24uNffTNe60u11Xg7YG05F/joVZu/Q=";
+    hash = "sha256-NfleByW9MF7FS4n/cMv297382LucP6Z629CuA6chm20=";
   };
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [ "dlms-cosem" ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     dlms-cosem
     pyserial
-    pyserial-asyncio
+    pyserial-asyncio-fast
     pytz
     tailer
   ];
@@ -42,10 +47,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python module to parse Dutch Smart Meter Requirements (DSMR)";
-    mainProgram = "dsmr_console";
     homepage = "https://github.com/ndokter/dsmr_parser";
     changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
+    mainProgram = "dsmr_console";
   };
 }

From 5256f72f25c030bed90186b7c4ee4c8d2fcf96b4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 12:42:10 +0200
Subject: [PATCH 224/342] python312Packages.hassil: 1.7.1 -> 1.7.4

https://github.com/home-assistant/hassil/blob/1.7.4/CHANGELOG.md
---
 pkgs/development/python-modules/hassil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix
index 42c46fc3383a5..30b18f8303663 100644
--- a/pkgs/development/python-modules/hassil/default.nix
+++ b/pkgs/development/python-modules/hassil/default.nix
@@ -17,7 +17,7 @@
 
 let
   pname = "hassil";
-  version = "1.7.1";
+  version = "1.7.4";
 in
 buildPythonPackage {
   inherit pname version;
@@ -29,7 +29,7 @@ buildPythonPackage {
     owner = "home-assistant";
     repo = "hassil";
     rev = "refs/tags/${version}";
-    hash = "sha256-yrjzsJzyUFqTauEcNEOCQx2YxomkNS4J0JfQEQQ5m3E=";
+    hash = "sha256-FRP5iVE2KBiHVriWhnYxWFff0y4q2/gC9iO8ZzN3AbI=";
   };
 
   build-system = [ setuptools ];
@@ -42,7 +42,7 @@ buildPythonPackage {
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
-    changelog = "https://github.com/home-assistant/hassil/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/home-assistant/hassil/blob/${version}/CHANGELOG.md";
     description = "Intent parsing for Home Assistant";
     mainProgram = "hassil";
     homepage = "https://github.com/home-assistant/hassil";

From 68cfd3bbe47ce808ac1f68b88f7d5178ccedd1b2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:07:12 +0200
Subject: [PATCH 225/342] home-assistant-intents: 2024.7.10 -> 2024.7.29

https://github.com/home-assistant/intents/releases/tag/2024.7.29
https://github.com/home-assistant/intents/releases/tag/2024.8.7
---
 pkgs/servers/home-assistant/intents.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix
index 38d237a704404..87cc658d2a475 100644
--- a/pkgs/servers/home-assistant/intents.nix
+++ b/pkgs/servers/home-assistant/intents.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-intents";
-  version = "2024.7.3";
+  version = "2024.8.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,8 +30,8 @@ buildPythonPackage rec {
     owner = "home-assistant";
     repo = "intents-package";
     rev = "refs/tags/${version}";
-    hash = "sha256-3JnBmSNa9Yrh+5QFQ6KIKZProxMuX+CyTZzqRUAlBcQ=";
     fetchSubmodules = true;
+    hash = "sha256-s6cw9Ni4NFNNLu7s8YaHk6MeKlss60GgxdwcUVA1djo=";
   };
 
   build-system = [

From 8c44163621eb8c8b454d0b23c663166be96e45e1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:09:35 +0200
Subject: [PATCH 226/342] python312Packages.knx-frontend: 2024.7.25.204106 ->
 2024.8.6.211307

https://github.com/XKNX/knx-frontend/releases/tag/2024.8.6.211307
---
 pkgs/development/python-modules/knx-frontend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index 2ef44b3cfcfb9..c25a3d2aad6df 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2024.7.25.204106";
+  version = "2024.8.6.211307";
   format = "pyproject";
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-uy5by/abVeYTLpZM4fh1+3AUxhnkFtzcabf86LnC9SY=";
+    hash = "sha256-WHZW3EXsLrbQZgmDRJK0yFUPgY2B9UgNfvenXHh2z9g=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 1b9248fb525a267473bff4a774fabe3b16e448cb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:12:23 +0200
Subject: [PATCH 227/342] python312Packages.laundrify-aio: 1.2.1 -> 1.2.2

---
 .../python-modules/laundrify-aio/default.nix        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/laundrify-aio/default.nix b/pkgs/development/python-modules/laundrify-aio/default.nix
index a34e6a533fd37..e6ccf3531af22 100644
--- a/pkgs/development/python-modules/laundrify-aio/default.nix
+++ b/pkgs/development/python-modules/laundrify-aio/default.nix
@@ -3,25 +3,28 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  setuptools,
   aiohttp,
   pyjwt,
 }:
 
 buildPythonPackage rec {
   pname = "laundrify-aio";
-  version = "1.2.1";
-  format = "setuptools";
+  version = "1.2.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "laundrify";
     repo = "laundrify-pypi";
-    rev = "v${version}";
-    hash = "sha256-XhdIKitUyC5RWW/o98ZyhG7BuVCINsiNWlh3liITKCs=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-iFQ0396BkGWM7Ma/I0gbXucd2/yPmEVF4IC3/bMK2SA=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     pyjwt
   ];

From b670725df91b3a609f891b1842652d9660509854 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 23:43:32 +0000
Subject: [PATCH 228/342] python312Packages.nettigo-air-monitor: 3.2.0 -> 3.3.0

---
 .../python-modules/nettigo-air-monitor/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
index 11c6592526cc1..347f256921dd4 100644
--- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix
+++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "nettigo-air-monitor";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "bieniu";
     repo = "nettigo-air-monitor";
     rev = "refs/tags/${version}";
-    hash = "sha256-2INL6ZXi7f4HD0ilhQLSivk8TfYh3qRSPRsCCtCLAP8=";
+    hash = "sha256-u4BfmdSP7UbwuS04MzsKRTWIsztBoNawcLXwhy4P4YA=";
   };
 
   build-system = [ setuptools ];

From 8e7f693f681d5a7799381eca66d162bace9a0a23 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:13:28 +0200
Subject: [PATCH 229/342] python312Packages.pydaikin: 2.13.0 -> 2.13.1

https://github.com/fredrike/pydaikin/releases/tag/v2.13.1
---
 pkgs/development/python-modules/pydaikin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix
index 4693e97e76271..407bc398f9b6e 100644
--- a/pkgs/development/python-modules/pydaikin/default.nix
+++ b/pkgs/development/python-modules/pydaikin/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pydaikin";
-  version = "2.13.0";
+  version = "2.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "fredrike";
     repo = "pydaikin";
     rev = "refs/tags/v${version}";
-    hash = "sha256-t4SyFAgrLpXlDx464OHBWT8b+vGfIGZH6lKjX0k6tNw=";
+    hash = "sha256-UOHNMYcgf8NYwbmr+YcCKZvcrXnz38VKxLAYnpoKiVo=";
   };
 
   build-system = [ setuptools ];

From d65319e64ed989e587f8efa9b49f4e04560c8f26 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:14:59 +0200
Subject: [PATCH 230/342] python312Packages.pyhomeworks: 0.0.6 -> 1.1.0

---
 .../python-modules/pyhomeworks/default.nix         | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyhomeworks/default.nix b/pkgs/development/python-modules/pyhomeworks/default.nix
index 13aad86b21212..5cb1d95c26d19 100644
--- a/pkgs/development/python-modules/pyhomeworks/default.nix
+++ b/pkgs/development/python-modules/pyhomeworks/default.nix
@@ -3,20 +3,28 @@
   buildPythonPackage,
   fetchPypi,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyhomeworks";
-  version = "0.0.6";
-  format = "setuptools";
+  version = "1.1.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "Eqbm8274B2hBuF+mREe8lqGhpzZExPJ29jzvwB5RNR8=";
+    hash = "sha256-9S0SYn4e/qaCRgdwlU4gPaj0eKAQJrYigvAP6eaPzRM=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools~=69.2.0" "setuptools"
+  '';
+
+  build-system = [ setuptools ];
+
   # Project has no real tests
   doCheck = false;
 

From 193a32d75decd5303010b4a461bf0880c28e7e8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jul 2024 08:35:13 +0000
Subject: [PATCH 231/342] python312Packages.pylutron: 0.2.13 -> 0.2.15

https://github.com/thecynic/pylutron/releases/tag/0.2.14
https://github.com/thecynic/pylutron/releases/tag/0.2.15
---
 pkgs/development/python-modules/pylutron/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix
index 5bbc8577b89aa..f051004a490cb 100644
--- a/pkgs/development/python-modules/pylutron/default.nix
+++ b/pkgs/development/python-modules/pylutron/default.nix
@@ -29,7 +29,10 @@ buildPythonPackage rec {
     description = "Python library for controlling a Lutron RadioRA 2 system";
     homepage = "https://github.com/thecynic/pylutron";
     changelog = "https://github.com/thecynic/pylutron/releases/tag/${version}";
-    license = with licenses; [ mit ];
+    license = with licenses; [
+      mit
+      psfl
+    ];
     maintainers = with maintainers; [ fab ];
   };
 }

From 074f0675b7376c01038ef415b310d05bcddda4fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:20:38 +0200
Subject: [PATCH 232/342] python312Packages.pynx584: 0.8.1. -> 0.8.2

---
 .../python-modules/pynx584/default.nix         | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix
index 49aaf6eabcb22..7597984397678 100644
--- a/pkgs/development/python-modules/pynx584/default.nix
+++ b/pkgs/development/python-modules/pynx584/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   flask,
   mock,
   prettytable,
@@ -12,20 +13,23 @@
   stevedore,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pynx584";
-  version = "0.8.1";
-  format = "setuptools";
+  version = "0.8.2";
+  pyproject = true;
+
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "kk7ds";
-    repo = pname;
-    rev = version;
-    hash = "sha256-nF8+LbKqy/GrnPpykS5wEQMPoFYxi40pfM3Ys/UXCeo=";
+    repo = "pynx584";
+    rev = "refs/tags/0.8.2";
+    hash = "sha256-q5ra7tH4kaBrw0VAiyMsmWOkVhA7Y6bRuFP8dlxQjsE=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     flask
     prettytable
     pyserial

From 18d48e5337836800df55c06d59eec7e01a04c828 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 7 Aug 2024 21:22:21 +1000
Subject: [PATCH 233/342] python312Packages.python-homewizard-energy: 6.0.0 ->
 6.1.1 (#329164)

https://github.com/homewizard/python-homewizard-energy/releases/tag/v6.1.0
https://github.com/homewizard/python-homewizard-energy/releases/tag/v6.1.1
---
 .../python-modules/python-homewizard-energy/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix
index a25cae986a2da..885f58a598772 100644
--- a/pkgs/development/python-modules/python-homewizard-energy/default.nix
+++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "python-homewizard-energy";
-  version = "6.0.0";
+  version = "6.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "DCSBL";
     repo = "python-homewizard-energy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tOoNC9MysL5PcIa1N/GjzNy+4+ovZGQznYYDt1o6f4c=";
+    hash = "sha256-DIDHUyos2XScoYZfI3o33UN2R0J/Xc2/JQvtzCXZTts=";
   };
 
   postPatch = ''

From 0dd748029071a69fc8139c3f0e63f4033da0e1e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 18 Jul 2024 15:39:47 +0200
Subject: [PATCH 234/342] python312Packages.python-matter-server: 6.2.2 ->
 6.3.0

https://github.com/home-assistant-libs/python-matter-server/releases/tag/6.3.0
---
 .../python-modules/python-matter-server/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix
index 288f7a934a57d..453bf9b8b7c28 100644
--- a/pkgs/development/python-modules/python-matter-server/default.nix
+++ b/pkgs/development/python-modules/python-matter-server/default.nix
@@ -55,7 +55,7 @@ in
 
 buildPythonPackage rec {
   pname = "python-matter-server";
-  version = "6.2.2";
+  version = "6.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -64,7 +64,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "python-matter-server";
     rev = "refs/tags/${version}";
-    hash = "sha256-20heZrdSuKfiRuKKnDyguSC5bbV/9qBcu6E/5vcV1iU=";
+    hash = "sha256-/e7U0knkWQq9PnTimA2/ncNTyekx7QOcFEdtJHUcb9I=";
   };
 
   patches = [

From 8f2d5fe35a5a7e3a360756bbd3be87190df53ccf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:24:29 +0200
Subject: [PATCH 235/342] python312Packages.pytrafikverket: 0.3.10 -> 1.0.0

https://github.com/gjohansson-ST/pytrafikverket/releases/tag/v1.0.0
---
 .../python-modules/pytrafikverket/default.nix    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix
index ed187fc619fe8..0af8bb7f59a40 100644
--- a/pkgs/development/python-modules/pytrafikverket/default.nix
+++ b/pkgs/development/python-modules/pytrafikverket/default.nix
@@ -3,27 +3,29 @@
   buildPythonPackage,
   fetchPypi,
   aiohttp,
+  aiozoneinfo,
   lxml,
   pythonOlder,
-  setuptools,
+  poetry-core,
 }:
 
 buildPythonPackage rec {
   pname = "pytrafikverket";
-  version = "0.3.10";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-B3K9wDFj7uSgs6BsJUnD6r2JVcH7u7UrbVXUTMGqmQE=";
+    hash = "sha256-qvJbAE5C19RSg5p823sCJ/dWIHBSD4kJrw/p8PF2HkI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
+    aiozoneinfo
     lxml
   ];
 
@@ -34,8 +36,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Library to get data from the Swedish Transport Administration (Trafikverket) API";
-    homepage = "https://github.com/endor-force/pytrafikverket";
-    changelog = "https://github.com/endor-force/pytrafikverket/releases/tag/${version}";
+    homepage = "https://github.com/gjohansson-ST/pytrafikverket";
+    changelog = "https://github.com/gjohansson-ST/pytrafikverket/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From c60fc2bd34aec5871d9a42d660786640c4f9bc8f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 4 Aug 2024 22:03:41 +0200
Subject: [PATCH 236/342] python312Packages.pytrydan: 0.7.0 -> 0.8.1

Diff: https://github.com/dgomes/pytrydan/compare/refs/tags/v0.7.0...v0.8.1

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

diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix
index 87cac954c486a..f854448f6ae36 100644
--- a/pkgs/development/python-modules/pytrydan/default.nix
+++ b/pkgs/development/python-modules/pytrydan/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pytrydan";
-  version = "0.7.0";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "dgomes";
     repo = "pytrydan";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9TZZ4J3fIUGaeWYd5kP9eFABvL/95muD7sDevUaGprQ=";
+    hash = "sha256-OHC+Ul64BYCsgoFDxI1hPjBGkd/pQ0j0c9Pt5lWg1E0=";
   };
 
   postPatch = ''

From 9a620de745c014b3666ad32b59ed867758995225 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 4 Jul 2024 22:49:47 +0200
Subject: [PATCH 237/342] python312Packages.pyvesync: 2.1.10 -> 2.1.12

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

diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix
index 02ebd91c037eb..d8f370167ba2e 100644
--- a/pkgs/development/python-modules/pyvesync/default.nix
+++ b/pkgs/development/python-modules/pyvesync/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyvesync";
-  version = "2.1.10";
+  version = "2.1.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ddtTtTAUpvS8DN1vKVN+CjnmYp20xyxHydwOaDRjWzo=";
+    hash = "sha256-k9eAbHFFo5rFYTNVxN4qEFnW2zmXThr3Ki1lZtj9V/g=";
   };
 
   propagatedBuildInputs = [ requests ];

From 48d585da439bc6787ace7debb2e43d64ec88bc5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 18 Jul 2024 03:07:56 -0700
Subject: [PATCH 238/342] python312Packages.systembridgemodels: 4.0.4 -> 4.1.0

Diff: https://github.com/timmo001/system-bridge-models/compare/refs/tags/4.0.4...4.1.0

Changelog: https://github.com/timmo001/system-bridge-models/releases/tag/4.1.0
---
 .../python-modules/systembridgemodels/default.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix
index a1a2233cd4c45..4c6b74a4a62b9 100644
--- a/pkgs/development/python-modules/systembridgemodels/default.nix
+++ b/pkgs/development/python-modules/systembridgemodels/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "systembridgemodels";
-  version = "4.0.4";
+  version = "4.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -19,17 +19,17 @@ buildPythonPackage rec {
     owner = "timmo001";
     repo = "system-bridge-models";
     rev = "refs/tags/${version}";
-    hash = "sha256-iFJ95ouhfbaC0D2Gkc1KO+JueYTFTOj1unnYSDyPAe8=";
+    hash = "sha256-wyTlkbrf9H1mdVyZP234nVDuls/QrFXcv3pXhztp9+A=";
   };
 
   postPatch = ''
     substituteInPlace systembridgemodels/_version.py \
-      --replace-fail ", dev=1" ""
+      --replace-fail ", dev=0" ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ incremental ];
+  dependencies = [ incremental ];
 
   pythonImportsCheck = [ "systembridgemodels" ];
 

From 8311043f480c044009620f3ef7d195b23d8781f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 18 Jul 2024 03:10:43 -0700
Subject: [PATCH 239/342] python312Packages.systembridgeconnector: 4.0.4 ->
 4.1.2

Diff: https://github.com/timmo001/system-bridge-connector/compare/refs/tags/4.0.4...4.1.2

Changelog: https://github.com/timmo001/system-bridge-connector/releases/tag/4.1.2
---
 .../systembridgeconnector/default.nix         | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix
index d75f815cb0ad9..1841c4ee733b7 100644
--- a/pkgs/development/python-modules/systembridgeconnector/default.nix
+++ b/pkgs/development/python-modules/systembridgeconnector/default.nix
@@ -3,19 +3,20 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   setuptools,
   aiohttp,
   incremental,
+  packaging,
   systembridgemodels,
   pytest-aiohttp,
   pytest-socket,
   pytestCheckHook,
+  syrupy,
 }:
 
 buildPythonPackage rec {
   pname = "systembridgeconnector";
-  version = "4.0.4";
+  version = "4.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,26 +25,20 @@ buildPythonPackage rec {
     owner = "timmo001";
     repo = "system-bridge-connector";
     rev = "refs/tags/${version}";
-    hash = "sha256-Guh9qbRLp+b2SuFgBx7jf16vRShuHJBi3WOVn9Akce8=";
+    hash = "sha256-uqE/KJnuNii2b3geB9jp8IxaeceuZVXdol7s3hP6z/Q=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/timmo001/system-bridge-connector/commit/25aa172775ee983dc4a29b8dda880aefbad70040.patch";
-      hash = "sha256-PedW1S1gZmWkS4sJBqSAx3aoA1KppYS5Xlhoaxqkcd4=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace systembridgeconnector/_version.py \
       --replace-fail ", dev=0" ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     incremental
+    packaging
     systembridgemodels
   ];
 
@@ -53,11 +48,7 @@ buildPythonPackage rec {
     pytest-aiohttp
     pytest-socket
     pytestCheckHook
-  ];
-
-  disabledTests = [
-    # ConnectionClosedException: Connection closed to server
-    "test_get_files"
+    syrupy
   ];
 
   meta = {

From e86826dd26c4844642f5bf2b5a3b4522e1e10bab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:30:30 +0200
Subject: [PATCH 240/342] python312Packages.wled: 0.18.0 -> 0.20.1

https://github.com/frenck/python-wled/releases/tag/v0.20.1
---
 pkgs/development/python-modules/wled/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix
index 0836376c679da..da752e20e3699 100644
--- a/pkgs/development/python-modules/wled/default.nix
+++ b/pkgs/development/python-modules/wled/default.nix
@@ -7,6 +7,8 @@
   buildPythonPackage,
   cachetools,
   fetchFromGitHub,
+  mashumaro,
+  orjson,
   poetry-core,
   pytest-asyncio,
   pytest-xdist,
@@ -19,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "wled";
-  version = "0.18.0";
+  version = "0.20.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +30,7 @@ buildPythonPackage rec {
     owner = "frenck";
     repo = "python-wled";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0BJgbyDhCPFlHxlEry7Rh/j0nv3D3kRhIqCSW+Irhqk=";
+    hash = "sha256-n/Ot08x7G4ApHv0BUW106iubXmXeOqDQp7J8Bstgpc4=";
   };
 
   postPatch = ''
@@ -45,6 +47,8 @@ buildPythonPackage rec {
     awesomeversion
     backoff
     cachetools
+    mashumaro
+    orjson
     yarl
   ];
 

From 5fff8a32616a99a5054f6b98317eb14b16f0e8c9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 13:31:35 +0200
Subject: [PATCH 241/342] python312Packages.xknx: 2.12.2 -> 3.0.0

https://github.com/XKNX/xknx/releases/tag/3.0.0
---
 pkgs/development/python-modules/xknx/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 6d9a4004da3e6..f15ebd0f9166c 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   cryptography,
   ifaddr,
+  freezegun,
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
@@ -13,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "xknx";
-  version = "2.12.2";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +23,7 @@ buildPythonPackage rec {
     owner = "XKNX";
     repo = "xknx";
     rev = "refs/tags/${version}";
-    hash = "sha256-gajxXIR3lmHsW7258v4z20RilzGfm5KGVrXZwRm74Mk=";
+    hash = "sha256-QEv8HMK35vr3ozfHu2pUnmgqQ73vLnXzobQNhwRtlsI=";
   };
 
   build-system = [ setuptools ];
@@ -33,6 +34,7 @@ buildPythonPackage rec {
   ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   nativeCheckInputs = [
+    freezegun
     pytest-asyncio
     pytestCheckHook
   ];

From 6e157ce5208f9ebd22f93eaf785d65364c70d50d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 22:15:55 +0200
Subject: [PATCH 242/342] python312Packages.awesomeversion: 24.2.0 -> 24.6.0

https://github.com/ludeeus/awesomeversion/releases/tag/24.6.0
---
 pkgs/development/python-modules/awesomeversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix
index 9ffea48aa93e3..f3bdfdfd22011 100644
--- a/pkgs/development/python-modules/awesomeversion/default.nix
+++ b/pkgs/development/python-modules/awesomeversion/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "awesomeversion";
-  version = "24.2.0";
+  version = "24.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "ludeeus";
     repo = "awesomeversion";
     rev = "refs/tags/${version}";
-    hash = "sha256-bpLtHhpWc1VweVl5G8mM473Js3bXT11N3Zc0jiVqq5c=";
+    hash = "sha256-lpG42Be0MVinWX5MyDvBPdoZFx66l6tpUxpAJRqEf88=";
   };
 
   postPatch = ''

From 38c62ee3d7c2ece7b3e852eabb1a451aeffa05c9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 22:17:24 +0200
Subject: [PATCH 243/342] python312Packages.ulid-transform: 0.9.0 -> 0.13.1

https://github.com/bdraco/ulid-transform/releases/tag/v0.10.0
https://github.com/bdraco/ulid-transform/releases/tag/v0.10.1
https://github.com/bdraco/ulid-transform/releases/tag/v0.10.2
https://github.com/bdraco/ulid-transform/releases/tag/v0.11.0
https://github.com/bdraco/ulid-transform/releases/tag/v0.11.1
https://github.com/bdraco/ulid-transform/releases/tag/v0.12.0
https://github.com/bdraco/ulid-transform/releases/tag/v0.13.0
https://github.com/bdraco/ulid-transform/releases/tag/v0.13.1
---
 .../python-modules/ulid-transform/default.nix   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix
index 0f7ae6d0b42cd..1ddfe0e5a5ba9 100644
--- a/pkgs/development/python-modules/ulid-transform/default.nix
+++ b/pkgs/development/python-modules/ulid-transform/default.nix
@@ -4,6 +4,8 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
+  pytest-benchmark,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -11,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "ulid-transform";
-  version = "0.9.0";
+  version = "0.13.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -20,7 +22,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-r9uxPXpmQSsL1rX4d9TH87olFbZugdGdNG++Ygjie1I=";
+    hash = "sha256-tOtOTFKBVQmCm02k9Q8r+EgF39iN+XNXCnlw2ppYM58=";
   };
 
   nativeBuildInputs = [
@@ -29,12 +31,13 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-benchmark
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --cov=ulid_transform --cov-report=term-missing:skip-covered" ""
-  '';
+  pytestFlagsArray = [ "--benchmark-disable" ];
 
   pythonImportsCheck = [ "ulid_transform" ];
 

From 85df3d93fcc208bb35b1c81c91cabcb90f98b8be Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 22:19:59 +0200
Subject: [PATCH 244/342] python312Packages.voluptuous: 0.15.1 -> 0.15.2

https://github.com/alecthomas/voluptuous/blob/0.15.2/CHANGELOG.md
---
 pkgs/development/python-modules/voluptuous/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix
index d18445dd2058a..75293125764f2 100644
--- a/pkgs/development/python-modules/voluptuous/default.nix
+++ b/pkgs/development/python-modules/voluptuous/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "voluptuous";
-  version = "0.15.1";
+  version = "0.15.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "alecthomas";
     repo = "voluptuous";
     rev = "refs/tags/${version}";
-    hash = "sha256-BM83pwgxQRCCzaGJKHGfQzDbQj/27nWes4I8Bym1nUc=";
+    hash = "sha256-TGTdYme3ZRM51YFNX/ESFc6+3QpeO/gAXYW6MT73/Ss=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 72713a60b78f497d8ee72c3c005ace81aa80585c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 30 Jul 2024 12:54:18 +0200
Subject: [PATCH 245/342] python312Packages.voluptuous-openapi: 0.0.4 -> 0.0.5

https://github.com/home-assistant-libs/voluptuous-openapi/releases/tag/v0.0.5
---
 .../python-modules/voluptuous-openapi/default.nix    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/voluptuous-openapi/default.nix b/pkgs/development/python-modules/voluptuous-openapi/default.nix
index a1f75cb60b01a..43a38fa5d3b66 100644
--- a/pkgs/development/python-modules/voluptuous-openapi/default.nix
+++ b/pkgs/development/python-modules/voluptuous-openapi/default.nix
@@ -15,15 +15,14 @@
 
 buildPythonPackage rec {
   pname = "voluptuous-openapi";
-  version = "0.0.4";
+  version = "0.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "Shulyaka";
+    owner = "home-assistant-libs";
     repo = "voluptuous-openapi";
-    # TODO: https://github.com/Shulyaka/voluptuous-openapi/commit/155f2dd6d55998c41aaafe0aa8a980f78f9e478b#commitcomment-142845137
-    rev = "155f2dd6d55998c41aaafe0aa8a980f78f9e478b";
-    hash = "sha256-ciAaWTltPKT9NzfxWoX6gk1gSMszQjVVimfn/0D+mfg=";
+    rev = "v${version}";
+    hash = "sha256-QZi2uxFrYMSJVKIHTRBlGAM1sCD6oIzsZNQH7zkXL8w=";
   };
 
   build-system = [ setuptools ];
@@ -35,8 +34,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "voluptuous_openapi" ];
 
   meta = with lib; {
+    changelog = "https://github.com/home-assistant-libs/voluptuous-openapi/releases/tag/${src.rev}";
     description = "Convert voluptuous schemas to OpenAPI Schema object";
-    homepage = "https://github.com/Shulyaka/voluptuous-openapi";
+    homepage = "https://github.com/home-assistant-libs/voluptuous-openapi";
     license = licenses.asl20;
     maintainers = with maintainers; [ hexa ];
   };

From 1c299b4e8c9c54263dd9194ff2c040f10c9c3c19 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Aug 2024 23:29:30 +0200
Subject: [PATCH 246/342] python312Packages.pymicro-vad: init 1.0.1

Self-contained voice activity detector.
---
 .../python-modules/pymicro-vad/default.nix    | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymicro-vad/default.nix

diff --git a/pkgs/development/python-modules/pymicro-vad/default.nix b/pkgs/development/python-modules/pymicro-vad/default.nix
new file mode 100644
index 0000000000000..00c2d546fedce
--- /dev/null
+++ b/pkgs/development/python-modules/pymicro-vad/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  pybind11,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pymicro-vad";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rhasspy";
+    repo = "pymicro-vad";
+    rev = "refs/tags/${version}";
+    hash = "sha256-wpsUy+f4eSGlq6L2FOtnA0qJgMh5ZdfiH31aaU61cVw=";
+  };
+
+  build-system = [
+    pybind11
+    setuptools
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "pymicro_vad" ];
+
+  meta = with lib; {
+    changelog = "https://github.com/rhasspy/pymicro-vad/releases/tag/${version}";
+    description = "Self-contained voice activity detector";
+    homepage = "https://github.com/rhasspy/pymicro-vad";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2db166c95e910..31a7f411148db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11748,6 +11748,8 @@ self: super: with self; {
 
   pymetno = callPackage ../development/python-modules/pymetno { };
 
+  pymicro-vad = callPackage ../development/python-modules/pymicro-vad { };
+
   pymicrobot = callPackage ../development/python-modules/pymicrobot { };
 
   pymiele = callPackage ../development/python-modules/pymiele { };

From 2d04810ae3fa78a9b09b6a9905a327c054760e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 10:49:25 -0700
Subject: [PATCH 247/342] python312Packages.pynecil: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/pynecil/default.nix b/pkgs/development/python-modules/pynecil/default.nix
new file mode 100644
index 0000000000000..2066dc3ec02b6
--- /dev/null
+++ b/pkgs/development/python-modules/pynecil/default.nix
@@ -0,0 +1,47 @@
+{
+  bleak,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatch-regex-commit,
+  hatchling,
+  lib,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pynecil";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tr4nt0r";
+    repo = "pynecil";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-57TPgEC7NY75iVj31tdpCOrXUOcsFBy/4XltEHxlNFk=";
+  };
+
+  build-system = [
+    hatch-regex-commit
+    hatchling
+  ];
+
+  dependencies = [ bleak ];
+
+  pythonImportsCheck = [ "pynecil" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/tr4nt0r/pynecil/releases/tag/v${version}";
+    description = "Python library to communicate with Pinecil V2 soldering irons via Bluetooth";
+    homepage = "https://github.com/tr4nt0r/pynecil";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31a7f411148db..9b03a48fff1d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11826,6 +11826,8 @@ self: super: with self; {
     inherit (pkgs) which;
   };
 
+  pynecil = callPackage ../development/python-modules/pynecil { };
+
   pynello = callPackage ../development/python-modules/pynello { };
 
   pynest2d = callPackage ../development/python-modules/pynest2d { };

From 378299f21c4efc60e6270cc20e3c4b4c6ac4a775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 10:56:57 -0700
Subject: [PATCH 248/342] python312Packages.israel-rail-api: init at 0.1.2

---
 .../israel-rail-api/default.nix               | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/israel-rail-api/default.nix

diff --git a/pkgs/development/python-modules/israel-rail-api/default.nix b/pkgs/development/python-modules/israel-rail-api/default.nix
new file mode 100644
index 0000000000000..b90306fa07e87
--- /dev/null
+++ b/pkgs/development/python-modules/israel-rail-api/default.nix
@@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  pytz,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "israel-rail-api";
+  version = "0.1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sh0oki";
+    repo = "israel-rail-api";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-OiWK3gi7dQ7SF4fvusKtSFzdhrsvePlscX0EYQ/hlYk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pytz
+    requests
+  ];
+
+  pythonImportsCheck = [ "israelrailapi" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    changelog = "https://github.com/sh0oki/israel-rail-api/releases/tag/v${version}";
+    description = "Python wrapping of the Israeli Rail API";
+    homepage = "https://github.com/sh0oki/israel-rail-api";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9b03a48fff1d3..d424dd6e8d913 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6142,6 +6142,8 @@ self: super: with self; {
 
   isoweek = callPackage ../development/python-modules/isoweek { };
 
+  israel-rail-api = callPackage ../development/python-modules/israel-rail-api { };
+
   itanium-demangler = callPackage ../development/python-modules/itanium-demangler { };
 
   item-synchronizer = callPackage ../development/python-modules/item-synchronizer { };

From e54aee570053619f089237839cb109f1607760cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 11:08:06 -0700
Subject: [PATCH 249/342] python312Packages.pyseventeentrack: init at 1.0.0

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

diff --git a/pkgs/development/python-modules/pyseventeentrack/default.nix b/pkgs/development/python-modules/pyseventeentrack/default.nix
new file mode 100644
index 0000000000000..8433e5590eea0
--- /dev/null
+++ b/pkgs/development/python-modules/pyseventeentrack/default.nix
@@ -0,0 +1,57 @@
+{
+  aiohttp,
+  aresponses,
+  attrs,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch2,
+  lib,
+  poetry-core,
+  pytestCheckHook,
+  pytz,
+}:
+
+buildPythonPackage rec {
+  pname = "pyseventeentrack";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "shaiu";
+    repo = "pyseventeentrack";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-J5pYtJrEvShRXE/NwbYdmcUhCc5dmDZmJWS550NvRD0=";
+  };
+
+  patches = [
+    # https://github.com/shaiu/pyseventeentrack/pull/4
+    (fetchpatch2 {
+      name = "use-poetry-core.patch";
+      url = "https://github.com/shaiu/pyseventeentrack/commit/6feef4fb29544933836de0a9c06bf85e5105c8bf.patch";
+      hash = "sha256-l6lHWRAoRhYouNT43nb7fYA4RMsmC6rCJOKYTJN8vAU=";
+    })
+  ];
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+    attrs
+    pytz
+  ];
+
+  pythonImportsCheck = [ "pyseventeentrack" ];
+
+  nativeCheckInputs = [
+    aresponses
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/shaiu/pyseventeentrack/releases/tag/v${version}";
+    description = "Simple Python API for 17track.net";
+    homepage = "https://github.com/shaiu/pyseventeentrack";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d424dd6e8d913..673d67b142aac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12209,6 +12209,8 @@ self: super: with self; {
 
   pyserial = callPackage ../development/python-modules/pyserial { };
 
+  pyseventeentrack = callPackage ../development/python-modules/pyseventeentrack { };
+
   pysftp = callPackage ../development/python-modules/pysftp { };
 
   pyshp = callPackage ../development/python-modules/pyshp { };

From 44e19a2f92944bcc403a923b30fbd537b20e8c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 30 Jul 2024 09:32:24 -0700
Subject: [PATCH 250/342] python312Packages.pycountry-convert: init at 0.7.2

---
 .../pycountry-convert/default.nix             | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycountry-convert/default.nix

diff --git a/pkgs/development/python-modules/pycountry-convert/default.nix b/pkgs/development/python-modules/pycountry-convert/default.nix
new file mode 100644
index 0000000000000..7dda05c909ad9
--- /dev/null
+++ b/pkgs/development/python-modules/pycountry-convert/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  pycountry,
+  repoze-lru,
+}:
+
+buildPythonPackage rec {
+  pname = "pycountry-convert";
+  version = "0.7.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-CV0xD3Rr8qXvcTs6gu6iiicmIoYiN2Wx576KXE+n6bk=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "pytest-runner" ""
+  '';
+
+  build-system = [ setuptools ];
+
+  pythonRemoveDeps = [
+    "pprintpp"
+    "pytest"
+    "pytest-cov"
+    "repoze-lru"
+    "pytest-mock"
+  ];
+
+  propagatedBuildInputs = [
+    pycountry
+    repoze-lru
+  ];
+
+  pythonImportsCheck = [ "pycountry_convert" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Python conversion functions between ISO country codes, countries, and continents";
+    homepage = "https://github.com/jefftune/pycountry-convert";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 673d67b142aac..189b52c8c6f4c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11148,6 +11148,8 @@ self: super: with self; {
 
   pycountry = callPackage ../development/python-modules/pycountry { };
 
+  pycountry-convert = callPackage ../development/python-modules/pycountry-convert { };
+
   pycparser = callPackage ../development/python-modules/pycparser { };
 
   py-canary = callPackage ../development/python-modules/py-canary { };

From 81d2ab48b2b8c43b522f2758d996ebfee69652bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 30 Jul 2024 09:41:17 -0700
Subject: [PATCH 251/342] python312Packages.sleekxmppfs: init at 1.4.1

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

diff --git a/pkgs/development/python-modules/sleekxmppfs/default.nix b/pkgs/development/python-modules/sleekxmppfs/default.nix
new file mode 100644
index 0000000000000..d24fe4b40d272
--- /dev/null
+++ b/pkgs/development/python-modules/sleekxmppfs/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  dnspython,
+  pyasn1,
+  pyasn1-modules,
+}:
+
+buildPythonPackage rec {
+  pname = "sleekxmppfs";
+  version = "1.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "aszymanik";
+    repo = "SleekXMPP";
+    rev = "refs/tags/sleek-${version}";
+    hash = "sha256-E2S4fMk5dRr8g42iOYmKOknHX7NS6EZ/LAZKc1v3dPg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    dnspython
+    pyasn1
+    pyasn1-modules
+  ];
+
+  pythonImportsCheck = [ "sleekxmppfs" ];
+
+  # tests weren't adapted for the fork
+  doCheck = false;
+
+  meta = {
+    description = "A fork of SleekXMPP with TLS cert validation disabled, intended only to be used with the sucks project";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/aszymanik/SleekXMPP";
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 189b52c8c6f4c..da603b9c15cda 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14452,6 +14452,8 @@ self: super: with self; {
 
   sleekxmpp = callPackage ../development/python-modules/sleekxmpp { };
 
+  sleekxmppfs = callPackage ../development/python-modules/sleekxmppfs { };
+
   sleepyq = callPackage ../development/python-modules/sleepyq { };
 
   sleqp = toPythonModule (pkgs.sleqp.override { pythonSupport = true; python3Packages = self; });

From dffa4ad728e978257949a04bdcb0285b5166386d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 30 Jul 2024 09:23:56 -0700
Subject: [PATCH 252/342] python312Packages.py-sucks: init at 0.9.10

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

diff --git a/pkgs/development/python-modules/py-sucks/default.nix b/pkgs/development/python-modules/py-sucks/default.nix
new file mode 100644
index 0000000000000..b7d8cf5208da1
--- /dev/null
+++ b/pkgs/development/python-modules/py-sucks/default.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  click,
+  pycountry-convert,
+  pycryptodome,
+  requests,
+  sleekxmppfs,
+  requests-mock,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "py-sucks";
+  version = "0.9.10";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mib1185";
+    repo = "py-sucks";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-MjlE5HdxChAgV/O7cD3foqkmKie7FgRRxvOcW+NAtfA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    click
+    pycountry-convert
+    pycryptodome
+    requests
+    sleekxmppfs
+  ];
+
+  pythonImportsCheck = [ "sucks" ];
+
+  nativeCheckInputs = [
+    requests-mock
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # assumes $HOME is at a specific place
+    "test_config_file_name"
+  ];
+
+  meta = {
+    changelog = "https://github.com/mib1185/py-sucks/releases/tag/v${version}";
+    description = "Library for controlling certain robot vacuums";
+    homepage = "https://github.com/mib1185/py-sucks";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "sucks";
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da603b9c15cda..5120aa7220ac7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9296,6 +9296,8 @@ self: super: with self; {
 
   py-radix-sr = callPackage ../development/python-modules/py-radix-sr { };
 
+  py-sucks = callPackage ../development/python-modules/py-sucks { };
+
   nwdiag = callPackage ../development/python-modules/nwdiag { };
 
   oasatelematics = callPackage ../development/python-modules/oasatelematics { };

From c417beac46630290dc2d0f415f7b9a7d050072ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 13:48:53 -0700
Subject: [PATCH 253/342] python312Packages.python-linkplay: init at 0.0.6

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

diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix
new file mode 100644
index 0000000000000..362c7c4275bda
--- /dev/null
+++ b/pkgs/development/python-modules/python-linkplay/default.nix
@@ -0,0 +1,49 @@
+{
+  aiohttp,
+  async-timeout,
+  async-upnp-client,
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "python-linkplay";
+  version = "0.0.6";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "python_linkplay";
+    inherit version;
+    hash = "sha256-mChlhJt2p77KWXWNZztrEA8Z2BmYkPLYPdv9Gw7p5/I=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+    async-timeout
+    async-upnp-client
+  ];
+
+  pythonImportsCheck = [ "linkplay" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # no tests on PyPI, no tags on GitHub
+  # https://github.com/Velleman/python-linkplay/issues/23
+  doCheck = false;
+
+  meta = {
+    description = "Python Library for Seamless LinkPlay Device Control";
+    homepage = "https://github.com/Velleman/python-linkplay";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5120aa7220ac7..422e065b164ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10461,6 +10461,8 @@ self: super: with self; {
 
   python-keystoneclient = callPackage ../development/python-modules/python-keystoneclient { };
 
+  python-linkplay = callPackage ../development/python-modules/python-linkplay { };
+
   python-lsp-black = callPackage ../development/python-modules/python-lsp-black { };
 
   python-mbedtls = callPackage ../development/python-modules/python-mbedtls { };

From b2a8cc8d02ad910067b30dab4079cae2cf54cf0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 14:09:24 -0700
Subject: [PATCH 254/342] python312Packages.simplefin4py: init at 0.0.18

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

diff --git a/pkgs/development/python-modules/simplefin4py/default.nix b/pkgs/development/python-modules/simplefin4py/default.nix
new file mode 100644
index 0000000000000..485079e15b75e
--- /dev/null
+++ b/pkgs/development/python-modules/simplefin4py/default.nix
@@ -0,0 +1,52 @@
+{
+  aiohttp,
+  aioresponses,
+  buildPythonPackage,
+  dataclasses-json,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "simplefin4py";
+  version = "0.0.18";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jeeftor";
+    repo = "SimpleFin4py";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-S+E2zwvrXN0YDY6IxplG0D15zSoeUPMyQt2oyM3QB2Q=";
+  };
+
+  build-system = [ poetry-core ];
+
+  propagatedBuildInputs = [
+    aiohttp
+    dataclasses-json
+  ];
+
+  pythonImportsCheck = [ "simplefin4py" ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # fails in non-UTC time zones
+    "test_dates"
+  ];
+
+  meta = {
+    changelog = "https://github.com/jeeftor/simplefin4py/releases/tag/v${version}";
+    description = "Python API for Accessing SimpleFIN";
+    homepage = "https://github.com/jeeftor/SimpleFin4py";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 422e065b164ff..9c61aad1c16e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14344,6 +14344,8 @@ self: super: with self; {
 
   simpleeval = callPackage ../development/python-modules/simpleeval { };
 
+  simplefin4py = callPackage ../development/python-modules/simplefin4py { };
+
   simplefix = callPackage ../development/python-modules/simplefix { };
 
   simplegeneric = callPackage ../development/python-modules/simplegeneric { };

From e5d572be2b84096a94c359f528a70b829c53b3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 14:34:01 -0700
Subject: [PATCH 255/342] python312Packages.py-madvr2: init at 1.6.29

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

diff --git a/pkgs/development/python-modules/py-madvr2/default.nix b/pkgs/development/python-modules/py-madvr2/default.nix
new file mode 100644
index 0000000000000..1018978cd338e
--- /dev/null
+++ b/pkgs/development/python-modules/py-madvr2/default.nix
@@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "py-madvr2";
+  version = "1.6.29";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "iloveicedgreentea";
+    repo = "py-madvr";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ibgmUpHSmOr5glSZPIJXTBDlEnQoWtmJzmEGsggQxnk=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "madvr" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # https://github.com/iloveicedgreentea/py-madvr/issues/12
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/${version}";
+    description = "Control MadVR Envy over IP";
+    homepage = "https://github.com/iloveicedgreentea/py-madvr";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9c61aad1c16e9..355b5b610d0f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10922,6 +10922,8 @@ self: super: with self; {
 
   py-dormakaba-dkey = callPackage ../development/python-modules/py-dormakaba-dkey { };
 
+  py-madvr2 = callPackage ../development/python-modules/py-madvr2 { };
+
   py-nightscout = callPackage ../development/python-modules/py-nightscout { };
 
   py-partiql-parser = callPackage ../development/python-modules/py-partiql-parser { };

From 245206ce7d6922ced3a01aac634b4f6b0a507f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 14:41:40 -0700
Subject: [PATCH 256/342] python312Packages.iottycloud: init at 0.1.3

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

diff --git a/pkgs/development/python-modules/iottycloud/default.nix b/pkgs/development/python-modules/iottycloud/default.nix
new file mode 100644
index 0000000000000..bd710c5e3cb87
--- /dev/null
+++ b/pkgs/development/python-modules/iottycloud/default.nix
@@ -0,0 +1,42 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pytestCheckHook,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "iottycloud";
+  version = "0.1.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pburgio";
+    repo = "iottyCloud";
+    # https://github.com/pburgio/iottyCloud/issues/1
+    rev = "c328cc497bf58a1da148ea88e309129177d69af0";
+    hash = "sha256-G06kvp4VG0OmZxDqvKnMJ+uD+6i5BFL/Iuke4vOdO/k=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "iottycloud" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    requests
+  ];
+
+  meta = {
+    changelog = "https://github.com/pburgio/iottyCloud/releases/tag/v${version}";
+    description = "Python library to interact with iotty CloudApi";
+    homepage = "https://github.com/pburgio/iottyCloud";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 355b5b610d0f1..1259945ebb590 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6052,6 +6052,8 @@ self: super: with self; {
 
   iotawattpy = callPackage ../development/python-modules/iotawattpy { };
 
+  iottycloud = callPackage ../development/python-modules/iottycloud { };
+
   iowait = callPackage ../development/python-modules/iowait { };
 
   ipadic = callPackage ../development/python-modules/ipadic { };

From d9910c17aab10b5b914d637340f964ea2e7aafd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 14:47:27 -0700
Subject: [PATCH 257/342] python312Packages.elevenlabs: init at 1.6.1

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

diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
new file mode 100644
index 0000000000000..6061f54c214b4
--- /dev/null
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -0,0 +1,49 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  httpx,
+  lib,
+  poetry-core,
+  pydantic,
+  pydantic-core,
+  requests,
+  typing-extensions,
+  websockets,
+}:
+
+buildPythonPackage rec {
+  pname = "elevenlabs";
+  version = "1.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "elevenlabs";
+    repo = "elevenlabs-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-IjsAd2QLYFbYRFQoZgcrKNxBUbD6+mILKkwH6E/mjyU=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    httpx
+    pydantic
+    pydantic-core
+    requests
+    typing-extensions
+    websockets
+  ];
+
+  pythonImportsCheck = [ "elevenlabs" ];
+
+  # tests access the API on the internet
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/elevenlabs/elevenlabs-python/releases/tag/v${version}";
+    description = "Official Python API for ElevenLabs Text to Speech";
+    homepage = "https://github.com/elevenlabs/elevenlabs-python";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1259945ebb590..0bb039f2e9f31 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3872,6 +3872,8 @@ self: super: with self; {
 
   elevate = callPackage ../development/python-modules/elevate { };
 
+  elevenlabs = callPackage ../development/python-modules/elevenlabs { };
+
   eliot = callPackage ../development/python-modules/eliot { };
 
   eliqonline = callPackage ../development/python-modules/eliqonline { };

From 285168dc7308152d57add18caba681ec419bb0b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 15:02:39 -0700
Subject: [PATCH 258/342] python312Packages.pyblu: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix
new file mode 100644
index 0000000000000..14b6c1d10de61
--- /dev/null
+++ b/pkgs/development/python-modules/pyblu/default.nix
@@ -0,0 +1,39 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  poetry-core,
+  xmltodict,
+}:
+
+buildPythonPackage rec {
+  pname = "pyblu";
+  version = "0.4.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-qMbwrRD7ZUsHHOLF9yPvAxiTmJ8vJX1cyHX+4ONtsQ8=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+    xmltodict
+  ];
+
+  pythonImportsCheck = [ "pyblu" ];
+
+  # no tests on PyPI, no tags on GitHub
+  # https://github.com/LouisChrist/pyblu/issues/19
+  doCheck = false;
+
+  meta = {
+    description = "BluOS API client";
+    homepage = "https://github.com/LouisChrist/pyblu";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0bb039f2e9f31..9999d60ef224e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11064,6 +11064,8 @@ self: super: with self; {
 
   pybloom-live = callPackage ../development/python-modules/pybloom-live { };
 
+  pyblu = callPackage ../development/python-modules/pyblu { };
+
   pybluez = callPackage ../development/python-modules/pybluez {
     inherit (pkgs) bluez;
   };

From 98cd0a17911df24aead4dc30599d671dcbd8fd0b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 01:09:30 +0200
Subject: [PATCH 259/342] python312Packages.evolutionhttp: init at 0.0.18

An HTTP client for controlling a Bryant Evolution HVAC system.
---
 .../python-modules/evolutionhttp/default.nix  | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/evolutionhttp/default.nix

diff --git a/pkgs/development/python-modules/evolutionhttp/default.nix b/pkgs/development/python-modules/evolutionhttp/default.nix
new file mode 100644
index 0000000000000..bb9151973627c
--- /dev/null
+++ b/pkgs/development/python-modules/evolutionhttp/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  aiofiles,
+  aiohttp,
+
+  # tests
+  mock,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "evolutionhttp";
+  version = "0.0.18";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-LZ9IQJ2qVdCbhOECbPOjikeJA0aGKLdZURG6tjIrkT4=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiofiles
+    aiohttp
+  ];
+
+  nativeCheckInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "evolutionhttp" ];
+
+  meta = with lib; {
+    description = "An HTTP client for controlling a Bryant Evolution HVAC system";
+    homepage = "https://github.com/danielsmyers/evolutionhttp";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9999d60ef224e..b987f16ed7ed2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4062,6 +4062,8 @@ self: super: with self; {
 
   evohome-async = callPackage ../development/python-modules/evohome-async { };
 
+  evolutionhttp = callPackage ../development/python-modules/evolutionhttp { };
+
   evosax = callPackage ../development/python-modules/evosax { };
 
   evtx = callPackage ../development/python-modules/evtx { };

From 812e095056e2438fced5ef3b32602a78b9f12ba0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 01:18:59 +0200
Subject: [PATCH 260/342] python312Packages.aiorussound: init at 2.2.2

An async python package for interfacing with Russound RIO hardware
---
 .../python-modules/aiorussound/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/aiorussound/default.nix

diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
new file mode 100644
index 0000000000000..e0f5c79681cae
--- /dev/null
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "aiorussound";
+  version = "2.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "noahhusby";
+    repo = "aiorussound";
+    rev = version;
+    hash = "sha256-X7KdIjfPNZSsSXYN1gVqTpcgM00V1YG3ihxutmYnb6Y=";
+  };
+
+  build-system = [ setuptools ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [ "aiorussound" ];
+
+  meta = with lib; {
+    description = "Async python package for interfacing with Russound RIO hardware";
+    homepage = "https://github.com/noahhusby/aiorussound";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b987f16ed7ed2..7080e89249860 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -395,6 +395,8 @@ self: super: with self; {
 
   aioruckus = callPackage ../development/python-modules/aioruckus { };
 
+  aiorussound = callPackage ../development/python-modules/aiorussound { };
+
   aiorun = callPackage ../development/python-modules/aiorun { };
 
   aioruuvigateway = callPackage ../development/python-modules/aioruuvigateway { };

From 3d551235914cefdefd62f67bcc330d7605cff199 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 01:23:54 +0200
Subject: [PATCH 261/342] python312Packages.dio-chacon-wifi-api: init at 1.1.0

Python library for DIO Chacon wifi's protocol for shutters and switches.
---
 .../dio-chacon-wifi-api/default.nix           | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/dio-chacon-wifi-api/default.nix

diff --git a/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix b/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
new file mode 100644
index 0000000000000..3544725132b92
--- /dev/null
+++ b/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
+  aiohttp,
+
+  # tests
+  aioresponses,
+  pytest-aiohttp,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "dio-chacon-wifi-api";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cnico";
+    repo = "dio-chacon-wifi-api";
+    rev = "v${version}";
+    hash = "sha256-TeunMvkiQw4TzLb2dsAHAg49nUzD3DGiO0DuXKGcICU=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-aiohttp
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "dio_chacon_wifi_api" ];
+
+  meta = with lib; {
+    description = "Python API via wifi for DIO devices from Chacon. Useful for homeassistant or other automations";
+    homepage = "https://github.com/cnico/dio-chacon-wifi-api";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7080e89249860..70d15f3163798 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3109,6 +3109,8 @@ self: super: with self; {
 
   dinghy = callPackage ../development/python-modules/dinghy { };
 
+  dio-chacon-wifi-api = callPackage ../development/python-modules/dio-chacon-wifi-api { };
+
   diofant = callPackage ../development/python-modules/diofant { };
 
   dipy = callPackage ../development/python-modules/dipy { };

From 32fbd1ef59b2b10520df5621a506a24f08516b72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 01:55:32 +0200
Subject: [PATCH 262/342] home-assistant: 2024.7.4 -> 2024.8.0

https://www.home-assistant.io/blog/2024/08/07/release-20248/
---
 .../home-assistant/component-packages.nix     | 718 ++++--------------
 pkgs/servers/home-assistant/default.nix       |  41 +-
 pkgs/servers/home-assistant/frontend.nix      |   4 +-
 .../patches/static-follow-symlinks.patch      |  31 +-
 4 files changed, 197 insertions(+), 597 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2d3494cb284aa..61a479c801f87 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2024.7.4";
+  version = "2024.8.0";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
@@ -78,18 +78,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "airtouch4" = ps: with ps; [
@@ -193,17 +190,11 @@
     "appalachianpower" = ps: with ps; [
     ];
     "apple_tv" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
       pyatv
-      sqlalchemy
       zeroconf
     ];
     "application_credentials" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ];
     "apprise" = ps: with ps; [
       apprise
@@ -220,10 +211,7 @@
     ];
     "aquacell" = ps: with ps; [
       aioaquacell
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "aqualogic" = ps: with ps; [
       aqualogic
@@ -244,18 +232,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "arcam_fmj" = ps: with ps; [
@@ -283,7 +268,7 @@
       hassil
       home-assistant-intents
       mutagen
-      webrtc-noise-gain
+      pymicro-vad
     ];
     "asterisk_cdr" = ps: with ps; [
       asterisk-mbox
@@ -321,6 +306,9 @@
     "aussie_broadband" = ps: with ps; [
       pyaussiebb
     ];
+    "autarco" = ps: with ps; [
+      autarco
+    ];
     "auth" = ps: with ps; [
     ];
     "automation" = ps: with ps; [
@@ -336,6 +324,7 @@
     ];
     "aws" = ps: with ps; [
       aiobotocore
+      botocore
     ];
     "axis" = ps: with ps; [
       axis
@@ -353,10 +342,7 @@
       azure-servicebus
     ];
     "backup" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       securetar
-      sqlalchemy
     ];
     "baf" = ps: with ps; [
       aiobafi6
@@ -394,9 +380,6 @@
     "blink" = ps: with ps; [
       blinkpy
     ];
-    "blinksticklight" = ps: with ps; [
-      blinkstick
-    ];
     "bliss_automation" = ps: with ps; [
     ];
     "bloc_blinds" = ps: with ps; [
@@ -421,24 +404,23 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "blueprint" = ps: with ps; [
     ];
     "bluesound" = ps: with ps; [
-      xmltodict
+      ifaddr
+      pyblu
+      zeroconf
     ];
     "bluetooth" = ps: with ps; [
       bleak
@@ -447,12 +429,9 @@
       bluetooth-auto-recovery
       bluetooth-data-tools
       dbus-fast
-      fnv-hash-fast
       habluetooth
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
     ];
     "bluetooth_adapters" = ps: with ps; [
       aioesphomeapi
@@ -466,18 +445,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "bluetooth_le_tracker" = ps: with ps; [
@@ -492,18 +468,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "bluetooth_tracker" = ps: with ps; [
@@ -519,10 +492,7 @@
     ];
     "bosch_shc" = ps: with ps; [
       boschshcpy
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       zeroconf
     ];
     "brandt" = ps: with ps; [
@@ -550,6 +520,9 @@
     "brunt" = ps: with ps; [
       brunt
     ];
+    "bryant_evolution" = ps: with ps; [
+      evolutionhttp
+    ];
     "bsblan" = ps: with ps; [
       python-bsblan
     ];
@@ -574,18 +547,15 @@
       bthome-ble
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "bticino" = ps: with ps; [
@@ -610,7 +580,6 @@
       py-canary
     ];
     "cast" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
@@ -620,12 +589,10 @@
       plexapi
       plexauth
       plexwebsocket
-      psutil-home-assistant
       pychromecast
+      pymicro-vad
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "ccm15" = ps: with ps; [
@@ -633,6 +600,9 @@
     ];
     "cert_expiry" = ps: with ps; [
     ];
+    "chacon_dio" = ps: with ps; [
+      dio-chacon-wifi-api
+    ];
     "channels" = ps: with ps; [
       pychannels
     ];
@@ -655,17 +625,14 @@
     "climate" = ps: with ps; [
     ];
     "cloud" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "cloudflare" = ps: with ps; [
       pycfdns
@@ -693,12 +660,11 @@
       pycomfoconnect
     ];
     "command_line" = ps: with ps; [
+      jsonpath
     ];
     "compensation" = ps: with ps; [
       numpy_1
     ];
-    "concord232" = ps: with ps; [
-    ]; # missing inputs: concord232
     "coned" = ps: with ps; [
     ];
     "config" = ps: with ps; [
@@ -732,11 +698,8 @@
       crownstone-cloud
       crownstone-sse
       crownstone-uart
-      fnv-hash-fast
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
     ];
     "cups" = ps: with ps; [
       pycups
@@ -795,6 +758,7 @@
       numpy_1
       pillow
       psutil-home-assistant
+      pymicro-vad
       pynacl
       pyserial
       python-matter-server
@@ -802,7 +766,6 @@
       pyudev
       securetar
       sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "delijn" = ps: with ps; [
@@ -826,10 +789,7 @@
     ];
     "devialet" = ps: with ps; [
       devialet
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       zeroconf
     ];
     "device_automation" = ps: with ps; [
@@ -841,10 +801,7 @@
     ];
     "devolo_home_control" = ps: with ps; [
       devolo-home-control-api
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       zeroconf
     ];
     "devolo_home_network" = ps: with ps; [
@@ -891,18 +848,12 @@
     ]; # missing inputs: pyW215
     "dlna_dmr" = ps: with ps; [
       async-upnp-client
-      fnv-hash-fast
       getmac
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "dlna_dms" = ps: with ps; [
       async-upnp-client
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "dnsip" = ps: with ps; [
       aiodns
@@ -930,23 +881,18 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
       py-dormakaba-dkey
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
-    "dovado" = ps: with ps; [
-    ]; # missing inputs: dovado
     "downloader" = ps: with ps; [
     ];
     "dremel_3d_printer" = ps: with ps; [
@@ -984,11 +930,8 @@
     "dynalite" = ps: with ps; [
       dynalite-devices
       dynalite-panel
-      fnv-hash-fast
       home-assistant-frontend
       pillow
-      psutil-home-assistant
-      sqlalchemy
     ];
     "eafm" = ps: with ps; [
       aioeafm
@@ -1016,7 +959,8 @@
     ];
     "ecovacs" = ps: with ps; [
       deebot-client
-    ]; # missing inputs: py-sucks
+      py-sucks
+    ];
     "ecowitt" = ps: with ps; [
       aioecowitt
     ];
@@ -1040,10 +984,10 @@
       pyelectra
     ];
     "electric_kiwi" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ]; # missing inputs: electrickiwi-api
+    "elevenlabs" = ps: with ps; [
+      elevenlabs
+    ];
     "elgato" = ps: with ps; [
       elgato
     ];
@@ -1052,10 +996,7 @@
     ];
     "elkm1" = ps: with ps; [
       elkm1-lib
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "elmax" = ps: with ps; [
       elmax-api
@@ -1080,20 +1021,14 @@
       aioemonitor
     ];
     "emulated_hue" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "emulated_kasa" = ps: with ps; [
       sense-energy
     ];
     "emulated_roku" = ps: with ps; [
       emulated-roku
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "energenie_power_sockets" = ps: with ps; [
       pyegps
@@ -1152,18 +1087,15 @@
       dbus-fast
       eq3btsmart
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "escea" = ps: with ps; [
@@ -1181,18 +1113,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "etherscan" = ps: with ps; [
@@ -1213,18 +1142,15 @@
       dbus-fast
       esphome-dashboard-api
       eufylife-ble-client
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "event" = ps: with ps; [
@@ -1301,9 +1227,6 @@
     ];
     "fitbit" = ps: with ps; [
       fitbit
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ];
     "fivem" = ps: with ps; [
       fivem-api
@@ -1324,18 +1247,15 @@
       dbus-fast
       esphome-dashboard-api
       fjaraskupan
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "fleetgo" = ps: with ps; [
@@ -1369,10 +1289,7 @@
     ];
     "flux_led" = ps: with ps; [
       flux-led
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "folder" = ps: with ps; [
     ];
@@ -1386,10 +1303,7 @@
       forecast-solar
     ];
     "forked_daapd" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       spotipy
-      sqlalchemy
     ]; # missing inputs: pyforked-daapd pylibrespot-java
     "fortios" = ps: with ps; [
       fortiosapi
@@ -1411,11 +1325,8 @@
       pyfreedompro
     ];
     "fritz" = ps: with ps; [
-      fnv-hash-fast
       fritzconnection
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       xmltodict
     ]
     ++ fritzconnection.optional-dependencies.qr;
@@ -1430,11 +1341,8 @@
       pyfronius
     ];
     "frontend" = ps: with ps; [
-      fnv-hash-fast
       home-assistant-frontend
       pillow
-      psutil-home-assistant
-      sqlalchemy
     ];
     "frontier_silicon" = ps: with ps; [
       afsapi
@@ -1468,7 +1376,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       gardena-bluetooth
       ha-ffmpeg
       habluetooth
@@ -1476,11 +1383,9 @@
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "gaviota" = ps: with ps; [
@@ -1513,10 +1418,7 @@
       georss-generic-client
     ];
     "geocaching" = ps: with ps; [
-      fnv-hash-fast
       geocachingapi
-      psutil-home-assistant
-      sqlalchemy
     ];
     "geofency" = ps: with ps; [
     ];
@@ -1550,25 +1452,16 @@
       goodwe
     ];
     "google" = ps: with ps; [
-      fnv-hash-fast
       gcal-sync
       ical
       oauth2client
-      psutil-home-assistant
-      sqlalchemy
     ];
     "google_assistant" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       python-matter-server
       pyturbojpeg
-      sqlalchemy
     ];
     "google_assistant_sdk" = ps: with ps; [
-      fnv-hash-fast
       gassist-text
-      psutil-home-assistant
-      sqlalchemy
     ];
     "google_cloud" = ps: with ps; [
       google-cloud-texttospeech
@@ -1581,13 +1474,10 @@
       hassil
       home-assistant-intents
       mutagen
-      webrtc-noise-gain
+      pymicro-vad
     ];
     "google_mail" = ps: with ps; [
-      fnv-hash-fast
       google-api-python-client
-      psutil-home-assistant
-      sqlalchemy
     ];
     "google_maps" = ps: with ps; [
       locationsharinglib
@@ -1596,16 +1486,10 @@
       google-cloud-pubsub
     ];
     "google_sheets" = ps: with ps; [
-      fnv-hash-fast
       gspread
-      psutil-home-assistant
-      sqlalchemy
     ];
     "google_tasks" = ps: with ps; [
-      fnv-hash-fast
       google-api-python-client
-      psutil-home-assistant
-      sqlalchemy
     ];
     "google_translate" = ps: with ps; [
       gtts
@@ -1627,7 +1511,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       govee-ble
       ha-ffmpeg
       habluetooth
@@ -1635,19 +1518,14 @@
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "govee_light_local" = ps: with ps; [
-      fnv-hash-fast
       govee-local-api
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "gpsd" = ps: with ps; [
       gps3
@@ -1657,11 +1535,8 @@
     "graphite" = ps: with ps; [
     ];
     "gree" = ps: with ps; [
-      fnv-hash-fast
       greeclimate
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "greeneye_monitor" = ps: with ps; [
       greeneye-monitor
@@ -1755,10 +1630,7 @@
       holidays
     ];
     "home_connect" = ps: with ps; [
-      fnv-hash-fast
       homeconnect
-      psutil-home-assistant
-      sqlalchemy
     ];
     "home_plus_control" = ps: with ps; [
     ];
@@ -1767,72 +1639,35 @@
     "homeassistant_alerts" = ps: with ps; [
     ];
     "homeassistant_green" = ps: with ps; [
-      bellows
-      fnv-hash-fast
       pillow
       psutil-home-assistant
       pyserial
-      pyserial-asyncio-fast
       pyudev
-      sqlalchemy
       universal-silabs-flasher
-      zha-quirks
-      zigpy
-      zigpy-deconz
-      zigpy-xbee
-      zigpy-zigate
-      zigpy-znp
+      zha
     ];
     "homeassistant_hardware" = ps: with ps; [
-      bellows
-      fnv-hash-fast
       pillow
-      psutil-home-assistant
       pyserial
-      pyserial-asyncio-fast
       pyudev
-      sqlalchemy
       universal-silabs-flasher
-      zha-quirks
-      zigpy
-      zigpy-deconz
-      zigpy-xbee
-      zigpy-zigate
-      zigpy-znp
+      zha
     ];
     "homeassistant_sky_connect" = ps: with ps; [
-      bellows
-      fnv-hash-fast
       pillow
       psutil-home-assistant
       pyserial
-      pyserial-asyncio-fast
       pyudev
-      sqlalchemy
       universal-silabs-flasher
-      zha-quirks
-      zigpy
-      zigpy-deconz
-      zigpy-xbee
-      zigpy-zigate
-      zigpy-znp
+      zha
     ];
     "homeassistant_yellow" = ps: with ps; [
-      bellows
-      fnv-hash-fast
       pillow
       psutil-home-assistant
       pyserial
-      pyserial-asyncio-fast
       pyudev
-      sqlalchemy
       universal-silabs-flasher
-      zha-quirks
-      zigpy
-      zigpy-deconz
-      zigpy-xbee
-      zigpy-zigate
-      zigpy-znp
+      zha
     ];
     "homekit" = ps: with ps; [
       base36
@@ -1840,10 +1675,8 @@
       ha-ffmpeg
       hap-python
       ifaddr
-      psutil-home-assistant
       pyqrcode
       pyturbojpeg
-      sqlalchemy
       zeroconf
     ];
     "homekit_controller" = ps: with ps; [
@@ -1859,20 +1692,17 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyroute2
       pyserial
       python-otbr-api
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "homematic" = ps: with ps; [
@@ -1920,9 +1750,6 @@
     ];
     "husqvarna_automower" = ps: with ps; [
       aioautomower
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ];
     "huum" = ps: with ps; [
       huum
@@ -1958,7 +1785,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -1966,11 +1792,9 @@
       ibeacon-ble
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "icloud" = ps: with ps; [
@@ -1988,18 +1812,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ]; # missing inputs: idasen-ha
     "idteck_prox" = ps: with ps; [
@@ -2040,18 +1861,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ]; # missing inputs: py-improv-ble-client
     "incomfort" = ps: with ps; [
@@ -2075,7 +1893,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -2083,11 +1900,9 @@
       ifaddr
       inkbird-ble
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "input_boolean" = ps: with ps; [
@@ -2105,15 +1920,12 @@
     "inspired_shades" = ps: with ps; [
     ];
     "insteon" = ps: with ps; [
-      fnv-hash-fast
       home-assistant-frontend
       insteon-frontend-home-assistant
       pillow
-      psutil-home-assistant
       pyinsteon
       pyserial
       pyudev
-      sqlalchemy
     ];
     "integration" = ps: with ps; [
     ];
@@ -2128,14 +1940,14 @@
       pyintesishome
     ];
     "ios" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       zeroconf
     ];
     "iotawatt" = ps: with ps; [
     ]; # missing inputs: ha-iotawattpy
+    "iotty" = ps: with ps; [
+      iottycloud
+    ];
     "iperf3" = ps: with ps; [
     ]; # missing inputs: iperf3
     "ipma" = ps: with ps; [
@@ -2150,6 +1962,30 @@
     ];
     "irish_rail_transport" = ps: with ps; [
     ]; # missing inputs: pyirishrail
+    "iron_os" = ps: with ps; [
+      aioesphomeapi
+      aioruuvigateway
+      aioshelly
+      bleak
+      bleak-esphome
+      bleak-retry-connector
+      bluetooth-adapters
+      bluetooth-auto-recovery
+      bluetooth-data-tools
+      dbus-fast
+      esphome-dashboard-api
+      ha-ffmpeg
+      habluetooth
+      hassil
+      home-assistant-intents
+      ifaddr
+      mutagen
+      pymicro-vad
+      pynecil
+      pyserial
+      pyudev
+      zeroconf
+    ];
     "isal" = ps: with ps; [
       isal
     ];
@@ -2157,6 +1993,9 @@
     ]; # missing inputs: prayer-times-calculator-offline
     "ismartwindow" = ps: with ps; [
     ];
+    "israel_rail" = ps: with ps; [
+      israel-rail-api
+    ];
     "iss" = ps: with ps; [
     ]; # missing inputs: pyiss
     "ista_ecotrend" = ps: with ps; [
@@ -2217,7 +2056,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -2225,11 +2063,9 @@
       ifaddr
       kegtron-ble
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "kentuckypower" = ps: with ps; [
@@ -2252,19 +2088,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pymicrobot
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "kira" = ps: with ps; [
@@ -2285,12 +2118,9 @@
       knocki
     ];
     "knx" = ps: with ps; [
-      fnv-hash-fast
       home-assistant-frontend
       knx-frontend
       pillow
-      psutil-home-assistant
-      sqlalchemy
       xknx
       xknxproject
     ];
@@ -2332,7 +2162,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -2340,25 +2169,17 @@
       ifaddr
       lmcloud
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "lametric" = ps: with ps; [
       demetriek
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ];
     "landisgyr_heat_meter" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
       ultraheat-api
     ];
     "lannouncer" = ps: with ps; [
@@ -2389,7 +2210,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -2397,11 +2217,9 @@
       ifaddr
       ld2410-ble
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "leaone" = ps: with ps; [
@@ -2416,18 +2234,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ]; # missing inputs: leaone-ble
     "led_ble" = ps: with ps; [
@@ -2442,7 +2257,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -2450,21 +2264,16 @@
       ifaddr
       led-ble
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "legrand" = ps: with ps; [
     ];
     "lg_netcast" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
       pylgnetcast
-      sqlalchemy
     ];
     "lg_soundbar" = ps: with ps; [
       temescal
@@ -2478,10 +2287,7 @@
       aiolifx
       aiolifx-effects
       aiolifx-themes
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "lifx_cloud" = ps: with ps; [
     ];
@@ -2496,6 +2302,9 @@
     "linear_garage_door" = ps: with ps; [
       linear-garage-door
     ];
+    "linkplay" = ps: with ps; [
+      python-linkplay
+    ];
     "linksys_smart" = ps: with ps; [
     ];
     "linode" = ps: with ps; [
@@ -2522,10 +2331,7 @@
     "local_file" = ps: with ps; [
     ];
     "local_ip" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "local_todo" = ps: with ps; [
       ical
@@ -2557,18 +2363,15 @@
       aiolookin
     ];
     "loqed" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       loqedapi
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "lovelace" = ps: with ps; [
       pillow
@@ -2594,12 +2397,12 @@
     ]; # missing inputs: lw12
     "lyric" = ps: with ps; [
       aiolyric
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ];
     "madeco" = ps: with ps; [
     ];
+    "madvr" = ps: with ps; [
+      py-madvr2
+    ];
     "mailbox" = ps: with ps; [
     ];
     "mailgun" = ps: with ps; [
@@ -2611,11 +2414,8 @@
       paho-mqtt_1
     ];
     "map" = ps: with ps; [
-      fnv-hash-fast
       home-assistant-frontend
       pillow
-      psutil-home-assistant
-      sqlalchemy
     ];
     "marantz" = ps: with ps; [
     ];
@@ -2631,10 +2431,7 @@
       pillow
     ];
     "matter" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       python-matter-server
-      sqlalchemy
     ];
     "maxcube" = ps: with ps; [
       maxcube-api
@@ -2659,18 +2456,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ]; # missing inputs: medcom-ble
     "media_extractor" = ps: with ps; [
@@ -2700,22 +2494,21 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ]; # missing inputs: melnor-bluetooth
     "meraki" = ps: with ps; [
     ];
+    "mercury_nz" = ps: with ps; [
+    ];
     "message_bird" = ps: with ps; [
       messagebird
     ];
@@ -2740,9 +2533,6 @@
     "mfi" = ps: with ps; [
     ]; # missing inputs: mficlient
     "microbees" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ]; # missing inputs: microBeesPy
     "microsoft" = ps: with ps; [
     ]; # missing inputs: pycsspeechtts
@@ -2769,6 +2559,8 @@
     "minecraft_server" = ps: with ps; [
       mcstatus
     ];
+    "mini_connected" = ps: with ps; [
+    ];
     "minio" = ps: with ps; [
       minio
     ];
@@ -2786,7 +2578,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -2794,27 +2585,22 @@
       ifaddr
       moat-ble
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "mobile_app" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
       pillow
-      psutil-home-assistant
+      pymicro-vad
       pynacl
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "mochad" = ps: with ps; [
     ]; # missing inputs: pymochad
@@ -2822,12 +2608,9 @@
       pymodbus
     ];
     "modem_callerid" = ps: with ps; [
-      fnv-hash-fast
       phone-modem
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
     ];
     "modern_forms" = ps: with ps; [
       aiomodernforms
@@ -2841,10 +2624,7 @@
     "monoprice" = ps: with ps; [
     ]; # missing inputs: pymonoprice
     "monzo" = ps: with ps; [
-      fnv-hash-fast
       monzopy
-      psutil-home-assistant
-      sqlalchemy
     ];
     "moon" = ps: with ps; [
     ];
@@ -2860,7 +2640,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -2868,19 +2647,14 @@
       ifaddr
       mopeka-iot-ble
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "motion_blinds" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
       motionblinds
-      psutil-home-assistant
-      sqlalchemy
     ];
     "motionblinds_ble" = ps: with ps; [
       aioesphomeapi
@@ -2894,7 +2668,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -2902,11 +2675,9 @@
       ifaddr
       motionblindsble
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "motioneye" = ps: with ps; [
@@ -2942,15 +2713,9 @@
     "mutesync" = ps: with ps; [
       mutesync
     ];
-    "mvglive" = ps: with ps; [
-      pymvglive
-    ];
     "my" = ps: with ps; [
-      fnv-hash-fast
       home-assistant-frontend
       pillow
-      psutil-home-assistant
-      sqlalchemy
     ];
     "myq" = ps: with ps; [
     ];
@@ -2965,10 +2730,7 @@
       mbddns
     ];
     "myuplink" = ps: with ps; [
-      fnv-hash-fast
       myuplink
-      psutil-home-assistant
-      sqlalchemy
     ];
     "nad" = ps: with ps; [
       nad-receiver
@@ -2983,10 +2745,7 @@
       aionanoleaf
     ];
     "neato" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       pybotvac
-      sqlalchemy
     ];
     "nederlandse_spoorwegen" = ps: with ps; [
       nsapi
@@ -2995,25 +2754,19 @@
       nessclient
     ];
     "nest" = ps: with ps; [
-      fnv-hash-fast
       google-nest-sdm
       ha-ffmpeg
-      psutil-home-assistant
-      sqlalchemy
     ];
     "netatmo" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
-      psutil-home-assistant
       pyatmo
+      pymicro-vad
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "netdata" = ps: with ps; [
       netdata
@@ -3027,10 +2780,7 @@
     "netio" = ps: with ps; [
     ]; # missing inputs: pynetio
     "network" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "neurio_energy" = ps: with ps; [
     ]; # missing inputs: neurio
@@ -3071,12 +2821,9 @@
     ];
     "nmap_tracker" = ps: with ps; [
       aiooui
-      fnv-hash-fast
       getmac
       ifaddr
       netmap
-      psutil-home-assistant
-      sqlalchemy
     ];
     "nmbs" = ps: with ps; [
     ]; # missing inputs: pyrail
@@ -3148,7 +2895,7 @@
       home-assistant-intents
       mutagen
       ollama
-      webrtc-noise-gain
+      pymicro-vad
     ];
     "ombi" = ps: with ps; [
       pyombi
@@ -3184,7 +2931,7 @@
       home-assistant-intents
       mutagen
       openai
-      webrtc-noise-gain
+      pymicro-vad
     ];
     "openalpr_cloud" = ps: with ps; [
     ];
@@ -3243,7 +2990,6 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
@@ -3251,11 +2997,9 @@
       ifaddr
       mutagen
       oralb-ble
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "oru" = ps: with ps; [
@@ -3270,25 +3014,16 @@
     "osramlightify" = ps: with ps; [
     ]; # missing inputs: lightify
     "otbr" = ps: with ps; [
-      bellows
-      fnv-hash-fast
       ifaddr
       pillow
       psutil-home-assistant
       pyroute2
       pyserial
-      pyserial-asyncio-fast
       python-otbr-api
       pyudev
-      sqlalchemy
       universal-silabs-flasher
       zeroconf
-      zha-quirks
-      zigpy
-      zigpy-deconz
-      zigpy-xbee
-      zigpy-zigate
-      zigpy-znp
+      zha
     ];
     "otp" = ps: with ps; [
       pyotp
@@ -3302,19 +3037,16 @@
       ovoenergy
     ];
     "owntracks" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
       paho-mqtt_1
-      psutil-home-assistant
+      pymicro-vad
       pynacl
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "p1_monitor" = ps: with ps; [
       p1monitor
@@ -3329,18 +3061,12 @@
       pexpect
     ];
     "panel_custom" = ps: with ps; [
-      fnv-hash-fast
       home-assistant-frontend
       pillow
-      psutil-home-assistant
-      sqlalchemy
     ];
     "panel_iframe" = ps: with ps; [
-      fnv-hash-fast
       home-assistant-frontend
       pillow
-      psutil-home-assistant
-      sqlalchemy
     ];
     "pcs_lighting" = ps: with ps; [
     ];
@@ -3380,6 +3106,8 @@
     ];
     "pilight" = ps: with ps; [
     ]; # missing inputs: pilight
+    "pinecil" = ps: with ps; [
+    ];
     "ping" = ps: with ps; [
       icmplib
     ];
@@ -3390,18 +3118,15 @@
     "pjlink" = ps: with ps; [
     ]; # missing inputs: pypjlink2
     "plaato" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyplaato
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "plant" = ps: with ps; [
       fnv-hash-fast
@@ -3444,18 +3169,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "profiler" = ps: with ps; [
@@ -3538,19 +3260,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
       qingping-ble
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "qld_bushfire" = ps: with ps; [
@@ -3578,26 +3297,20 @@
       pyqwikswitch
     ];
     "rabbitair" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
       python-rabbitair
-      sqlalchemy
       zeroconf
     ];
     "rachio" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       python-matter-server
       pyturbojpeg
       rachiopy
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "radarr" = ps: with ps; [
       aiopyarr
@@ -3620,11 +3333,8 @@
     ];
     "rainforest_raven" = ps: with ps; [
       aioraven
-      fnv-hash-fast
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
     ];
     "rainmachine" = ps: with ps; [
       regenmaschine
@@ -3643,19 +3353,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
       rapt-ble
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "raspberry_pi" = ps: with ps; [
@@ -3677,7 +3384,6 @@
       sqlalchemy
     ];
     "recovery_mode" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
@@ -3685,11 +3391,9 @@
       home-assistant-intents
       mutagen
       pillow
-      psutil-home-assistant
+      pymicro-vad
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "recswitch" = ps: with ps; [
     ]; # missing inputs: pyrecswitch
@@ -3800,7 +3504,8 @@
       aioruckus
     ];
     "russound_rio" = ps: with ps; [
-    ]; # missing inputs: russound-rio
+      aiorussound
+    ];
     "russound_rnet" = ps: with ps; [
     ]; # missing inputs: russound
     "ruuvi_gateway" = ps: with ps; [
@@ -3811,12 +3516,9 @@
       bluetooth-auto-recovery
       bluetooth-data-tools
       dbus-fast
-      fnv-hash-fast
       habluetooth
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
     ];
     "ruuvitag_ble" = ps: with ps; [
       aioesphomeapi
@@ -3830,19 +3532,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
       ruuvitag-ble
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "rympro" = ps: with ps; [
@@ -3858,13 +3557,10 @@
     ];
     "samsungtv" = ps: with ps; [
       async-upnp-client
-      fnv-hash-fast
       getmac
       ifaddr
-      psutil-home-assistant
       samsungctl
       samsungtvws
-      sqlalchemy
       wakeonlan
     ]
     ++ samsungctl.optional-dependencies.websocket
@@ -3902,9 +3598,6 @@
     "scsgate" = ps: with ps; [
     ]; # missing inputs: scsgate
     "search" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ];
     "season" = ps: with ps; [
       ephem
@@ -3932,19 +3625,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
       sensirion-ble
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "sensor" = ps: with ps; [
@@ -3966,19 +3656,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
       sensorpro-ble
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "sensorpush" = ps: with ps; [
@@ -3993,19 +3680,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
       sensorpush-ble
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "sentry" = ps: with ps; [
@@ -4013,9 +3697,6 @@
     ];
     "senz" = ps: with ps; [
       aiosenz
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ];
     "serial" = ps: with ps; [
       pyserial-asyncio-fast
@@ -4029,7 +3710,7 @@
       pillow
     ];
     "seventeentrack" = ps: with ps; [
-      py17track
+      pyseventeentrack
     ];
     "sfr_box" = ps: with ps; [
       sfrbox-api
@@ -4047,13 +3728,10 @@
       bluetooth-auto-recovery
       bluetooth-data-tools
       dbus-fast
-      fnv-hash-fast
       habluetooth
       ifaddr
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
     ];
     "shodan" = ps: with ps; [
       shodan
@@ -4072,6 +3750,9 @@
     "signal_messenger" = ps: with ps; [
       pysignalclirestapi
     ];
+    "simplefin" = ps: with ps; [
+      simplefin4py
+    ];
     "simplepush" = ps: with ps; [
       simplepush
     ];
@@ -4129,19 +3810,16 @@
     "smarther" = ps: with ps; [
     ];
     "smartthings" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pysmartapp
       pysmartthings
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "smarttub" = ps: with ps; [
       python-smarttub
@@ -4177,19 +3855,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pysnooz
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "solaredge" = ps: with ps; [
@@ -4220,16 +3895,13 @@
     ];
     "sonos" = ps: with ps; [
       async-upnp-client
-      fnv-hash-fast
       ifaddr
       plexapi
       plexauth
       plexwebsocket
-      psutil-home-assistant
       soco
       sonos-websocket
       spotipy
-      sqlalchemy
       zeroconf
     ];
     "sony_projector" = ps: with ps; [
@@ -4253,10 +3925,7 @@
       hass-splunk
     ];
     "spotify" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       spotipy
-      sqlalchemy
     ];
     "sql" = ps: with ps; [
       sqlalchemy
@@ -4270,10 +3939,7 @@
     ];
     "ssdp" = ps: with ps; [
       async-upnp-client
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "starline" = ps: with ps; [
       starline
@@ -4299,10 +3965,7 @@
     "steamist" = ps: with ps; [
       aiosteamist
       discovery30303
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "stiebel_eltron" = ps: with ps; [
       pymodbus
@@ -4370,19 +4033,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyswitchbot
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       zeroconf
     ];
     "switchbot_cloud" = ps: with ps; [
@@ -4412,10 +4072,7 @@
     "syslog" = ps: with ps; [
     ];
     "system_bridge" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       systembridgeconnector
       systembridgemodels
       zeroconf
@@ -4493,6 +4150,9 @@
       pycocotools
       tensorflow
     ]; # missing inputs: tf-models-official
+    "tesla_fleet" = ps: with ps; [
+      tesla-fleet-api
+    ];
     "tesla_wall_connector" = ps: with ps; [
       tesla-wall-connector
     ];
@@ -4518,19 +4178,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
       thermobeacon-ble
-      webrtc-noise-gain
       zeroconf
     ];
     "thermoplus" = ps: with ps; [
@@ -4547,19 +4204,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
       thermopro-ble
-      webrtc-noise-gain
       zeroconf
     ];
     "thermoworks_smoke" = ps: with ps; [
@@ -4575,12 +4229,9 @@
     "thomson" = ps: with ps; [
     ];
     "thread" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
       pyroute2
       python-otbr-api
-      sqlalchemy
       zeroconf
     ];
     "threshold" = ps: with ps; [
@@ -4608,19 +4259,16 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
       tilt-ble
-      webrtc-noise-gain
       zeroconf
     ];
     "time" = ps: with ps; [
@@ -4648,18 +4296,15 @@
       pytomorrowio
     ];
     "toon" = ps: with ps; [
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       python-matter-server
       pyturbojpeg
-      sqlalchemy
       toonapi
-      webrtc-noise-gain
     ];
     "torque" = ps: with ps; [
     ];
@@ -4669,11 +4314,8 @@
     "touchline" = ps: with ps; [
     ]; # missing inputs: pytouchline
     "tplink" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
       python-kasa
-      sqlalchemy
     ]
     ++ python-kasa.optional-dependencies.speedups;
     "tplink_lte" = ps: with ps; [
@@ -4746,9 +4388,6 @@
       ttls
     ];
     "twitch" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
       twitchapi
     ];
     "twitter" = ps: with ps; [
@@ -4759,8 +4398,6 @@
     "ubus" = ps: with ps; [
       openwrt-ubus-rpc
     ];
-    "ue_smart_radio" = ps: with ps; [
-    ];
     "uk_transport" = ps: with ps; [
     ];
     "ukraine_alarm" = ps: with ps; [
@@ -4795,11 +4432,8 @@
     ];
     "upnp" = ps: with ps; [
       async-upnp-client
-      fnv-hash-fast
       getmac
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "uprise_smart_shades" = ps: with ps; [
     ];
@@ -4809,11 +4443,8 @@
       pyuptimerobot
     ];
     "usb" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
     ];
     "usgs_earthquakes_feed" = ps: with ps; [
       aio-geojson-usgs-earthquakes
@@ -4838,11 +4469,8 @@
       vtjp
     ];
     "velbus" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
       velbus-aio
     ];
     "velux" = ps: with ps; [
@@ -4898,8 +4526,8 @@
       hassil
       home-assistant-intents
       mutagen
+      pymicro-vad
       voip-utils
-      webrtc-noise-gain
     ];
     "volkszaehler" = ps: with ps; [
       volkszaehler
@@ -4961,9 +4589,6 @@
       aiowebostv
     ];
     "websocket_api" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
     ];
     "wemo" = ps: with ps; [
       pywemo
@@ -4986,24 +4611,18 @@
     ]; # missing inputs: wirelesstagpy
     "withings" = ps: with ps; [
       aiowithings
-      fnv-hash-fast
       ha-ffmpeg
       hass-nabucasa
       hassil
       home-assistant-intents
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       python-matter-server
       pyturbojpeg
-      sqlalchemy
-      webrtc-noise-gain
     ];
     "wiz" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
       pywizlight
-      sqlalchemy
     ];
     "wled" = ps: with ps; [
       wled
@@ -5029,15 +4648,12 @@
       hassil
       home-assistant-intents
       mutagen
-      webrtc-noise-gain
+      pymicro-vad
       wyoming
     ];
     "x10" = ps: with ps; [
     ];
     "xbox" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
       xbox-webapi
     ];
     "xeoma" = ps: with ps; [
@@ -5061,18 +4677,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       xiaomi-ble
       zeroconf
     ];
@@ -5107,18 +4720,15 @@
       bluetooth-data-tools
       dbus-fast
       esphome-dashboard-api
-      fnv-hash-fast
       ha-ffmpeg
       habluetooth
       hassil
       home-assistant-intents
       ifaddr
       mutagen
-      psutil-home-assistant
+      pymicro-vad
       pyserial
       pyudev
-      sqlalchemy
-      webrtc-noise-gain
       yalexs-ble
       zeroconf
     ];
@@ -5128,10 +4738,7 @@
     "yamaha_musiccast" = ps: with ps; [
       aiomusiccast
       async-upnp-client
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
     ];
     "yandex_transport" = ps: with ps; [
       aioymaps
@@ -5143,10 +4750,7 @@
     ];
     "yeelight" = ps: with ps; [
       async-upnp-client
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       yeelight
     ];
     "yeelightsunflower" = ps: with ps; [
@@ -5156,18 +4760,12 @@
       ha-ffmpeg
     ];
     "yolink" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
       yolink-api
     ];
     "youless" = ps: with ps; [
       youless-api
     ];
     "youtube" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
-      sqlalchemy
       youtubeaio
     ];
     "zabbix" = ps: with ps; [
@@ -5180,10 +4778,7 @@
       bluepy
     ]; # missing inputs: zengge
     "zeroconf" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       zeroconf
     ];
     "zerproc" = ps: with ps; [
@@ -5195,21 +4790,11 @@
     "zeversolar" = ps: with ps; [
     ]; # missing inputs: zeversolar
     "zha" = ps: with ps; [
-      bellows
-      fnv-hash-fast
       pillow
-      psutil-home-assistant
       pyserial
-      pyserial-asyncio-fast
       pyudev
-      sqlalchemy
       universal-silabs-flasher
-      zha-quirks
-      zigpy
-      zigpy-deconz
-      zigpy-xbee
-      zigpy-zigate
-      zigpy-znp
+      zha
     ];
     "zhong_hong" = ps: with ps; [
     ]; # missing inputs: zhong-hong-hvac
@@ -5225,18 +4810,12 @@
       zm-py
     ];
     "zwave_js" = ps: with ps; [
-      fnv-hash-fast
-      psutil-home-assistant
       pyserial
       pyudev
-      sqlalchemy
       zwave-js-server-python
     ];
     "zwave_me" = ps: with ps; [
-      fnv-hash-fast
       ifaddr
-      psutil-home-assistant
-      sqlalchemy
       url-normalize
       zeroconf
       zwave-me-ws
@@ -5304,6 +4883,7 @@
     "aurora"
     "aurora_abb_powerone"
     "aussie_broadband"
+    "autarco"
     "auth"
     "automation"
     "awair"
@@ -5323,6 +4903,7 @@
     "blue_current"
     "bluemaestro"
     "blueprint"
+    "bluesound"
     "bluetooth"
     "bluetooth_adapters"
     "bluetooth_le_tracker"
@@ -5335,6 +4916,7 @@
     "brother"
     "brottsplatskartan"
     "brunt"
+    "bryant_evolution"
     "bsblan"
     "bthome"
     "buienradar"
@@ -5346,6 +4928,7 @@
     "cast"
     "ccm15"
     "cert_expiry"
+    "chacon_dio"
     "clicksend_tts"
     "climate"
     "cloud"
@@ -5410,14 +4993,17 @@
     "ecobee"
     "ecoforest"
     "econet"
+    "ecovacs"
     "ecowitt"
     "edl21"
     "efergy"
     "eight_sleep"
     "electrasmart"
+    "elevenlabs"
     "elgato"
     "elkm1"
     "elmax"
+    "emoncms"
     "emonitor"
     "emulated_hue"
     "emulated_kasa"
@@ -5486,6 +5072,7 @@
     "generic"
     "generic_hygrostat"
     "generic_thermostat"
+    "geniushub"
     "geo_json_events"
     "geo_location"
     "geo_rss_events"
@@ -5587,10 +5174,13 @@
     "intent"
     "intent_script"
     "ios"
+    "iotty"
     "ipma"
     "ipp"
     "iqvia"
+    "iron_os"
     "isal"
+    "israel_rail"
     "ista_ecotrend"
     "isy994"
     "izone"
@@ -5629,6 +5219,7 @@
     "lifx"
     "light"
     "linear_garage_door"
+    "linkplay"
     "litterrobot"
     "livisi"
     "local_calendar"
@@ -5650,11 +5241,13 @@
     "lutron"
     "lutron_caseta"
     "lyric"
+    "madvr"
     "mailbox"
     "mailgun"
     "manual"
     "manual_mqtt"
     "map"
+    "mastodon"
     "matrix"
     "matter"
     "maxcube"
@@ -5851,6 +5444,7 @@
     "rss_feed_template"
     "rtsp_to_webrtc"
     "ruckus_unleashed"
+    "russound_rio"
     "ruuvi_gateway"
     "ruuvitag_ble"
     "rympro"
@@ -5884,6 +5478,7 @@
     "sigfox"
     "sighthound"
     "signal_messenger"
+    "simplefin"
     "simplepush"
     "simplisafe"
     "simulated"
@@ -5967,6 +5562,7 @@
     "tellduslive"
     "temper"
     "template"
+    "tesla_fleet"
     "tesla_wall_connector"
     "teslemetry"
     "text"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 331fe590ac005..7de6e78eebd1b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -126,17 +126,6 @@ let
         doCheck = false;
       });
 
-      dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec {
-        version = "1.3.1";
-        src = fetchFromGitHub {
-          owner = "ndokter";
-          repo = "dsmr_parser";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-PULrKRHrCuDFZcR+5ha0PjkN438QFgf2CrpYhKIqYTs=";
-        };
-        doCheck = false;
-      });
-
       geojson = super.geojson.overridePythonAttrs (oldAttrs: rec {
         version = "2.5.0";
         src = fetchFromGitHub {
@@ -273,6 +262,19 @@ let
         };
       });
 
+      pyflume = super.pyflume.overridePythonAttrs (oldAttrs: rec {
+        version = "0.6.5";
+        src = fetchFromGitHub {
+          owner = "ChrisMandich";
+          repo = "PyFlume";
+          rev = "refs/tags/v${version}";
+          hash = "sha256-kIE3y/qlsO9Y1MjEQcX0pfaBeIzCCHk4f1Xa215BBHo=";
+        };
+        dependencies = oldAttrs.propagatedBuildInputs or [] ++ [
+          self.pytz
+        ];
+      });
+
       pytibber = super.pytibber.overridePythonAttrs (oldAttrs: rec {
         version = "0.28.2";
         src = fetchFromGitHub {
@@ -411,16 +413,6 @@ let
         doCheck = false;
       };
 
-      voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec {
-        version = "0.13.1";
-        src = fetchFromGitHub {
-          owner = "alecthomas";
-          repo = "voluptuous";
-          rev = "refs/tags/${version}";
-          hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk=";
-        };
-      });
-
       # Pinned due to API changes ~1.0
       vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
         version = "0.1.2";
@@ -489,7 +481,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2024.7.4";
+  hassVersion = "2024.8.0";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -507,13 +499,13 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-PHKFQmlwdS0+XpD5Pd+Xwv5KNB2kJKouh9jfBH3aUIU=";
+    hash = "sha256-WGbT53bmyV1d/6GKlv5+bxLmGRqsAHEKbs2halMkPB4=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-NJ5gD6k05ahIPCwktJgTz9zczxgnfuLesfjR58fbRL4=";
+    hash = "sha256-RfTkF8HO5bZCupo5vBLbSG2shr+b31GfDN+iJpH5sc8=";
   };
 
   build-system = with python.pkgs; [
@@ -569,7 +561,6 @@ in python.pkgs.buildPythonApplication rec {
     aiodns
     aiohttp
     aiohttp-cors
-    aiohttp-fast-url-dispatcher
     aiohttp-fast-zlib
     aiozoneinfo
     astral
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index f03474206247a..b66a350ad02c8 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20240710.0";
+  version = "20240806.1";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-EP4r59sgrLuK+n3ydq4LMCUS4xsT2XYE2OvK9N+Gd+M=";
+    hash = "sha256-tOM1KFffoPoS3FCdytdkwiptdLwKxpZFQJ4VU3i3WN0=";
   };
 
   # there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/patches/static-follow-symlinks.patch b/pkgs/servers/home-assistant/patches/static-follow-symlinks.patch
index c99a8d88a1e8b..079b07f970aad 100644
--- a/pkgs/servers/home-assistant/patches/static-follow-symlinks.patch
+++ b/pkgs/servers/home-assistant/patches/static-follow-symlinks.patch
@@ -1,12 +1,25 @@
 diff --git a/homeassistant/components/http/static.py b/homeassistant/components/http/static.py
-index e6e773d4c0..b53e0b4a11 100644
+index 29c5840a4bf..463c723df91 100644
 --- a/homeassistant/components/http/static.py
 +++ b/homeassistant/components/http/static.py
-@@ -31,7 +31,6 @@ def _get_file_path(rel_url: str, directory: Path) -> Path | None:
-         # where the static dir is totally different
-         raise HTTPForbidden
-     filepath: Path = directory.joinpath(filename).resolve()
--    filepath.relative_to(directory)
-     # on opening a dir, load its contents if allowed
-     if filepath.is_dir():
-         return None
+@@ -7,6 +7,7 @@ from pathlib import Path
+ from typing import Final
+ 
+ from aiohttp.hdrs import CACHE_CONTROL, CONTENT_TYPE
++from aiohttp.typedefs import PathLike
+ from aiohttp.web import FileResponse, Request, StreamResponse
+ from aiohttp.web_fileresponse import CONTENT_TYPES, FALLBACK_CONTENT_TYPE
+ from aiohttp.web_urldispatcher import StaticResource
+@@ -21,6 +22,12 @@ RESPONSE_CACHE: LRU[tuple[str, Path], tuple[Path, str]] = LRU(512)
+ class CachingStaticResource(StaticResource):
+     """Static Resource handler that will add cache headers."""
+ 
++    def __init__(self, prefix: str, directory: PathLike, **kwargs):
++        """Allow static files to be hosted behind symlinks."""
++        kwargs.update({"follow_symlinks": True})
++        super().__init__(prefix, directory, **kwargs)
++
++
+     async def _handle(self, request: Request) -> StreamResponse:
+         """Wrap base handler to cache file path resolution and content type guess."""
+         rel_url = request.match_info["filename"]

From 6cdd43f61e8dfd62dd42551e851468dae7ff1456 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 01:56:49 +0200
Subject: [PATCH 263/342] home-assistant-custom-lovelace-modules.mushroom:
 4.0.0 -> 4.0.2

https://github.com/piitaya/lovelace-mushroom/releases/tag/v4.0.2
---
 .../custom-lovelace-modules/mushroom/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
index 8b586f1515a4d..29dcb782f43eb 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
@@ -5,16 +5,16 @@
 
 buildNpmPackage rec {
   pname = "mushroom";
-  version = "4.0.0";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     owner = "piitaya";
     repo = "lovelace-mushroom";
     rev = "v${version}";
-    hash = "sha256-yoSMwNrldDfFfJWyGBZ+bJjIGYUl3FZEQ5EvLG7XzVw=";
+    hash = "sha256-Ybhz8MsMa3cr7GoRRZTPj4+XdI/oWtlE3yQDsEHgYaA=";
   };
 
-  npmDepsHash = "sha256-3N/tsv/mtq4r9tWldxu6MIHkkfsmaU6omgtG0hIadXA=";
+  npmDepsHash = "sha256-BuGikB97xgyASqCYzEyQX/daQ41HCua4K2MVyvJbkPQ=";
 
   installPhase = ''
     runHook preInstall

From 621b4daccadeb99cbfa93514a941a91f2957b9d9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 02:41:45 +0200
Subject: [PATCH 264/342] python312Packages.openhomedevice: disable failing
 tests

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

diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix
index b08b23905ce8c..eba21e895985d 100644
--- a/pkgs/development/python-modules/openhomedevice/default.nix
+++ b/pkgs/development/python-modules/openhomedevice/default.nix
@@ -36,6 +36,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # https://github.com/bazwilliams/openhomedevice/issues/23
+    "test_two"
+    "test_three"
+  ];
+
   pythonImportsCheck = [ "openhomedevice" ];
 
   pytestFlagsArray = [ "tests/*.py" ];

From 8e3310fd636cf5131b3cfe3e1914ca9c957b19a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 03:15:12 +0200
Subject: [PATCH 265/342] python312Packages.es-client: fix build

---
 pkgs/development/python-modules/es-client/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/es-client/default.nix b/pkgs/development/python-modules/es-client/default.nix
index ce5f362675bc8..f997ff471ef92 100644
--- a/pkgs/development/python-modules/es-client/default.nix
+++ b/pkgs/development/python-modules/es-client/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   certifi,
   click,
+  dotmap,
   ecs-logging,
   elastic-transport,
   elasticsearch8,
@@ -36,10 +37,10 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-
   dependencies = [
     certifi
     click
+    dotmap
     ecs-logging
     elastic-transport
     elasticsearch8
@@ -68,6 +69,8 @@ buildPythonPackage rec {
     "test_multiple_hosts_raises"
     "test_non_dict_passed"
     "test_skip_version_check"
+    # es_client.exceptions.ConfigurationError: Must populate both username and password, or leave both empty
+    "test_exit_if_not_master "
   ];
 
   meta = with lib; {

From 7d5e4f8d27c29a4ac88ef9c1040e5e1dfccf97aa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 03:25:51 +0200
Subject: [PATCH 266/342] python312Packages.emborg: fix build

---
 pkgs/development/python-modules/emborg/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix
index 5d244fb9a322f..35a09bffe858d 100644
--- a/pkgs/development/python-modules/emborg/default.nix
+++ b/pkgs/development/python-modules/emborg/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   flit-core,
   pytestCheckHook,
   pythonOlder,
@@ -60,14 +59,6 @@ buildPythonPackage rec {
     patchShebangs .
   '';
 
-  # this patch fixes a whitespace issue in the message that a test is expecting, https://github.com/KenKundert/emborg/pull/67
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/KenKundert/emborg/commit/afac6d1ddcecdb4bddbec87b6c8eed4cfbf4ebf9.diff";
-      sha256 = "3xg2z03FLKH4ckmiBZqE1FDjpgjgdO8OZL1ewrJlQ4o=";
-    })
-  ];
-
   pythonImportsCheck = [ "emborg" ];
 
   meta = with lib; {

From 4dcefc1d28c31541b0fdcccd1c11911870de8a8f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 03:31:14 +0200
Subject: [PATCH 267/342] python312Packages.spsdk: relax cryptography
 constraint

---
 pkgs/development/python-modules/spsdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix
index 3cdfc65811fe9..26dfd177e285f 100644
--- a/pkgs/development/python-modules/spsdk/default.nix
+++ b/pkgs/development/python-modules/spsdk/default.nix
@@ -49,6 +49,7 @@ buildPythonPackage rec {
   build-system = [ setuptools-scm ];
 
   pythonRelaxDeps = [
+    "cryptography"
     "requests"
     "packaging"
     "typing-extensions"

From 271e44ed67bb576c2094faa0390f8e24437b45af Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 04:21:03 +0200
Subject: [PATCH 268/342] python312Packages.elmax-api: add missing websocket
 dependency

and make it a PEP517 build with appropriate lingo.
---
 pkgs/development/python-modules/elmax-api/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix
index ad963e7e3d3f9..27b1689863392 100644
--- a/pkgs/development/python-modules/elmax-api/default.nix
+++ b/pkgs/development/python-modules/elmax-api/default.nix
@@ -2,16 +2,18 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   httpx,
   pyjwt,
   pythonOlder,
+  websockets,
   yarl,
 }:
 
 buildPythonPackage rec {
   pname = "elmax-api";
   version = "0.0.5";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -22,9 +24,12 @@ buildPythonPackage rec {
     hash = "sha256-57pmmH7f893H71CMhdnahvbN/5F2yfrVZ6MFpYQ4+mQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     httpx
     pyjwt
+    websockets
     yarl
   ];
 

From c9ac92c4e69d7e30c297406d6525e9f9d1a6155f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 04:25:47 +0200
Subject: [PATCH 269/342] python312Packages.blinkpy: fix tests with aiohttp
 3.10

---
 .../python-modules/blinkpy/default.nix            | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix
index 014b7d15b9e3b..00c36c80de63c 100644
--- a/pkgs/development/python-modules/blinkpy/default.nix
+++ b/pkgs/development/python-modules/blinkpy/default.nix
@@ -2,8 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   aiofiles,
   aiohttp,
+  pytest-asyncio,
   pytestCheckHook,
   python-dateutil,
   python-slugify,
@@ -27,6 +29,14 @@ buildPythonPackage rec {
     hash = "sha256-MWXOxE0nxBFhkAWjy7qFPhv4AO6VjGf+fAiyaWXeiX8=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # Fix tests with aiohttp 3.10+
+      url = "https://github.com/fronzbot/blinkpy/commit/e2c747b5ad295424b08ff4fb03204129155666fc.patch";
+      hash = "sha256-FapgAZcKBWqtAPjRl2uOFgnYPoWq6UU88XGLO7oCmDI=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace ', "wheel~=0.40.0"' "" \
@@ -44,7 +54,10 @@ buildPythonPackage rec {
     sortedcontainers
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "blinkpy"

From dfb8bb472c60ed430b118769bf9b26af46f3f01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 02:56:49 -0700
Subject: [PATCH 270/342] python312Packages.aiohttp-fast-url-dispatcher: drop

The improvement is included in aiohttp 3.10.0.
---
 .../aiohttp-fast-url-dispatcher/default.nix   | 51 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 2 files changed, 53 deletions(-)
 delete mode 100644 pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix

diff --git a/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix b/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix
deleted file mode 100644
index 60cf4e1ee4e80..0000000000000
--- a/pkgs/development/python-modules/aiohttp-fast-url-dispatcher/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  aiohttp,
-  buildPythonPackage,
-  fetchFromGitHub,
-  poetry-core,
-  pytest-asyncio,
-  pytestCheckHook,
-  pythonOlder,
-}:
-
-buildPythonPackage rec {
-  pname = "aiohttp-fast-url-dispatcher";
-  version = "0.3.1";
-  pyproject = true;
-
-  disabled = pythonOlder "3.8";
-
-  src = fetchFromGitHub {
-    owner = "bdraco";
-    repo = "aiohttp-fast-url-dispatcher";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-RBS17LhbaAOxFYGjmoEyrq2DCEHeZNpkITPDdCd7Jk0=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --cov=aiohttp_fast_url_dispatcher --cov-report=term-missing:skip-covered" ""
-  '';
-
-  nativeBuildInputs = [ poetry-core ];
-
-  pythonRelaxDeps = [ "aiohttp" ];
-
-  propagatedBuildInputs = [ aiohttp ];
-
-  nativeCheckInputs = [
-    pytest-asyncio
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [ "aiohttp_fast_url_dispatcher" ];
-
-  meta = with lib; {
-    description = "Faster URL dispatcher for aiohttp";
-    homepage = "https://github.com/bdraco/aiohttp-fast-url-dispatcher";
-    changelog = "https://github.com/bdraco/aiohttp-fast-url-dispatcher/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 70d15f3163798..ce467ca80a4bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -245,8 +245,6 @@ self: super: with self; {
 
   aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };
 
-  aiohttp-fast-url-dispatcher = callPackage ../development/python-modules/aiohttp-fast-url-dispatcher { };
-
   aiohttp-fast-zlib = callPackage ../development/python-modules/aiohttp-fast-zlib { };
 
   aiohttp-isal = callPackage ../development/python-modules/aiohttp-isal { };

From 897b706a94651545c3e3ee3d37269bf5e2ef4a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 14:26:26 +0200
Subject: [PATCH 271/342] python312Packages.anova-wifi: 0.17.0 -> 0.17.1

Diff: https://github.com/Lash-L/anova_wifi/compare/refs/tags/v0.17.0...v0.17.1

Changelog: https://github.com/Lash-L/anova_wifi/releases/tag/v0.17.1

Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 .../development/python-modules/anova-wifi/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix
index 500abc063035a..85b0e10818579 100644
--- a/pkgs/development/python-modules/anova-wifi/default.nix
+++ b/pkgs/development/python-modules/anova-wifi/default.nix
@@ -8,11 +8,12 @@
   sensor-state-data,
   pytestCheckHook,
   pytest-asyncio,
+  pytest-cov-stub,
 }:
 
 buildPythonPackage rec {
   pname = "anova-wifi";
-  version = "0.17.0";
+  version = "0.17.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,14 +22,9 @@ buildPythonPackage rec {
     owner = "Lash-L";
     repo = "anova_wifi";
     rev = "refs/tags/v${version}";
-    hash = "sha256-F/bd5BtHpF3778eoK0QBaSmdTOpLlz+fixCYR74BRZw=";
+    hash = "sha256-TRiv5ljdVqc4qeX+fSH+aTDf5UyNII8/twlNx3KC6oI=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "--cov=anova_wifi --cov-report=term-missing:skip-covered" ""
-  '';
-
   build-system = [ poetry-core ];
 
   dependencies = [
@@ -39,6 +35,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
+    pytest-cov-stub
   ];
 
   disabledTests = [

From 7faa8c73b7bf65a1d7b765ecb2bdcb16bf5e4003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 05:52:04 -0700
Subject: [PATCH 272/342] python312Packages.doorbirdpy: fix tests with aiohttp
 3.10

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

diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix
index 6ec81ea67fbe1..49884c421b7b7 100644
--- a/pkgs/development/python-modules/doorbirdpy/default.nix
+++ b/pkgs/development/python-modules/doorbirdpy/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
+  fetchpatch2,
   setuptools,
   aiohttp,
   aioresponses,
@@ -21,6 +22,15 @@ buildPythonPackage rec {
     hash = "sha256-6B4EMK41vEpmLoQLD+XN9yStLdxyHHk/Mym9J0o7Qvc=";
   };
 
+  patches = [
+    # https://gitlab.com/klikini/doorbirdpy/-/merge_requests/15
+    (fetchpatch2 {
+      name = "aiohttp-3.10-compat.patch";
+      url = "https://gitlab.com/klikini/doorbirdpy/-/commit/91f417433be36a0c9d2baaf0d6ff1a45042f94eb.patch";
+      hash = "sha256-b/ORH6ygkiBreWYTH7rP8b68HlFUEyLQCzVo1KLffPQ=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ aiohttp ];

From 687ed7e5f6922e969e4dcdae1a085c8c52dde6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 13:14:24 -0700
Subject: [PATCH 273/342] python312Packages.pyoverkiz: fix tests with aiohttp
 3.10

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

diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index bca06fd41de6a..0cc34cdc4b0bf 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -37,6 +37,12 @@ buildPythonPackage rec {
       excludes = [ "poetry.lock" ];
       hash = "sha256-KzagDvljkKoUJT+41o7Jv5OPLpPXQDeGmz3O/HOk1YQ=";
     })
+    # https://github.com/iMicknl/python-overkiz-api/pull/1326
+    (fetchpatch2 {
+      name = "aiohttp-3.10-compat.patch";
+      url = "https://github.com/iMicknl/python-overkiz-api/commit/f745c0a9cd654579135624aa472723f85d301aed.patch";
+      hash = "sha256-FXyWLnbu0Kqe/dWrWdi4cvyttDQqexhHo0nTumfUo4g=";
+    })
   ];
 
   build-system = [ poetry-core ];

From bbcd536c502d1769c3fcaa25c34726f7c3cde5c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 13:38:42 -0700
Subject: [PATCH 274/342] python312Packages.py17track: drop

---
 .../python-modules/py17track/default.nix      | 73 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 pkgs/development/python-modules/py17track/default.nix

diff --git a/pkgs/development/python-modules/py17track/default.nix b/pkgs/development/python-modules/py17track/default.nix
deleted file mode 100644
index e0ddc1e17666f..0000000000000
--- a/pkgs/development/python-modules/py17track/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  lib,
-  aiohttp,
-  aresponses,
-  attrs,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  poetry-core,
-  pytest-asyncio,
-  pytestCheckHook,
-  pythonOlder,
-  pytz,
-}:
-
-buildPythonPackage rec {
-  pname = "py17track";
-  version = "2021.12.2";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = "bachya";
-    repo = pname;
-    rev = version;
-    hash = "sha256-T0Jjdu6QC8rTqZwe4cdsBbs0hQXUY6CkrImCgYwWL9o=";
-  };
-
-  patches = [
-    # This patch removes references to setuptools and wheel that are no longer
-    # necessary and changes poetry to poetry-core, so that we don't need to add
-    # unnecessary nativeBuildInputs.
-    #
-    #   https://github.com/bachya/py17track/pull/80
-    #
-    (fetchpatch {
-      name = "clean-up-build-dependencies.patch";
-      url = "https://github.com/bachya/py17track/commit/3b52394759aa50c62e2a56581e30cdb94003e2f1.patch";
-      hash = "sha256-iLgklhEZ61rrdzQoO6rp1HGZcqLsqGNitwIiPNLNHQ4=";
-    })
-  ];
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
-    aiohttp
-    attrs
-    pytz
-  ];
-
-  __darwinAllowLocalNetworking = true;
-
-  nativeCheckInputs = [
-    aresponses
-    pytest-asyncio
-    pytestCheckHook
-  ];
-
-  disabledTestPaths = [
-    # Ignore the examples directory as the files are prefixed with test_
-    "examples/"
-  ];
-
-  pythonImportsCheck = [ "py17track" ];
-
-  meta = with lib; {
-    description = "Python library to track package info from 17track.com";
-    homepage = "https://github.com/bachya/py17track";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 385a851fa1476..de41a8a1e98b7 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -381,6 +381,7 @@ mapAliases ({
   pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13
   py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07
   py_stringmatching = py-stringmatching; # added 2023-11-12
+  py17track = throw "py17track was removed because Home Assistant switched to pyseventeentrack"; # added 2024-08-08
   pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02
   pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
   pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce467ca80a4bc..884a7cf6f4976 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10952,8 +10952,6 @@ self: super: with self; {
 
   py-zabbix = callPackage ../development/python-modules/py-zabbix { };
 
-  py17track = callPackage ../development/python-modules/py17track { };
-
   py2bit = callPackage ../development/python-modules/py2bit { };
 
   py3buddy = callPackage ../development/python-modules/py3buddy { };

From b104afe688863bed3437a0597ddcf7e989998900 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 02:32:12 +0200
Subject: [PATCH 275/342] python312Packages.boto3: 1.34.129 -> 1.34.131

https://github.com/boto/boto3/blob/1.34.129/CHANGELOG.rst
---
 pkgs/development/python-modules/boto3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index e6accaddef6e0..f6998d6400a26 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "boto";
     repo = "boto3";
     rev = "refs/tags/${version}";
-    hash = "sha256-1qnWJjYsDc70VkHYbKt0X26f0f4TugqMiS1FeaPjhq4=";
+    hash = "sha256-fiUguOzNF9T3CcGD1mYl2b5QFbvBG8wNOd3Or2NR66E=";
   };
 
   nativeBuildInputs = [

From 4f1600f97d478ad63eb789274ce781f5aa548c15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 02:34:09 +0200
Subject: [PATCH 276/342] python312Packages.botocore: 1.34.129 -> 1.34.131

https://github.com/boto/botocore/blob/1.34.131/CHANGELOG.rst
---
 pkgs/development/python-modules/botocore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 3eaade127cfe7..68a1ae7c68dce 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.34.129"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.34.131"; # N.B: if you change this, change boto3 and awscli to a matching version
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fFbiWvYRLWnF0UoVtC92unaHaHq8RjqWrF7coZwKnC0=";
+    hash = "sha256-UC3a/h1if88eTAB8hkVOXdAR26fFi9jopTaKefPjh9w=";
   };
 
   pythonRelaxDeps = [ "urllib3" ];

From 47ceed47b120dcf5c33b646e808024ddafb0c1b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 02:36:44 +0200
Subject: [PATCH 277/342] python312Packages.aiobotocore: 2.13.0 -> 2.13.1

https://github.com/aio-libs/aiobotocore/releases/tag/2.13.1
---
 pkgs/development/python-modules/aiobotocore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index 4a7ced69d970d..75fa1cc5b5dc8 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "aiobotocore";
-  version = "2.13.0";
+  version = "2.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "aio-libs";
     repo = "aiobotocore";
     rev = "refs/tags/${version}";
-    hash = "sha256-8fsZCmzjM6JlX3HoRGt7zsezYIXnv411kkHG8rJqMuY=";
+    hash = "sha256-tSxCRms/YstYXWCJWirzhf87ZH4WUav/n7QfMvBwj2s=";
   };
 
   # Relax version constraints: aiobotocore works with newer botocore versions

From c7268a2aa9efb0230e4066d0ffa3ed9332deb549 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 02:38:36 +0200
Subject: [PATCH 278/342] awscli: 1.33.11 -> 1.33.13

https://github.com/aws/aws-cli/blob/1.33.13/CHANGELOG.rst
---
 pkgs/tools/admin/awscli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index f3e5fc97e3237..d7fc15a173cf3 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -13,12 +13,12 @@ let
     pname = "awscli";
     # N.B: if you change this, change botocore and boto3 to a matching version too
     # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py
-    version = "1.33.11";
+    version = "1.33.13";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-Q8qtGChOnscOm7m3s7bWwUFmrUwMua9N6uz1Lyc8QIY=";
+      hash = "sha256-utRALEoP+CWlmkPnbgByFSSX9Nr39iyTdv5uABT6Kps=";
     };
 
     pythonRelaxDeps = [

From 84a940056470c81cf80777ea87ee408ecfe48cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 9 Aug 2024 15:58:37 +0200
Subject: [PATCH 279/342] postgresql_12: 12.19 -> 12.20

https://www.postgresql.org/support/security/CVE-2024-7348/
Fixes CVE-2024-7348
---
 pkgs/servers/sql/postgresql/12.nix      |  4 ++--
 pkgs/servers/sql/postgresql/generic.nix | 19 +------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/12.nix b/pkgs/servers/sql/postgresql/12.nix
index 74098e91f2eb2..42e8ef960d422 100644
--- a/pkgs/servers/sql/postgresql/12.nix
+++ b/pkgs/servers/sql/postgresql/12.nix
@@ -1,4 +1,4 @@
 import ./generic.nix {
-  version = "12.19";
-  hash = "sha256-YX495Swi6CL09X0B1bIkBQPhmKnsyvWYqFEQm9GOb7s=";
+  version = "12.20";
+  hash = "sha256-LVQ68wCf7H/VrzX3pwyVCF0+72tQjlF6qUk+mbFenqk=";
 }
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 907646dc722bc..61ffe38d8999e 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -19,7 +19,7 @@ let
       , version, hash, muslPatches ? {}
 
       # for tests
-      , testers, nixosTests
+      , testers
 
       # JIT
       , jitSupport
@@ -119,23 +119,6 @@ let
         src = ./patches/locale-binary-path.patch;
         locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
       })
-
-      (
-        if atLeast "16" then
-          fetchpatch {
-            name = "libxml2-2.13-compat.patch";
-            # This one is for 16 branch upstream.
-            url = "https://github.com/postgres/postgres/commit/f85c91a1867b45742bb28e4578ca2b4a0976383f.diff";
-            hash = "sha256-4YcXfo98uVuCu+ybVw3bM4x8Y0I1xfjdjBZOlhyF21w=";
-          }
-        else
-          fetchpatch {
-            name = "libxml2-2.13-compat.patch";
-            # This one is for 15 branch upstream, but it also applies well to all our older branches.
-            url = "https://github.com/postgres/postgres/commit/f68d6aabb7e2c803818185b49a3d356bdb2b2974.diff";
-            hash = "sha256-Nelb0mbjx0Xq9UJuVv7cs3ifCtUPP7UZraPMPGb2wyQ=";
-          }
-      )
     ] ++ lib.optionals stdenv'.hostPlatform.isMusl (
       # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
       map fetchurl (lib.attrValues muslPatches)

From e9fbb584eaba9bf296f45ee80d6b6d084ce2564c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 9 Aug 2024 15:59:21 +0200
Subject: [PATCH 280/342] postgresql_13: 13.15 -> 13.16

https://www.postgresql.org/support/security/CVE-2024-7348/
Fixes CVE-2024-7348
---
 pkgs/servers/sql/postgresql/13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix
index 6347ad1572168..ad55c9a55805d 100644
--- a/pkgs/servers/sql/postgresql/13.nix
+++ b/pkgs/servers/sql/postgresql/13.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "13.15";
-  hash = "sha256-Qu3UFURtM7jCQr520a0FdTGyJksuhpOTObcHXG5OySU=";
+  version = "13.16";
+  hash = "sha256-ycu7YSnwIyggSCgGa7N4XACoXIyo/TKcKopTwfXNiGU=";
   muslPatches = {
     disable-test-collate-icu-utf8 = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";

From 592b5577edf1545e59e8fba7f9785a0fcc8e99c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 9 Aug 2024 15:59:57 +0200
Subject: [PATCH 281/342] postgresql_14: 14.12 -> 14.13

https://www.postgresql.org/support/security/CVE-2024-7348/
Fixes CVE-2024-7348
---
 pkgs/servers/sql/postgresql/14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix
index 1b4827bcb7324..91341a3bd1f7c 100644
--- a/pkgs/servers/sql/postgresql/14.nix
+++ b/pkgs/servers/sql/postgresql/14.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "14.12";
-  hash = "sha256-YRjQj53cwb2Dzyt8x007WDvc7C835iRaisADuPqoCSM=";
+  version = "14.13";
+  hash = "sha256-Wao8S0lasmqexp860KAijFHw/m+s82NN+tTRGX1hOlY=";
   muslPatches = {
     disable-test-collate-icu-utf8 = {
       url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";

From 47ed51b9598738225295a6e1a1b07dfa4605ce42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 9 Aug 2024 16:00:54 +0200
Subject: [PATCH 282/342] postgresql_15: 15.7 -> 15.8

https://www.postgresql.org/support/security/CVE-2024-7348/
Fixes CVE-2024-7348
---
 pkgs/servers/sql/postgresql/15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix
index a9bde7fd0e673..63f4928401ac6 100644
--- a/pkgs/servers/sql/postgresql/15.nix
+++ b/pkgs/servers/sql/postgresql/15.nix
@@ -1,4 +1,4 @@
 import ./generic.nix {
-  version = "15.7";
-  hash = "sha256-pG/klIWrY4Xjnau7tlT10wSSBvds1pXiJCaHKVIJmPc=";
+  version = "15.8";
+  hash = "sha256-RANRX5pp7rPv68mPMLjGlhIr/fiV6Ss7I/W452nty2o=";
 }

From 632c9dd1c1876c311547ba4feea2cf7b90c57406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 9 Aug 2024 16:01:15 +0200
Subject: [PATCH 283/342] postgresql_16: 16.3 -> 16.4

https://www.postgresql.org/support/security/CVE-2024-7348/
Fixes CVE-2024-7348
---
 pkgs/servers/sql/postgresql/16.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix
index c964fc5800c85..569ef4b9e08b0 100644
--- a/pkgs/servers/sql/postgresql/16.nix
+++ b/pkgs/servers/sql/postgresql/16.nix
@@ -1,4 +1,4 @@
 import ./generic.nix {
-  version = "16.3";
-  hash = "sha256-Mxlj1dPcTK9CFqBJ+kC2bWvLjHMGFYWUEblRh2TmBYU=";
+  version = "16.4";
+  hash = "sha256-lxdm1kWqc+k7nvTjvkQgG09FtUdwlbBJElQD+fM4bW8=";
 }

From bcad32bbf3059ff6b97a147381efac5a5872b444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 9 Aug 2024 09:00:42 -0700
Subject: [PATCH 284/342] python312Packages.ihcsdk: init at 2.8.6

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

diff --git a/pkgs/development/python-modules/ihcsdk/default.nix b/pkgs/development/python-modules/ihcsdk/default.nix
new file mode 100644
index 0000000000000..7750e89c27fae
--- /dev/null
+++ b/pkgs/development/python-modules/ihcsdk/default.nix
@@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  cryptography,
+  fetchFromGitHub,
+  lib,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ihcsdk";
+  version = "2.8.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dingusdk";
+    repo = "PythonIhcSdk";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-0meYr/SywtRfp/TBW3t8QUMlenb5KnzvKfn6c7Przpc=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cryptography
+    requests
+  ];
+
+  pythonImportsCheck = [ "ihcsdk" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/dingusdk/PythonIhcSdk/releases/tag/v${version}";
+    description = "SDK for connection to the LK IHC Controller";
+    homepage = "https://github.com/dingusdk/PythonIhcSdk";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2db166c95e910..3d4d2d4e588aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5866,6 +5866,8 @@ self: super: with self; {
     inherit (pkgs) igraph;
   };
 
+  ihcsdk = callPackage ../development/python-modules/ihcsdk { };
+
   ihm = callPackage ../development/python-modules/ihm { };
 
   iisignature = callPackage ../development/python-modules/iisignature { };

From 16edb5b31698b83f1b6595545b60fa0a37f1308f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 9 Aug 2024 09:01:52 -0700
Subject: [PATCH 285/342] home-assistant: support ihc component

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2d3494cb284aa..c00b128d24515 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2014,7 +2014,8 @@
     ];
     "ihc" = ps: with ps; [
       defusedxml
-    ]; # missing inputs: ihcsdk
+      ihcsdk
+    ];
     "image" = ps: with ps; [
     ];
     "image_processing" = ps: with ps; [

From 304da313a6762db4c3d9fc75e876a71051ff5040 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Aug 2024 18:54:04 +0200
Subject: [PATCH 286/342] python312Packages.openhomedevice: 2.3 -> 2.3.1

https://github.com/bazwilliams/openhomedevice/releases/tag/2.3.1
---
 .../python-modules/openhomedevice/default.nix          | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix
index eba21e895985d..b5f60e5652623 100644
--- a/pkgs/development/python-modules/openhomedevice/default.nix
+++ b/pkgs/development/python-modules/openhomedevice/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "openhomedevice";
-  version = "2.3";
+  version = "2.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "bazwilliams";
     repo = "openhomedevice";
     rev = "refs/tags/${version}";
-    hash = "sha256-q8UG+PYtJ7lLlnw2Rt5O/SxOrUtYmwO1cEG1WocaQ7M=";
+    hash = "sha256-u05aciRFCnqMJRClUMApAPDLpXOKn4wUTLgvR7BVZTA=";
   };
 
   build-system = [ setuptools ];
@@ -36,12 +36,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # https://github.com/bazwilliams/openhomedevice/issues/23
-    "test_two"
-    "test_three"
-  ];
-
   pythonImportsCheck = [ "openhomedevice" ];
 
   pytestFlagsArray = [ "tests/*.py" ];

From 6a727db79955ca9420d95ca0f76b4261add82bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 9 Aug 2024 09:55:14 -0700
Subject: [PATCH 287/342] python312Packages.webmin-xmlrpc: init at 0.0.2

---
 .../python-modules/webmin-xmlrpc/default.nix  | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/webmin-xmlrpc/default.nix

diff --git a/pkgs/development/python-modules/webmin-xmlrpc/default.nix b/pkgs/development/python-modules/webmin-xmlrpc/default.nix
new file mode 100644
index 0000000000000..4735007ab7228
--- /dev/null
+++ b/pkgs/development/python-modules/webmin-xmlrpc/default.nix
@@ -0,0 +1,37 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "webmin-xmlrpc";
+  version = "0.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "autinerd";
+    repo = "webmin-xmlrpc";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qCS5YV3o7ozO7fDaJucQvU0dEyTbxTivtTDKQVY4pkM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "webmin_xmlrpc" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/autinerd/webmin-xmlrpc/releases/tag/${version}";
+    description = "Python interface to interact with the Webmin XML-RPC API";
+    homepage = "https://github.com/autinerd/webmin-xmlrpc";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2db166c95e910..129c5a205fc5d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17348,6 +17348,8 @@ self: super: with self; {
 
   webexteamssdk = callPackage ../development/python-modules/webexteamssdk { };
 
+  webmin-xmlrpc = callPackage ../development/python-modules/webmin-xmlrpc { };
+
   webob = callPackage ../development/python-modules/webob { };
 
   webrtc-noise-gain = callPackage ../development/python-modules/webrtc-noise-gain { };

From 4bb8a0679006fd7b47327f8071b8a7e7b13661ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 9 Aug 2024 09:56:17 -0700
Subject: [PATCH 288/342] home-assistant: support webmin component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2d3494cb284aa..cd29e68bcc439 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -4956,7 +4956,8 @@
     "webhook" = ps: with ps; [
     ];
     "webmin" = ps: with ps; [
-    ]; # missing inputs: webmin-xmlrpc
+      webmin-xmlrpc
+    ];
     "webostv" = ps: with ps; [
       aiowebostv
     ];
@@ -6058,6 +6059,7 @@
     "weatherflow_cloud"
     "weatherkit"
     "webhook"
+    "webmin"
     "webostv"
     "websocket_api"
     "wemo"

From c4a07c3c0afe821f04d364e5c3ed5ca02f456f8a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 9 Aug 2024 22:38:09 +0100
Subject: [PATCH 289/342] x265: fix build on aarch64

Before the change we enabled arm32 code on arm64 targets.
After the change we have them separate.
---
 pkgs/development/libraries/x265/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index b0d6fc09c709e..e58e910c2bbaa 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -92,10 +92,14 @@ stdenv.mkDerivation rec {
       ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"}
       -DHIGH_BIT_DEPTH=OFF
       -DENABLE_HDR10_PLUS=ON
-      ${mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM"}
+      ${mkFlag (isCross && stdenv.hostPlatform.isAarch32) "CROSS_COMPILE_ARM"}
       ${mkFlag cliSupport "ENABLE_CLI"}
       ${mkFlag unittestsSupport "ENABLE_TESTS"}
     )
+  '' + lib.optionalString isCross ''
+    cmakeFlagsArray+=(
+      ${mkFlag (isCross && stdenv.hostPlatform.isAarch64) "CROSS_COMPILE_ARM64"}
+    )
   '';
 
   # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted

From ce529106b6f37a7ca44b0a022a86d4f9be725200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 9 Aug 2024 12:55:04 -0700
Subject: [PATCH 290/342] warp: fix compilation with Rust 1.80

---
 pkgs/applications/networking/warp/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix
index 0861e72906db7..d7f64031c9693 100644
--- a/pkgs/applications/networking/warp/default.nix
+++ b/pkgs/applications/networking/warp/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, fetchpatch2
 , appstream-glib
 , cargo
 , desktop-file-utils
@@ -33,14 +34,23 @@ stdenv.mkDerivation rec {
     hash = "sha256-GRxZ3y1PdJpBDnGCfmOmZgN8n1aaYf9IhyszRwo3MjQ=";
   };
 
+  patches = [
+    # https://gitlab.gnome.org/World/warp/-/merge_requests/74
+    (fetchpatch2 {
+      name = "rust-1.80-compat.patch";
+      url = "https://gitlab.gnome.org/World/warp/-/commit/38747cc2dde79089df53fd8451ea2db13f9f3714.patch";
+      hash = "sha256-9P5LwCHaC6J5WR2OnjCaNE+4de/Jv6XGXS7bOfYrM7w=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs build-aux
   '';
 
   cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
+    inherit src patches;
     name = "${pname}-${version}";
-    hash = "sha256-v/MhVcQmMYD/n/8wmPCYUy4YpXhL0v4fq8h6cllo/pw=";
+    hash = "sha256-xF9AzcO2uawHu7XZay7Wwr2r+OVLbXhfSynnBYbVkZM=";
   };
 
   nativeBuildInputs = [

From 1a81720273e0c28985ef24a4ec7ae6741a5f5fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 10 Aug 2024 03:57:43 -0700
Subject: [PATCH 291/342] python312Packages.heatmiserv3: init at 2.0.3

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

diff --git a/pkgs/development/python-modules/heatmiserv3/default.nix b/pkgs/development/python-modules/heatmiserv3/default.nix
new file mode 100644
index 0000000000000..5d7ed86f225bc
--- /dev/null
+++ b/pkgs/development/python-modules/heatmiserv3/default.nix
@@ -0,0 +1,46 @@
+{
+  appdirs,
+  buildPythonPackage,
+  fetchFromGitHub,
+  importlib-resources,
+  lib,
+  poetry-core,
+  pyserial,
+  pyserial-asyncio,
+  pytestCheckHook,
+  pyyaml,
+}:
+
+buildPythonPackage rec {
+  pname = "heatmiserv3";
+  version = "2.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "andylockran";
+    repo = "heatmiserV3";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Ia0QUMDvuvn2af52lW7ObSQ9MSPNOgWyBuFBnqfYrpM=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    appdirs
+    importlib-resources
+    pyserial
+    pyserial-asyncio
+    pyyaml
+  ];
+
+  pythonImportsCheck = [ "heatmiserv3" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Library to interact with Heatmiser Themostats using V3 protocol";
+    homepage = "https://github.com/andylockran/heatmiserV3";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a0f13357230c..d2353ec66bf6b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5503,6 +5503,8 @@ self: super: with self; {
 
   heapdict = callPackage ../development/python-modules/heapdict { };
 
+  heatmiserv3 = callPackage ../development/python-modules/heatmiserv3 { };
+
   heatshrink2 = callPackage ../development/python-modules/heatshrink2 { };
 
   heatzypy = callPackage ../development/python-modules/heatzypy { };

From 56cb0af4f2386df6cdb27f17692c5b8112848235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 10 Aug 2024 03:58:43 -0700
Subject: [PATCH 292/342] home-assistant: support heatmiser component

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2d3494cb284aa..001424376a1d5 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1708,7 +1708,8 @@
       pycec
     ];
     "heatmiser" = ps: with ps; [
-    ]; # missing inputs: heatmiserV3
+      heatmiserv3
+    ];
     "heiwa" = ps: with ps; [
     ];
     "heos" = ps: with ps; [

From 2d426e13972d2efc02878d734cc5bd9aeeff76d9 Mon Sep 17 00:00:00 2001
From: Producer Matt <58014742+ProducerMatt@users.noreply.github.com>
Date: Fri, 9 Aug 2024 19:48:42 -0500
Subject: [PATCH 293/342] rsbkb: patch time crate for Rust 1.80

---
 pkgs/tools/text/rsbkb/default.nix | 11 ++++++++---
 pkgs/tools/text/rsbkb/time.patch  | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/text/rsbkb/time.patch

diff --git a/pkgs/tools/text/rsbkb/default.nix b/pkgs/tools/text/rsbkb/default.nix
index c107739d704b1..5da4d8dd2a345 100644
--- a/pkgs/tools/text/rsbkb/default.nix
+++ b/pkgs/tools/text/rsbkb/default.nix
@@ -4,9 +4,11 @@
 , enableAppletSymlinks ? true
 }:
 
-rustPlatform.buildRustPackage rec {
-  pname = "rsbkb";
+let
   version = "1.4";
+in rustPlatform.buildRustPackage {
+  pname = "rsbkb";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "trou";
@@ -15,7 +17,10 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-c5+Q/y2tZfhXQIAs1W67/xfB+qz1Xn33tKXRGDAi3qs=";
   };
 
-  cargoHash = "sha256-kGxYH3frBcmvBCFeF2oxAS4FALcmnRyCH1fi0NF0wSo=";
+  cargoPatches = [
+    ./time.patch
+  ];
+  cargoHash = "sha256-jRkwfIEB9DEzoV5xogTDz1cHfdsvLM6E27E7hQBa9JY=";
 
   # Setup symlinks for all the utilities,
   # busybox style
diff --git a/pkgs/tools/text/rsbkb/time.patch b/pkgs/tools/text/rsbkb/time.patch
new file mode 100644
index 0000000000000..0ff4f3aa6a2e5
--- /dev/null
+++ b/pkgs/tools/text/rsbkb/time.patch
@@ -0,0 +1,28 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index a23d825..183db77 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -564,9 +564,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+@@ -587,9 +587,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+  "num-conv",
+  "time-core",

From 436aff40827c2105ec43c195a39d03a35d6ec891 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 21:28:13 +0200
Subject: [PATCH 294/342] python312Packages.zigpy: 0.65.2 -> 0.65.3

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

diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index c6df4fb89f42b..c86a79435d28a 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.65.2";
+  version = "0.65.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-rNqo4NtIdg9MoOKde26/RUcfX/VYiVkNj97v/RJcB4E=";
+    hash = "sha256-zE8Hqha1yv7OsaXYrKzf3o2JLO/RcDSAxixWoMj2T3M=";
   };
 
   postPatch = ''

From ab3fd33275eb4e4500417e0ef01a51e8ebcaf531 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 21:28:51 +0200
Subject: [PATCH 295/342] python312Packages.bellows: 0.40.2 -> 0.40.3

https://github.com/zigpy/bellows/releases/tag/0.40.3
---
 pkgs/development/python-modules/bellows/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index 444a1ae8eb9e7..d70fc9204241a 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "bellows";
-  version = "0.40.2";
+  version = "0.40.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "bellows";
     rev = "refs/tags/${version}";
-    hash = "sha256-pcyvJsAFJCm6mpGvfWp6WUzdn2Z7Fr2G6B5uEXZDhIg=";
+    hash = "sha256-JGc5jDvEZtYyYAExRnN1K5hDY3ioS3+mm7jMrR0RyXk=";
   };
 
   postPatch = ''

From 6b652446fe79518133b764c5d25192d0ab95a431 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 21:34:35 +0200
Subject: [PATCH 296/342] python312Packages.zigpy-xbee: 0.20.1 -> 0.20.2

https://github.com/zigpy/zigpy-xbee/releases/tag/0.20.2
---
 pkgs/development/python-modules/zigpy-xbee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index 0c627694f7d3f..0a3c11635f488 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-xbee";
-  version = "0.20.1";
+  version = "0.20.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy-xbee";
     rev = "refs/tags/${version}";
-    hash = "sha256-H0rs4EOzz2Nx5YuwqTZp2FGF1z2phBgSIyraKHHx4RA=";
+    hash = "sha256-d5TOX2sKA2E6b6KHvAdhxEknD6fOF4qRjCMpBKEsicA=";
   };
 
   postPatch = ''

From 00e059756651de766aa67556f1600c2dec698ce9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 21:39:25 +0200
Subject: [PATCH 297/342] python312Packages.zigpy-deconz: fix tests with zigpy
 0.65.3

---
 pkgs/development/python-modules/zigpy-deconz/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix
index 83fae1faddba9..04b8efb6f27f3 100644
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   pyserial,
   pyserial-asyncio,
   pytest-asyncio,
@@ -25,6 +26,13 @@ buildPythonPackage rec {
     hash = "sha256-z/QulOkvkV/1Z+M7EfzdfGvrrtkapYcvfz+3AijR46k=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/zigpy/zigpy-deconz/commit/86fdcd6be824f12ce3bf88b40217a6224cbf5a89.patch";
+      hash = "sha256-iqpTSJPBMSBZXg5EVXXupxIFRsGCNuxU/oNHZ2VT0Jc=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace ', "setuptools-git-versioning<2"' "" \

From 247b77874e27c111befb98111ffc7f41b87a9730 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 22:09:45 +0200
Subject: [PATCH 298/342] python312Packages.zha-quirks: fix test with zigpy
 0.65.3

---
 .../python-modules/zha-quirks/default.nix            |  5 +++++
 .../zha-quirks/zigpy-0.65.3-compat.patch             | 12 ++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/python-modules/zha-quirks/zigpy-0.65.3-compat.patch

diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 6d96954257ce7..17d50b428b7a6 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -24,6 +24,11 @@ buildPythonPackage rec {
     hash = "sha256-LudwIENP1KCX7+HwyklCUdAu5mRLDcnMEZBzbRH2FM0=";
   };
 
+  patches = [
+    # https://github.com/zigpy/zha-device-handlers/pull/3296
+    ./zigpy-0.65.3-compat.patch
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail ', "setuptools-git-versioning<2"' "" \
diff --git a/pkgs/development/python-modules/zha-quirks/zigpy-0.65.3-compat.patch b/pkgs/development/python-modules/zha-quirks/zigpy-0.65.3-compat.patch
new file mode 100644
index 0000000000000..0c1f573ae4334
--- /dev/null
+++ b/pkgs/development/python-modules/zha-quirks/zigpy-0.65.3-compat.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/conftest.py b/tests/conftest.py
+index e64beb2..c1f0785 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -88,7 +88,6 @@ class MockApp(zigpy.application.ControllerApplication):
+ def app_controller_mock():
+     """App controller mock."""
+     config = {"device": {"path": "/dev/ttyUSB0"}, "database": None}
+-    config = MockApp.SCHEMA(config)
+     app = MockApp(config)
+     return app
+ 

From c98b7e4011447139012ac285fa047712d4e9e1ec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 22:46:03 +0200
Subject: [PATCH 299/342] python312Packages.zigpy-znp: disable tests

They are not compatible with zigpy 0.65.3.
---
 .../python-modules/zigpy-znp/default.nix           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index c4953c39ab0f1..98a7661f04839 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -31,16 +31,16 @@ buildPythonPackage rec {
     hash = "sha256-5DuqM7MgntV/3WquR+0Cr/vIwYL35ZVpGlNZPj92jJ4=";
   };
 
-  nativeBuildInputs = [ setuptools ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "timeout = 20" "timeout = 300" \
-      --replace ', "setuptools-git-versioning<2"' "" \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
+      --replace-fail "timeout = 20" "timeout = 300" \
+      --replace-fail ', "setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     async-timeout
     coloredlogs
     jsonschema
@@ -48,6 +48,8 @@ buildPythonPackage rec {
     zigpy
   ];
 
+  doCheck = false; # tests are not compatible with zigpy 0.65.3
+
   nativeCheckInputs = [
     pytest-asyncio
     pytest-mock

From 9c54afb733a421dba2bda7cf9cb075eadbb86e21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 22:49:53 +0200
Subject: [PATCH 300/342] python312Packages.zha: unrelax various critical deps

These need to match the pinned version, or functionality will break.
---
 pkgs/development/python-modules/zha/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index c909669a329fa..c186ed1bd3bf1 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -45,14 +45,9 @@ buildPythonPackage rec {
   '';
 
   pythonRelaxDeps = [
-    "bellows"
     "pyserial-asyncio-fast"
-    "universal-silabs-flasher"
-    "zha-quirks"
-    "zigpy"
   ];
 
-
   build-system = [
     setuptools
     wheel

From 89b36233a6d597106bb074aa3fd645cced32b3b8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 20:14:17 +0200
Subject: [PATCH 301/342] python312Packages.zha: 0.0.28 -> 0.0.30

https://github.com/zigpy/zha/releases/tag/0.0.30
---
 pkgs/development/python-modules/zha/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index c186ed1bd3bf1..c83e3fb93201b 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -4,6 +4,7 @@
   bellows,
   buildPythonPackage,
   fetchFromGitHub,
+  freezegun,
   pyserial,
   pyserial-asyncio,
   pyserial-asyncio-fast,
@@ -26,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "zha";
-  version = "0.0.28";
+  version = "0.0.30";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -35,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha";
     rev = "refs/tags/${version}";
-    hash = "sha256-qsX62k/KeQ2ZTUHAv2ieZxOFh9dNFnLx0ZZOZCvI3ZE=";
+    hash = "sha256-4Fpe1us/GS2QVJbbnMcI7bziyW5P2kuJ6+p5L9N7lMY=";
   };
 
   postPatch = ''
@@ -70,6 +71,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    freezegun
     pytest-asyncio
     pytest-timeout
     pytest-xdist

From e518b7e067f729569d1687a34819cb92bebd39c1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 20:15:26 +0200
Subject: [PATCH 302/342] python312Packages.pydaikin: 2.13.1 -> 2.13.2

https://github.com/fredrike/pydaikin/releases/tag/v2.13.2
---
 pkgs/development/python-modules/pydaikin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix
index 407bc398f9b6e..e19269637f97b 100644
--- a/pkgs/development/python-modules/pydaikin/default.nix
+++ b/pkgs/development/python-modules/pydaikin/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pydaikin";
-  version = "2.13.1";
+  version = "2.13.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "fredrike";
     repo = "pydaikin";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UOHNMYcgf8NYwbmr+YcCKZvcrXnz38VKxLAYnpoKiVo=";
+    hash = "sha256-eq6QE5yYPb9y7bNJwk3sLQp7Pw0PtWn2T/6J+ICfPsY=";
   };
 
   build-system = [ setuptools ];

From cfdd1e833bd2b74d5e279552eaa68c222df86ae1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 20:16:17 +0200
Subject: [PATCH 303/342] python312Packages.python-homewizard-energy: 6.1.1 ->
 6.2.0

https://github.com/homewizard/python-homewizard-energy/releases/tag/v6.2.0
---
 .../python-modules/python-homewizard-energy/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix
index 885f58a598772..ef4d79dfda882 100644
--- a/pkgs/development/python-modules/python-homewizard-energy/default.nix
+++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "python-homewizard-energy";
-  version = "6.1.1";
+  version = "6.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "DCSBL";
     repo = "python-homewizard-energy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DIDHUyos2XScoYZfI3o33UN2R0J/Xc2/JQvtzCXZTts=";
+    hash = "sha256-CSX2iLjOJRW2dxcE9JhK2A8QlvVUxYE2C6MZFPg370c=";
   };
 
   postPatch = ''

From 20d0ebedcedc0024344b1249483a4c4a98089120 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 20:16:45 +0200
Subject: [PATCH 304/342] python312Packages.airgradient: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix
index 02a642b98beef..c735c1c7cd842 100644
--- a/pkgs/development/python-modules/airgradient/default.nix
+++ b/pkgs/development/python-modules/airgradient/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "airgradient";
-  version = "0.7.1";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "airgradienthq";
     repo = "python-airgradient";
     rev = "refs/tags/v${version}";
-    hash = "sha256-EFt2V+r7RLiFMihFCCBU9iEPcbSybK6gP+uxed+mIeo=";
+    hash = "sha256-NONOfM61oCtiNgmKCXvkEvCzSjumwjaeuzg9l/7hX8M=";
   };
 
   postPatch = ''

From fe2b321deb9eeca316a572c31e711c45890c800c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 20:56:01 +0200
Subject: [PATCH 305/342] python312Packages.airgradient: use pytest-cov-stub

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

diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix
index c735c1c7cd842..2eed753ffa906 100644
--- a/pkgs/development/python-modules/airgradient/default.nix
+++ b/pkgs/development/python-modules/airgradient/default.nix
@@ -8,6 +8,7 @@
   orjson,
   poetry-core,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   syrupy,
@@ -28,11 +29,6 @@ buildPythonPackage rec {
     hash = "sha256-NONOfM61oCtiNgmKCXvkEvCzSjumwjaeuzg9l/7hX8M=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "--cov" ""
-  '';
-
   build-system = [ poetry-core ];
 
   dependencies = [
@@ -45,6 +41,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aioresponses
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
     syrupy
   ];

From 579125c431448b7b91bc73967ff1c0fec7481f29 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 20:17:51 +0200
Subject: [PATCH 306/342] python312Packages.dio-chacon-wifi-api: 1.1.0 -> 1.2.0

https://github.com/cnico/dio-chacon-wifi-api/compare/v1.1.0...v1.2.0
---
 .../python-modules/dio-chacon-wifi-api/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix b/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
index 3544725132b92..bc9bcd1f669b3 100644
--- a/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
+++ b/pkgs/development/python-modules/dio-chacon-wifi-api/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "dio-chacon-wifi-api";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cnico";
     repo = "dio-chacon-wifi-api";
     rev = "v${version}";
-    hash = "sha256-TeunMvkiQw4TzLb2dsAHAg49nUzD3DGiO0DuXKGcICU=";
+    hash = "sha256-iIDBHyZuI9qNLRmTY0nXOl5wplFKDoiKkqQb1m4uIxs=";
   };
 
   build-system = [ poetry-core ];

From 73ec744560894022fb2d3f9f2fa50125d3ca4e3f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 20:19:58 +0200
Subject: [PATCH 307/342] home-assistant: 2024.8.0 -> 2024.8.1

https://github.com/home-assistant/core/releases/tag/2024.8.1
---
 .../home-assistant/component-packages.nix        |  4 ++--
 pkgs/servers/home-assistant/default.nix          | 16 +++-------------
 pkgs/servers/home-assistant/frontend.nix         |  4 ++--
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c049b0f345df8..69be32c120519 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2024.8.0";
+  version = "2024.8.1";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
@@ -645,7 +645,7 @@
     "coautilities" = ps: with ps; [
     ];
     "coinbase" = ps: with ps; [
-    ]; # missing inputs: coinbase
+    ]; # missing inputs: coinbase coinbase-advanced-py
     "color_extractor" = ps: with ps; [
       colorthief
     ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 7de6e78eebd1b..3a67ab47abd26 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -311,16 +311,6 @@ let
         };
       });
 
-      pyopenweathermap = super.pyopenweathermap.overridePythonAttrs (oldAttrs: rec {
-        version = "0.0.10";
-        src = fetchFromGitHub {
-          owner = "freekode";
-          repo = "pyopenweathermap";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-wEcE4IYVvxEwW5Hhz+DqDIqbjd5/O1hEr7dGgiuMI00=";
-        };
-      });
-
       pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec {
         version = "0.8.6";
         src = fetchFromGitHub {
@@ -481,7 +471,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2024.8.0";
+  hassVersion = "2024.8.1";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -499,13 +489,13 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-WGbT53bmyV1d/6GKlv5+bxLmGRqsAHEKbs2halMkPB4=";
+    hash = "sha256-sbXfvlQJRRVkvSRJ8v/Su8us9WnoJUF4odAJrewryco=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-RfTkF8HO5bZCupo5vBLbSG2shr+b31GfDN+iJpH5sc8=";
+    hash = "sha256-VzoH+wrpUAXJRjEZC2x9qjRzTSsiaUm6aI6/uHv6h/4=";
   };
 
   build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index b66a350ad02c8..6a25625374a8b 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20240806.1";
+  version = "20240809.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-tOM1KFffoPoS3FCdytdkwiptdLwKxpZFQJ4VU3i3WN0=";
+    hash = "sha256-PVW/W6/a/kbhbGw35/+AHvjAn1Xq3dW5nslMJWsDgv4=";
   };
 
   # there is nothing to strip in this package

From b444a2eac059420d822febd59fbd02b8700515c6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 23:58:26 +0200
Subject: [PATCH 308/342] home-assistant-component-tests.songpal: provide isal
 dependency

---
 pkgs/servers/home-assistant/tests.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 3e493b7228026..b0e309a6791d3 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -35,6 +35,9 @@ let
     shelly = [
       pyswitchbot
     ];
+    songpal = [
+      isal
+    ];
     tilt_ble = [
       ibeacon-ble
     ];

From 0ec81295fb784e01a60c9bc5fa967e3b2347c5c5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 11 Aug 2024 00:00:20 +0200
Subject: [PATCH 309/342] home-assistant-component-tests.system_log: provide
 isal dependency

---
 pkgs/servers/home-assistant/tests.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index b0e309a6791d3..e13d75356ae42 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -38,6 +38,9 @@ let
     songpal = [
       isal
     ];
+    system_log = [
+      isal
+    ];
     tilt_ble = [
       ibeacon-ble
     ];

From 5e95aa0e32df776b7896f39decf375b95d65a19a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 11 Aug 2024 03:33:43 +0200
Subject: [PATCH 310/342] python312Packages.uiprotect: 5.4.0 -> 6.0.1

https://github.com/uilibs/uiprotect/blob/refs/tags/v6.0.1/CHANGELOG.md
---
 pkgs/development/python-modules/uiprotect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 134e503857def..6580e40e92e33 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -37,7 +37,7 @@
 
 buildPythonPackage rec {
   pname = "uiprotect";
-  version = "5.4.0";
+  version = "6.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     owner = "uilibs";
     repo = "uiprotect";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LwG8X1UHsGL7jw4au2Jeo6pcsnRK23rqB5aFBQRTGmI=";
+    hash = "sha256-2rkXaFzdIOCGF60k7TpqAqTSxFFhmqhY8yKm7cEvgkE=";
   };
 
   postPatch = ''

From acfd3859d759f18d5bfd49d33e78114bf3c8ed65 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 6 Jul 2024 17:08:46 +0200
Subject: [PATCH 311/342] php84Extensions.apcu: fix broken test with PHP 8.4

---
 pkgs/development/php-packages/apcu/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix
index 9cfe9b96cf34d..2e8294d0345bf 100644
--- a/pkgs/development/php-packages/apcu/default.nix
+++ b/pkgs/development/php-packages/apcu/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  fetchpatch,
   pcre2,
   fetchFromGitHub,
 }:
@@ -19,6 +20,22 @@ buildPecl {
     sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ=";
   };
 
+  patches = [
+    # Fix broken test (apc_entry_002) with PHP 8.4 alpha1
+    # See https://github.com/krakjoe/apcu/issues/510
+    (fetchpatch {
+      url = "https://github.com/krakjoe/apcu/commit/9dad016db50cc46321afec592ea9b49520c1cf13.patch";
+      hash = "sha256-8CPUNhEGCVVSXWYridN1+4N4JzCfXZbmUIsPYs/9jfk=";
+    })
+
+    # Fix ZTS detection in tests with PHP 8.4
+    # https://github.com/krakjoe/apcu/pull/511
+    (fetchpatch {
+      url = "https://github.com/krakjoe/apcu/commit/15766e615264620427c2db37061ca9614d3b7319.patch";
+      hash = "sha256-gbSkx47Uo9E28CfJJj4+3ydcw8cXW9NNN/3FuYYTVPY=";
+    })
+  ];
+
   buildInputs = [ pcre2 ];
   doCheck = true;
   checkTarget = "test";

From 872caa237087d82f7651c21e0d91e907bf8a104b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 10 Aug 2024 19:09:38 +0200
Subject: [PATCH 312/342] php.extension.blackfire: Clean up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

0006d8ae77677ad3fab03ededd9eb31846646ea7 switched Linux package to downloading individual `.so` files to match Darwin files so we no longer need special casing for that structure – the path will always be `[«system» hash «phpMajor»]`.
---
 .../tools/misc/blackfire/php-probe.nix        | 39 ++++++-------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix
index e31984a2c28f9..5a49201a8ffbe 100644
--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -63,7 +63,6 @@ let
     let
       isLinux = builtins.match ".+-linux" system != null;
     in
-    assert !isLinux -> (phpMajor != null);
     fetchurl {
       url = "https://packages.blackfire.io/binaries/blackfire-php/${version}/blackfire-php-${if isLinux then "linux" else "darwin"}_${hashes.${system}.system}-php-${builtins.replaceStrings [ "." ] [ "" ] phpMajor}.so";
       hash = hashes.${system}.hash.${phpMajor};
@@ -114,39 +113,25 @@ stdenv.mkDerivation (finalAttrs: {
     # All sources for updating by the update script.
     updateables =
       let
-        createName = path:
-          builtins.replaceStrings [ "." ] [ "_" ] (lib.concatStringsSep "_" path);
-
-        createSourceParams = path:
-          let
-            # The path will be either [«system» sha256], or [«system» sha256 «phpMajor» «zts»],
-            # Let’s skip the sha256.
-            rest = builtins.tail (builtins.tail path);
-          in
-          {
-            system =
-              builtins.head path;
-            phpMajor =
-              if builtins.length rest == 0
-              then null
-              else builtins.head rest;
-          };
-
-        createUpdateable = path: _value:
+        createName = { phpMajor, system }:
+          "php${builtins.replaceStrings [ "." ] [ "" ] phpMajor}_${system}";
+
+        createUpdateable = sourceParams:
           lib.nameValuePair
-            (createName path)
+            (createName sourceParams)
             (finalAttrs.finalPackage.overrideAttrs (attrs: {
-              src = makeSource (createSourceParams path);
+              src = makeSource sourceParams;
             }));
 
         # Filter out all attributes other than hashes.
         hashesOnly = lib.filterAttrsRecursive (name: _value: name != "system") hashes;
       in
-      builtins.listToAttrs
-        # Collect all leaf attributes (containing hashes).
-        (lib.collect
-          (attrs: attrs ? name)
-          (lib.mapAttrsRecursive createUpdateable hashesOnly));
+      lib.concatMapAttrs (
+        system:
+        { hashes, ... }:
+
+        lib.mapAttrs' (phpMajor: _hash: createUpdateable { inherit phpMajor system; })
+      ) hashes;
   };
 
   meta = {

From 5504973e0cc4f8f7d10c8871d67e6cf199e31092 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 10 Aug 2024 19:06:38 +0200
Subject: [PATCH 313/342] php.extensions.blackfire: assert supported version

Otherwise, it will fail later on attribute access, which cannot be caught with `builtins.tryEval`.

This is presumably important to avoid having CI fail on new PHP versions not yet supported by blackfire.
---
 .../development/tools/misc/blackfire/php-probe.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix
index 5a49201a8ffbe..8ec0fcac05f9a 100644
--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -13,6 +13,7 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions
 
 let
   phpMajor = lib.versions.majorMinor php.version;
+  inherit (stdenv.hostPlatform) system;
 
   version = "1.92.21";
 
@@ -68,14 +69,16 @@ let
       hash = hashes.${system}.hash.${phpMajor};
     };
 in
+
+assert lib.assertMsg (hashes ? ${system}.hash.${phpMajor}) "blackfire does not support PHP version ${phpMajor} on ${system}.";
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "php-blackfire";
   extensionName = "blackfire";
   inherit version;
 
   src = makeSource {
-    system = stdenv.hostPlatform.system;
-    inherit phpMajor;
+    inherit system phpMajor;
   };
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
@@ -122,15 +125,12 @@ stdenv.mkDerivation (finalAttrs: {
             (finalAttrs.finalPackage.overrideAttrs (attrs: {
               src = makeSource sourceParams;
             }));
-
-        # Filter out all attributes other than hashes.
-        hashesOnly = lib.filterAttrsRecursive (name: _value: name != "system") hashes;
       in
       lib.concatMapAttrs (
         system:
-        { hashes, ... }:
+        { hash, ... }:
 
-        lib.mapAttrs' (phpMajor: _hash: createUpdateable { inherit phpMajor system; })
+        lib.mapAttrs' (phpMajor: _hash: createUpdateable { inherit phpMajor system; }) hash
       ) hashes;
   };
 

From 1bf9d8abd08b1f22ef1891b3fb0fc7910d94a3a5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 10 Aug 2024 23:49:32 +0200
Subject: [PATCH 314/342] php.extensions: Filter out enabled attribute

So that the packages are not forced to rebuild when `enabled = true` is added.
---
 pkgs/top-level/php-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index de9b83df972e8..a39cb293842cd 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -777,7 +777,7 @@ in {
       namedExtensions = builtins.map
         (drv: {
           name = drv.name;
-          value = mkExtension drv;
+          value = mkExtension (builtins.removeAttrs drv [ "enable" ]);
         })
         (builtins.filter (i: i.enable or true) extensionData);
 

From b92fa3012473f846eebde0845fcddd3aef8fbef8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 10 Aug 2024 23:23:31 +0200
Subject: [PATCH 315/342] php.extensions.pspell: Fetch from PECL

PHP 8.4 will remove it from tree:

https://github.com/php/php-src/commit/b035cb6c8e31bea351f169b3e9f34fdc562e77e1
---
 .../php-packages/pspell/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               |  4 +--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/php-packages/pspell/default.nix

diff --git a/pkgs/development/php-packages/pspell/default.nix b/pkgs/development/php-packages/pspell/default.nix
new file mode 100644
index 0000000000000..fb8609bca3a3c
--- /dev/null
+++ b/pkgs/development/php-packages/pspell/default.nix
@@ -0,0 +1,32 @@
+{
+  aspell,
+  buildPecl,
+  fetchFromGitHub,
+  lib,
+}:
+
+let
+  version = "1.0.1";
+in
+buildPecl {
+  inherit version;
+  pname = "pspell";
+
+  src = fetchFromGitHub {
+    owner = "php";
+    repo = "pecl-text-pspell";
+    rev = version;
+    hash = "sha256-IVBuEVsUKah8W+oVpIPT9Iln6MFox0e5/5Y14/Kgcg4=";
+  };
+
+  configureFlags = [ "--with-pspell=${aspell}" ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "PHP extension for checking the spelling of a word";
+    homepage = "https://pecl.php.net/package/pspell";
+    license = licenses.php301;
+    maintainers = teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index a39cb293842cd..bd294688cde61 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -6,7 +6,6 @@
 , phpPackage
 , autoconf
 , pkg-config
-, aspell
 , bzip2
 , curl
 , cyrus_sasl
@@ -324,6 +323,8 @@ in {
 
     protobuf = callPackage ../development/php-packages/protobuf { };
 
+    pspell = callPackage ../development/php-packages/pspell { };
+
     rdkafka = callPackage ../development/php-packages/rdkafka { };
 
     redis = callPackage ../development/php-packages/redis { };
@@ -584,7 +585,6 @@ in {
           doCheck = false;
         }
         { name = "posix"; doCheck = false; }
-        { name = "pspell"; configureFlags = [ "--with-pspell=${aspell}" ]; }
         {
           name = "readline";
           buildInputs = [

From a15c71f68481c48a458f06e8c65aefef521c3b59 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 10 Aug 2024 23:29:27 +0200
Subject: [PATCH 316/342] php.extensions.imap: Fetch from PECL

PHP 8.4 will remove it from tree:

https://github.com/php/php-src/commit/987417e2e081fbead4967088fd55aece3c62ce96

Keeping in-tree versions for PHP < 8.3 since the PECL version does not build there.
---
 .../development/php-packages/imap/default.nix | 60 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               |  5 ++
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/php-packages/imap/default.nix

diff --git a/pkgs/development/php-packages/imap/default.nix b/pkgs/development/php-packages/imap/default.nix
new file mode 100644
index 0000000000000..208130e95158d
--- /dev/null
+++ b/pkgs/development/php-packages/imap/default.nix
@@ -0,0 +1,60 @@
+{
+  buildPecl,
+  fetchFromGitHub,
+  fetchpatch,
+  lib,
+  libkrb5,
+  openssl,
+  pam,
+  pcre2,
+  pkg-config,
+  uwimap,
+}:
+
+let
+  version = "1.0.2";
+in
+buildPecl {
+  inherit version;
+  pname = "imap";
+
+  src = fetchFromGitHub {
+    owner = "php";
+    repo = "pecl-mail-imap";
+    rev = version;
+    hash = "sha256-QVeimxm3rfWMvMpSgadhMKd24yPdDGVuhXIOs8668do=";
+  };
+
+  patches = [
+    # Fix compilation with PHP 8.4.
+    (fetchpatch {
+      url = "https://github.com/php/pecl-mail-imap/commit/4fc9970a29c205ec328f36edc8c119c158129324.patch";
+      hash = "sha256-MxEaEe4YVeP7W5gDSNJb0thwAhxDj/yRr3qvjlJjRL4=";
+    })
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    uwimap
+    openssl
+    pam
+    pcre2
+    libkrb5
+  ];
+
+  configureFlags = [
+    "--with-imap=${uwimap}"
+    "--with-imap-ssl"
+    "--with-kerberos"
+  ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "PHP extension for checking the spelling of a word";
+    homepage = "https://pecl.php.net/package/imap";
+    license = licenses.php301;
+    maintainers = teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index bd294688cde61..1c4903915b371 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -265,6 +265,9 @@ in {
 
     imagick = callPackage ../development/php-packages/imagick { };
 
+    # Shadowed by built-in version on PHP < 8.3.
+    imap = callPackage ../development/php-packages/imap { };
+
     inotify = callPackage ../development/php-packages/inotify { };
 
     ioncube-loader = callPackage ../development/php-packages/ioncube-loader { };
@@ -453,6 +456,8 @@ in {
           name = "imap";
           buildInputs = [ uwimap openssl pam pcre2 libkrb5 ];
           configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" "--with-kerberos" ];
+          # Using version from PECL on new PHP versions.
+          enable = lib.versionOlder php.version "8.3";
         }
         {
           name = "intl";

From f5c25500e18d5a2913ecec62dd5bc68c7884981c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 5 Jul 2024 16:36:46 +0200
Subject: [PATCH 317/342] php84: init at 8.4.0alpha4

https://github.com/php/php-src/blob/php-8.4.0alpha4/NEWS

Announcements:

- alpha1 https://www.php.net/archive/2024.php#2024-07-05-1
  - imap and pspell moved to PECL
- alpha3 https://www.php.net/archive/2024.php#2024-07-18-1
- alpha4 https://www.php.net/archive/2024.php#2024-08-01-3

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
---
 nixos/tests/all-tests.nix                 |  1 +
 pkgs/development/interpreters/php/8.4.nix | 61 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           | 10 ++++
 pkgs/top-level/php-packages.nix           |  8 +++
 4 files changed, 80 insertions(+)
 create mode 100644 pkgs/development/interpreters/php/8.4.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 12f8954c40403..ffc3408d16525 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -763,6 +763,7 @@ in {
   php81 = handleTest ./php { php = pkgs.php81; };
   php82 = handleTest ./php { php = pkgs.php82; };
   php83 = handleTest ./php { php = pkgs.php83; };
+  php84 = handleTest ./php { php = pkgs.php84; };
   phylactery = handleTest ./web-apps/phylactery.nix {};
   pict-rs = handleTest ./pict-rs.nix {};
   pinnwand = handleTest ./pinnwand.nix {};
diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
new file mode 100644
index 0000000000000..9c6fd1d392888
--- /dev/null
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -0,0 +1,61 @@
+{ callPackage, fetchurl, ... }@_args:
+
+let
+  base = callPackage ./generic.nix (
+    _args
+    // {
+      version = "8.4.0alpha4";
+      phpSrc = fetchurl {
+        url = "https://downloads.php.net/~saki/php-8.4.0alpha4.tar.xz";
+        hash = "sha256-v411aNKrbteDZnkfpai8SqUgWFQbqZJbzPF5mdCr2Og=";
+      };
+    }
+  );
+in
+base.withExtensions (
+  { all, ... }:
+  with all;
+  [
+    bcmath
+    calendar
+    curl
+    ctype
+    dom
+    exif
+    fileinfo
+    filter
+    ftp
+    gd
+    gettext
+    gmp
+    iconv
+    intl
+    ldap
+    mbstring
+    mysqli
+    mysqlnd
+    opcache
+    openssl
+    pcntl
+    pdo
+    pdo_mysql
+    pdo_odbc
+    pdo_pgsql
+    pdo_sqlite
+    pgsql
+    posix
+    readline
+    session
+    simplexml
+    sockets
+    soap
+    sodium
+    sysvsem
+    sqlite3
+    tokenizer
+    xmlreader
+    xmlwriter
+    zip
+    zlib
+  ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 051d8b0676a63..2e5fd6420ee5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16854,6 +16854,16 @@ with pkgs;
   phpExtensions = php.extensions;
   phpPackages = php.packages;
 
+  # Import PHP84 interpreter, extensions and packages
+  php84 = callPackage ../development/interpreters/php/8.4.nix {
+    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
+    pcre2 = pcre2.override {
+      withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630
+    };
+  };
+  php84Extensions = recurseIntoAttrs php84.extensions;
+  php84Packages = recurseIntoAttrs php84.packages;
+
   # Import PHP83 interpreter, extensions and packages
   php83 = callPackage ../development/interpreters/php/8.3.nix {
     stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1c4903915b371..d6d2af5850d01 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -409,6 +409,14 @@ in {
               hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
               excludes = [ "NEWS" ];
             })
+          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.4") [
+            # Fix compatibility with libxml2 ≥ 2.13.2
+            # https://github.com/php/php-src/issues/15331
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/8d7365b6f009ba43e305d6459013ac4fbed7c606.diff?full_index=1";
+              hash = "sha256-ct0Ml9kjjcRLryjxMsUQQsDXiDExjpnCnWKf+mYgTsQ=";
+              excludes = [ "NEWS" ];
+            })
           ];
         }
         {

From 7f98feb90d80c3cc197eb327e9cd175921c7dd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 11 Aug 2024 06:23:38 -0700
Subject: [PATCH 318/342] python312Packages.flexit-bacnet: init at 2.2.1

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

diff --git a/pkgs/development/python-modules/flexit-bacnet/default.nix b/pkgs/development/python-modules/flexit-bacnet/default.nix
new file mode 100644
index 0000000000000..1fdad51d39b01
--- /dev/null
+++ b/pkgs/development/python-modules/flexit-bacnet/default.nix
@@ -0,0 +1,34 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "flexit-bacnet";
+  version = "2.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "piotrbulinski";
+    repo = "flexit_bacnet";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Cy/WHKtJoZWSFOs+9rBYSLqZTF/68WRM1HiYXDyb9KM=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "flexit_bacnet" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/piotrbulinski/flexit_bacnet/releases/tag/${version}";
+    description = "Client BACnet library for Flexit Nordic series of air handling units";
+    homepage = "https://github.com/piotrbulinski/flexit_bacnet";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9abd477316782..4745b91ce5d00 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4530,6 +4530,8 @@ self: super: with self; {
 
   flexcache = callPackage ../development/python-modules/flexcache { };
 
+  flexit-bacnet = callPackage ../development/python-modules/flexit-bacnet { };
+
   flexmock = callPackage ../development/python-modules/flexmock { };
 
   flexparser = callPackage ../development/python-modules/flexparser { };

From de54a32c17c11b4a6c75a4d2a1de53b6ea0e46bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 11 Aug 2024 06:25:20 -0700
Subject: [PATCH 319/342] home-assistant: support flexit_bacnet component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2d3494cb284aa..37fae03594c4d 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1345,7 +1345,8 @@
       pymodbus
     ];
     "flexit_bacnet" = ps: with ps; [
-    ]; # missing inputs: flexit_bacnet
+      flexit-bacnet
+    ];
     "flexom" = ps: with ps; [
     ];
     "flic" = ps: with ps; [
@@ -5457,6 +5458,7 @@
     "fitbit"
     "fivem"
     "fjaraskupan"
+    "flexit_bacnet"
     "flic"
     "flick_electric"
     "flipr"

From 5822a52f8720e8599ae5a78b97c36e40e4a68d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 11 Aug 2024 10:39:57 -0700
Subject: [PATCH 320/342] python312Packages.prayer-times-calculator-offline:
 init at 1.0.3

---
 .../default.nix                               | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/prayer-times-calculator-offline/default.nix

diff --git a/pkgs/development/python-modules/prayer-times-calculator-offline/default.nix b/pkgs/development/python-modules/prayer-times-calculator-offline/default.nix
new file mode 100644
index 0000000000000..976620c5dc5d4
--- /dev/null
+++ b/pkgs/development/python-modules/prayer-times-calculator-offline/default.nix
@@ -0,0 +1,32 @@
+{
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "prayer-times-calculator-offline";
+  version = "1.0.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "prayer_times_calculator_offline";
+    inherit version;
+    hash = "sha256-vmy1hYZXuDvdjjBN5YivzP+lcwfE86Z9toBzj+kyj14=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "prayer_times_calculator_offline" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Prayer Times Calculator - Offline";
+    homepage = "https://github.com/cpfair/prayer-times-calculator-offline";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf49725db571b..e6f6c1413e27f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10720,6 +10720,8 @@ self: super: with self; {
 
   prayer-times-calculator = callPackage ../development/python-modules/prayer-times-calculator { };
 
+  prayer-times-calculator-offline = callPackage ../development/python-modules/prayer-times-calculator-offline { };
+
   precis-i18n = callPackage ../development/python-modules/precis-i18n { };
 
   prefixed = callPackage ../development/python-modules/prefixed { };

From eb55c762c1f4c37ef14becde49e3e312e099fd88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 11 Aug 2024 10:41:53 -0700
Subject: [PATCH 321/342] home-assistant: support islamic_prayer_times
 component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 67cca39575c5c..2d543219a3676 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1993,7 +1993,8 @@
       isal
     ];
     "islamic_prayer_times" = ps: with ps; [
-    ]; # missing inputs: prayer-times-calculator-offline
+      prayer-times-calculator-offline
+    ];
     "ismartwindow" = ps: with ps; [
     ];
     "israel_rail" = ps: with ps; [
@@ -5185,6 +5186,7 @@
     "iqvia"
     "iron_os"
     "isal"
+    "islamic_prayer_times"
     "israel_rail"
     "ista_ecotrend"
     "isy994"

From 535fa63f85ea84a2a4e2e3d63f32b515f1b289bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 11 Aug 2024 10:45:21 -0700
Subject: [PATCH 322/342] python312Packages.prayer-times-calculator: drop

Home Assistant switched to prayer-times-calculator-offline.
---
 .../prayer-times-calculator/default.nix       | 40 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/prayer-times-calculator/default.nix

diff --git a/pkgs/development/python-modules/prayer-times-calculator/default.nix b/pkgs/development/python-modules/prayer-times-calculator/default.nix
deleted file mode 100644
index d4a72de66f5f3..0000000000000
--- a/pkgs/development/python-modules/prayer-times-calculator/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  requests,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "prayer-times-calculator";
-  version = "0.0.12";
-  pyproject = true;
-
-  disabled = pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = "uchagani";
-    repo = "prayer-times-calculator";
-    rev = "refs/tags/${version}";
-    hash = "sha256-HeGUnApQZ12aieaV/UBbJqqpEn4i/ZZKw41H/Yx3+cY=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ requests ];
-
-  # Project has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "prayer_times_calculator" ];
-
-  meta = with lib; {
-    description = "Python client for the Prayer Times API";
-    homepage = "https://github.com/uchagani/prayer-times-calculator";
-    changelog = "https://github.com/uchagani/prayer-times-calculator/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b6ad1e3e8f432..e4aca8bf1720c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -371,6 +371,7 @@ mapAliases ({
   poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29
   postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
   powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
+  prayer-times-calculator = prayer-times-calculator-offline; # added 2024-08-11
   privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31
   proboscis = throw "proboscis has been removed since it has not been maintained for 11 years"; # added 2024-05-20
   prometheus_client = prometheus-client; # added 2021-06-10
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e6f6c1413e27f..b0c7af14e8f5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10718,8 +10718,6 @@ self: super: with self; {
 
   praw = callPackage ../development/python-modules/praw { };
 
-  prayer-times-calculator = callPackage ../development/python-modules/prayer-times-calculator { };
-
   prayer-times-calculator-offline = callPackage ../development/python-modules/prayer-times-calculator-offline { };
 
   precis-i18n = callPackage ../development/python-modules/precis-i18n { };

From 97822a5bc4d7c2f3593aa36d085bbf484e59dfbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 10 Aug 2024 01:55:10 -0400
Subject: [PATCH 323/342] eww: nixfmt

---
 pkgs/by-name/ew/eww/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index ae676efa9fb21..0f8ae229dc15c 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -1,13 +1,14 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, wrapGAppsHook3
-, gtk3
-, librsvg
-, gtk-layer-shell
-, stdenv
-, libdbusmenu-gtk3
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  wrapGAppsHook3,
+  gtk3,
+  librsvg,
+  gtk-layer-shell,
+  stdenv,
+  libdbusmenu-gtk3,
 }:
 
 rustPlatform.buildRustPackage rec {

From 90fa19e354bbef3636bdc842362ad0c15255f914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 10 Aug 2024 02:00:38 -0400
Subject: [PATCH 324/342] eww: set updateScript

---
 pkgs/by-name/ew/eww/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index 0f8ae229dc15c..6212039799282 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -9,6 +9,7 @@
   gtk-layer-shell,
   stdenv,
   libdbusmenu-gtk3,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -49,6 +50,8 @@ rustPlatform.buildRustPackage rec {
   # requires unstable rust features
   RUSTC_BOOTSTRAP = 1;
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
   meta = {
     description = "Widget system made in Rust to create widgets for any WM";
     longDescription = ''

From 8b14399f5e10211f569b3b8321988c1fb7c7ba2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 10 Aug 2024 02:14:17 -0400
Subject: [PATCH 325/342] eww: 0.6.0-unstable-2024-04-26 ->
 0.6.0-unstable-2024-07-05

---
 pkgs/by-name/ew/eww/lockfile.patch | 37 ++++++++++++++++++++++++++++++
 pkgs/by-name/ew/eww/package.nix    | 10 ++++----
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ew/eww/lockfile.patch

diff --git a/pkgs/by-name/ew/eww/lockfile.patch b/pkgs/by-name/ew/eww/lockfile.patch
new file mode 100644
index 0000000000000..1edc62c66a45b
--- /dev/null
+++ b/pkgs/by-name/ew/eww/lockfile.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 5d94bd4..acd2c8d 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1676,7 +1676,7 @@ dependencies = [
+  "libm",
+  "log",
+  "regex",
+- "time 0.3.34",
++ "time 0.3.36",
+  "urlencoding",
+ ]
+ 
+@@ -2893,9 +2893,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+@@ -2914,9 +2914,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+  "num-conv",
+  "time-core",
diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index 6212039799282..f3cc565cab423 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "eww";
-  version = "0.6.0-unstable-2024-04-26";
+  version = "0.6.0-unstable-2024-07-05";
 
   src = fetchFromGitHub {
     owner = "elkowar";
@@ -22,11 +22,13 @@ rustPlatform.buildRustPackage rec {
     # FIXME: change to a release tag once a new release is available
     # https://github.com/elkowar/eww/pull/1084
     # using the revision to fix string truncation issue in eww config
-    rev = "2c8811512460ce6cc75e021d8d081813647699dc";
-    hash = "sha256-eDOg5Ink3iWT/B1WpD9po5/UxS4DEaVO4NPIRyjSheM=";
+    rev = "4d55e9ad63d1fae887726dffcd25a32def23d34f";
+    hash = "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=";
   };
 
-  cargoHash = "sha256-ClnIW7HxbQcC85OyoMhBLFjVtdEUCOARuimfS4uRi+E=";
+  # needed to fix build errors with rust 1.80 due to outdated time crate
+  cargoPatches = [ ./lockfile.patch ];
+  cargoHash = "sha256-55lmQl5pJwrEj5RlSG8b0PqtZVrASxTmX4Qdk090DZo=";
 
   nativeBuildInputs = [
     pkg-config

From ba5ed99861d836c33e0ebe94fda254a3e050dcba Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 11 Aug 2024 22:18:48 +0100
Subject: [PATCH 326/342] x265: fix build on x86_64-darwin

Update to 3.6 pulled in local definition of `__rdtsc()` symbol in
the test suite and caused symbol clash:

    /tmp/nix-build-x265-3.6.drv-0/x265_3.6/source/test/testharness.h:78:24: error: static declaration of '__rdtsc' follows non-static declaration
    static inline uint32_t __rdtsc(void)
                           ^
    /tmp/nix-build-x265-3.6.drv-0/x265_3.6/source/test/testharness.h:78:24: note: '__rdtsc' is a builtin with type 2

The change avoids redefinition if the compiler already provides the
builtin.
---
 .../libraries/x265/darwin-__rdtsc.patch       | 29 +++++++++++++++++++
 pkgs/development/libraries/x265/default.nix   |  6 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/x265/darwin-__rdtsc.patch

diff --git a/pkgs/development/libraries/x265/darwin-__rdtsc.patch b/pkgs/development/libraries/x265/darwin-__rdtsc.patch
new file mode 100644
index 0000000000000..a052f818af10d
--- /dev/null
+++ b/pkgs/development/libraries/x265/darwin-__rdtsc.patch
@@ -0,0 +1,29 @@
+From 5ad351f7d271d0be0611797542c831898b2f531c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 11 Aug 2024 22:09:34 +0100
+Subject: [PATCH] source/test/testharness.h: don't redefine `__rdtsc()` builtin
+
+On darwin clang-16 provides `__rdtsc()` builtin. As a result the build
+fails in `nixpkgs` as:
+
+    source/test/testharness.h:78:24: error: static declaration of '__rdtsc' follows non-static declaration
+    static inline uint32_t __rdtsc(void)
+                           ^
+    x265_3.6/source/test/testharness.h:78:24: note: '__rdtsc' is a builtin with type 2
+
+The change avoid redefinition on targets that define `__rdtsc()` builtin.
+---
+ source/test/testharness.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/test/testharness.h
++++ b/test/testharness.h
+@@ -69,6 +69,8 @@ protected:
+ #include <intrin.h>
+ #elif HAVE_RDTSC
+ #include <intrin.h>
++#elif defined(__has_builtin) && __has_builtin(__rdtsc)
++/* compiler-provided builtin */
+ #elif (!defined(__APPLE__) && (defined (__GNUC__) && (defined(__x86_64__) || defined(__i386__))))
+ #include <x86intrin.h>
+ #elif ( !defined(__APPLE__) && defined (__GNUC__) && defined(__ARM_NEON__))
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index e58e910c2bbaa..3d10538314f02 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -41,6 +41,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-ZjUx80HFOJ9GDXMOYuEKT8yjQoyiyhCWk4Z7xf4uKAc=";
   };
 
+  # TODO: apply patch unconditionally in staging. It's conditional to
+  # save rebuild on staging-next.
+  patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+    ./darwin-__rdtsc.patch
+  ];
+
   sourceRoot = "x265_${version}/source";
 
   postPatch = ''

From 2c5001b1db0d3736c9a282ea22e321eb8658329c Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 11 Aug 2024 14:04:21 -0400
Subject: [PATCH 327/342] darwin.stdenv: format with nixfmt-rfc-style

---
 pkgs/stdenv/darwin/default.nix | 3265 +++++++++++++++++++++-----------
 1 file changed, 2192 insertions(+), 1073 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 57e4a9c4987f2..13d53ad6e6781 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -7,17 +7,19 @@
 # See also the top comments of the Linux stdenv `../linux/default.nix` for a good overview of
 # the bootstrap process and working with it.
 
-{ lib
-, localSystem
-, crossSystem
-, config
-, overlays
-, crossOverlays ? [ ]
+{
+  lib,
+  localSystem,
+  crossSystem,
+  config,
+  overlays,
+  crossOverlays ? [ ],
   # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
-, bootstrapFiles ? if localSystem.isAarch64 then
-    import ./bootstrap-files/aarch64-apple-darwin.nix
-  else
-    import ./bootstrap-files/x86_64-apple-darwin.nix
+  bootstrapFiles ?
+    if localSystem.isAarch64 then
+      import ./bootstrap-files/aarch64-apple-darwin.nix
+    else
+      import ./bootstrap-files/x86_64-apple-darwin.nix,
 }:
 
 assert crossSystem == localSystem;
@@ -34,12 +36,9 @@ let
   ];
 
   isFromNixpkgs = pkg: !(isFromBootstrapFiles pkg);
-  isFromBootstrapFiles =
-    pkg: pkg.passthru.isFromBootstrapFiles or false;
-  isBuiltByNixpkgsCompiler =
-    pkg: isFromNixpkgs pkg && isFromNixpkgs pkg.stdenv.cc.cc;
-  isBuiltByBootstrapFilesCompiler =
-    pkg: isFromNixpkgs pkg && isFromBootstrapFiles pkg.stdenv.cc.cc;
+  isFromBootstrapFiles = pkg: pkg.passthru.isFromBootstrapFiles or false;
+  isBuiltByNixpkgsCompiler = pkg: isFromNixpkgs pkg && isFromNixpkgs pkg.stdenv.cc.cc;
+  isBuiltByBootstrapFilesCompiler = pkg: isFromNixpkgs pkg && isFromBootstrapFiles pkg.stdenv.cc.cc;
 
   commonPreHook = ''
     export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1}
@@ -48,84 +47,97 @@ let
     unset SDKROOT
   '';
 
-  bootstrapTools = derivation ({
-    inherit system;
+  bootstrapTools =
+    derivation (
+      {
+        inherit system;
 
-    name = "bootstrap-tools";
-    builder = "${bootstrapFiles.unpack}/bin/bash";
+        name = "bootstrap-tools";
+        builder = "${bootstrapFiles.unpack}/bin/bash";
 
-    args = [
-      "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh"
-        bootstrapFiles.bootstrapTools
-    ];
+        args = [
+          "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh"
+          bootstrapFiles.bootstrapTools
+        ];
 
-    PATH = lib.makeBinPath [
-      (placeholder "out")
-      bootstrapFiles.unpack
-    ];
+        PATH = lib.makeBinPath [
+          (placeholder "out")
+          bootstrapFiles.unpack
+        ];
 
-    __impureHostDeps = commonImpureHostDeps;
-  } // lib.optionalAttrs config.contentAddressedByDefault {
-    __contentAddressed = true;
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-  }) // { passthru.isFromBootstrapFiles = true; };
+        __impureHostDeps = commonImpureHostDeps;
+      }
+      // lib.optionalAttrs config.contentAddressedByDefault {
+        __contentAddressed = true;
+        outputHashAlgo = "sha256";
+        outputHashMode = "recursive";
+      }
+    )
+    // {
+      passthru.isFromBootstrapFiles = true;
+    };
 
-  stageFun = prevStage:
-    { name, overrides ? (self: super: { }), extraNativeBuildInputs ? [ ], extraPreHook ? "" }:
+  stageFun =
+    prevStage:
+    {
+      name,
+      overrides ? (self: super: { }),
+      extraNativeBuildInputs ? [ ],
+      extraPreHook ? "",
+    }:
 
     let
-      cc = if prevStage.llvmPackages.clang-unwrapped == null
-           then null else
-           lib.makeOverridable (import ../../build-support/cc-wrapper) {
-        name = "${name}-clang-wrapper";
-
-        nativeTools = false;
-        nativeLibc = false;
-
-        expand-response-params = lib.optionalString
-          (prevStage.stdenv.hasCC or false && prevStage.stdenv.cc != "/dev/null")
-          prevStage.expand-response-params;
-
-        extraPackages = [
-          prevStage.llvmPackages.compiler-rt
-        ];
-
-        extraBuildCommands =
-          let
-            inherit (prevStage.llvmPackages) clang-unwrapped compiler-rt release_version;
-          in
-          ''
-            function clangResourceRootIncludePath() {
-              clangLib="$1/lib/clang"
-              if (( $(ls "$clangLib" | wc -l) > 1 )); then
-                echo "Multiple LLVM versions were found at "$clangLib", but there must only be one used when building the stdenv." >&2
-                exit 1
-              fi
-              echo "$clangLib/$(ls -1 "$clangLib")/include"
-            }
-
-            rsrc="$out/resource-root"
-            mkdir "$rsrc"
-            ln -s "$(clangResourceRootIncludePath "${clang-unwrapped.lib}")" "$rsrc"
-            ln -s "${compiler-rt.out}/lib"   "$rsrc/lib"
-            ln -s "${compiler-rt.out}/share" "$rsrc/share"
-            echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-          '';
+      cc =
+        if prevStage.llvmPackages.clang-unwrapped == null then
+          null
+        else
+          lib.makeOverridable (import ../../build-support/cc-wrapper) {
+            name = "${name}-clang-wrapper";
+
+            nativeTools = false;
+            nativeLibc = false;
+
+            expand-response-params = lib.optionalString (
+              prevStage.stdenv.hasCC or false && prevStage.stdenv.cc != "/dev/null"
+            ) prevStage.expand-response-params;
+
+            extraPackages = [ prevStage.llvmPackages.compiler-rt ];
+
+            extraBuildCommands =
+              let
+                inherit (prevStage.llvmPackages) clang-unwrapped compiler-rt release_version;
+              in
+              ''
+                function clangResourceRootIncludePath() {
+                  clangLib="$1/lib/clang"
+                  if (( $(ls "$clangLib" | wc -l) > 1 )); then
+                    echo "Multiple LLVM versions were found at "$clangLib", but there must only be one used when building the stdenv." >&2
+                    exit 1
+                  fi
+                  echo "$clangLib/$(ls -1 "$clangLib")/include"
+                }
+
+                rsrc="$out/resource-root"
+                mkdir "$rsrc"
+                ln -s "$(clangResourceRootIncludePath "${clang-unwrapped.lib}")" "$rsrc"
+                ln -s "${compiler-rt.out}/lib"   "$rsrc/lib"
+                ln -s "${compiler-rt.out}/share" "$rsrc/share"
+                echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+              '';
 
-        cc = prevStage.llvmPackages.clang-unwrapped;
-        bintools = prevStage.darwin.binutils;
+            cc = prevStage.llvmPackages.clang-unwrapped;
+            bintools = prevStage.darwin.binutils;
 
-        isClang = true;
-        libc = prevStage.darwin.Libsystem;
-        inherit (prevStage.llvmPackages) libcxx;
+            isClang = true;
+            libc = prevStage.darwin.Libsystem;
+            inherit (prevStage.llvmPackages) libcxx;
 
-        inherit lib;
-        inherit (prevStage) coreutils gnugrep;
+            inherit lib;
+            inherit (prevStage) coreutils gnugrep;
 
-        stdenvNoCC = prevStage.ccWrapperStdenv;
-        runtimeShell = prevStage.ccWrapperStdenv.shell;
-      };
+            stdenvNoCC = prevStage.ccWrapperStdenv;
+            runtimeShell = prevStage.ccWrapperStdenv.shell;
+          };
 
       bash = prevStage.bash or bootstrapTools;
 
@@ -139,22 +151,27 @@ let
         inherit config;
 
         extraBuildInputs = [ prevStage.darwin.CF ];
-        extraNativeBuildInputs = extraNativeBuildInputs
-          ++ [ prevStage.darwin.apple_sdk.sdkRoot ];
+        extraNativeBuildInputs = extraNativeBuildInputs ++ [ prevStage.darwin.apple_sdk.sdkRoot ];
 
-        preHook = lib.optionalString (!isBuiltByNixpkgsCompiler bash) ''
-          # Don't patch #!/interpreter because it leads to retained
-          # dependencies on the bootstrapTools in the final stdenv.
-          dontPatchShebangs=1
-        '' + ''
-          ${commonPreHook}
-          ${extraPreHook}
-        '' + lib.optionalString (prevStage.darwin ? locale) ''
-          export PATH_LOCALE=${prevStage.darwin.locale}/share/locale
-        '';
+        preHook =
+          lib.optionalString (!isBuiltByNixpkgsCompiler bash) ''
+            # Don't patch #!/interpreter because it leads to retained
+            # dependencies on the bootstrapTools in the final stdenv.
+            dontPatchShebangs=1
+          ''
+          + ''
+            ${commonPreHook}
+            ${extraPreHook}
+          ''
+          + lib.optionalString (prevStage.darwin ? locale) ''
+            export PATH_LOCALE=${prevStage.darwin.locale}/share/locale
+          '';
 
         shell = bash + "/bin/bash";
-        initialPath = [ bash bootstrapTools ];
+        initialPath = [
+          bash
+          bootstrapTools
+        ];
 
         fetchurlBoot = import ../../build-support/fetchurl {
           inherit lib;
@@ -171,11 +188,14 @@ let
         # Using the bootstrap tools curl for fetchers allows the stdenv bootstrap to avoid
         # having a dependency on curl, allowing curl to be updated without triggering a
         # new stdenv bootstrap on Darwin.
-        overrides = self: super: (overrides self super) // {
-          fetchurl = thisStdenv.fetchurlBoot;
-          fetchpatch = super.fetchpatch.override { inherit (self) fetchurl; };
-          fetchzip = super.fetchzip.override { inherit (self) fetchurl; };
-        };
+        overrides =
+          self: super:
+          (overrides self super)
+          // {
+            fetchurl = thisStdenv.fetchurlBoot;
+            fetchpatch = super.fetchpatch.override { inherit (self) fetchurl; };
+            fetchzip = super.fetchzip.override { inherit (self) fetchurl; };
+          };
       };
 
     in
@@ -184,533 +204,783 @@ let
       stdenv = thisStdenv;
     };
 in
-  assert bootstrapTools.passthru.isFromBootstrapFiles or false;  # sanity check
+assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
 [
-  ({}: {
-    __raw = true;
-
-    cctools = true;
-    ld64 = true;
-
-    coreutils = null;
-    gnugrep = null;
-
-    pbzx = null;
-    cpio = null;
-
-    darwin = {
-      apple_sdk.sdkRoot = null;
-      binutils = null;
-      binutils-unwrapped = null;
-      print-reexports = null;
-      rewrite-tbd = null;
-      sigtool = null;
-      CF = null;
-      Libsystem = null;
-    };
+  (
+    { }:
+    {
+      __raw = true;
 
-    llvmPackages = {
-      clang-unwrapped = null;
-      libllvm = null;
-      libcxx = null;
-      compiler-rt = null;
-    };
-  })
+      cctools = true;
+      ld64 = true;
 
-  # Create a stage with the bootstrap tools. This will be used to build the subsequent stages and
-  # build up the standard environment.
-  #
-  # Note: Each stage depends only on the the packages in `prevStage`. If a package is not to be
-  # rebuilt, it should be passed through by inheriting it.
-  (prevStage: stageFun prevStage {
-    name = "bootstrap-stage0";
-
-    overrides = self: super: {
-      # We thread stage0's stdenv through under this name so downstream stages
-      # can use it for wrapping gcc too. This way, downstream stages don't need
-      # to refer to this stage directly, which violates the principle that each
-      # stage should only access the stage that came before it.
-      ccWrapperStdenv = self.stdenv;
-
-      bash = bootstrapTools // {
-        shellPath = "/bin/bash";
-      };
+      coreutils = null;
+      gnugrep = null;
 
-      coreutils = bootstrapTools;
-      cpio = bootstrapTools;
-      gnugrep = bootstrapTools;
-      pbzx = bootstrapTools;
-
-      cctools = super.stdenv.mkDerivation {
-        pname = "bootstrap-stage0-cctools";
-        version = "boot";
-
-        buildCommand = ''
-          declare -a cctools=(
-            ar
-            bitcode_strip
-            check_dylib
-            checksyms
-            cmpdylib
-            codesign_allocate
-            ctf_insert
-            depinfo
-            diagtest
-            gas
-            gprof
-            install_name_tool
-            libtool
-            lipo
-            mtoc
-            mtor
-            nm
-            nmedit
-            otool
-            pagestuff
-            ranlib
-            redo_prebinding
-            seg_addr_table
-            seg_hack
-            segedit
-            size
-            strings
-            strip
-            vtool
-          )
-
-          mkdir -p "$out/bin"
-          for tool in "''${cctools[@]}"; do
-            toolsrc="${bootstrapTools}/bin/$tool"
-            if [ -e "$toolsrc" ]; then
-              ln -s "$toolsrc" "$out/bin"
-            fi
-          done
-
-          # Copy only the required headers to avoid accidentally linking headers that belong to other packages,
-          # which can cause problems when building Libsystem in the source-based SDK.
-          declare -a machohdrs=(
-            arch.h
-            fat.h
-            fixup-chains.h
-            getsect.h
-            ldsyms.h
-            loader.h
-            nlist.h
-            ranlib.h
-            reloc.h
-            stab.h
-            swap.h
-            arm
-            arm64
-            hppa
-            i386
-            i860
-            m68k
-            m88k
-            ppc
-            sparc
-            x86_64
-          )
-
-          mkdir -p "$out/include/mach-o"
-          for header in "''${machohdrs[@]}"; do
-            machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header"
-            if [ -e "$machosrc" ]; then
-              cp -r "$machosrc" "$out/include/mach-o/$header"
-            fi
-          done
-        '';
+      pbzx = null;
+      cpio = null;
 
-        passthru = {
-          isFromBootstrapFiles = true;
-          targetPrefix = "";
-        };
+      darwin = {
+        apple_sdk.sdkRoot = null;
+        binutils = null;
+        binutils-unwrapped = null;
+        print-reexports = null;
+        rewrite-tbd = null;
+        sigtool = null;
+        CF = null;
+        Libsystem = null;
       };
 
-      ld64 = bootstrapTools // {
-        targetPrefix = "";
-        version = "boot";
+      llvmPackages = {
+        clang-unwrapped = null;
+        libllvm = null;
+        libcxx = null;
+        compiler-rt = null;
       };
+    }
+  )
 
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        # Prevent CF from being propagated to the initial stdenv. Packages that require it
-        # will have to manually add it to their build inputs.
-        CF = null;
-
-        binutils = super.wrapBintoolsWith {
-          name = "bootstrap-stage0-binutils-wrapper";
-
-          nativeTools = false;
-          nativeLibc = false;
-
-          expand-response-params = "";
-          libc = selfDarwin.Libsystem;
-
-          inherit lib;
-          inherit (self) stdenvNoCC coreutils gnugrep;
-          runtimeShell = self.stdenvNoCC.shell;
+  # Create a stage with the bootstrap tools. This will be used to build the subsequent stages and
+  # build up the standard environment.
+  #
+  # Note: Each stage depends only on the the packages in `prevStage`. If a package is not to be
+  # rebuilt, it should be passed through by inheriting it.
+  (
+    prevStage:
+    stageFun prevStage {
+      name = "bootstrap-stage0";
 
-          bintools = selfDarwin.binutils-unwrapped;
+      overrides = self: super: {
+        # We thread stage0's stdenv through under this name so downstream stages
+        # can use it for wrapping gcc too. This way, downstream stages don't need
+        # to refer to this stage directly, which violates the principle that each
+        # stage should only access the stage that came before it.
+        ccWrapperStdenv = self.stdenv;
+
+        bash = bootstrapTools // {
+          shellPath = "/bin/bash";
+        };
 
-          # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly.
-          # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
-          extraBuildCommands = ''
-            echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
+        coreutils = bootstrapTools;
+        cpio = bootstrapTools;
+        gnugrep = bootstrapTools;
+        pbzx = bootstrapTools;
 
-            export signingUtils=${selfDarwin.signingUtils}
+        cctools = super.stdenv.mkDerivation {
+          pname = "bootstrap-stage0-cctools";
+          version = "boot";
 
-            wrap \
-              install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \
-              "${selfDarwin.binutils-unwrapped}/bin/install_name_tool"
+          buildCommand = ''
+            declare -a cctools=(
+              ar
+              bitcode_strip
+              check_dylib
+              checksyms
+              cmpdylib
+              codesign_allocate
+              ctf_insert
+              depinfo
+              diagtest
+              gas
+              gprof
+              install_name_tool
+              libtool
+              lipo
+              mtoc
+              mtor
+              nm
+              nmedit
+              otool
+              pagestuff
+              ranlib
+              redo_prebinding
+              seg_addr_table
+              seg_hack
+              segedit
+              size
+              strings
+              strip
+              vtool
+            )
+
+            mkdir -p "$out/bin"
+            for tool in "''${cctools[@]}"; do
+              toolsrc="${bootstrapTools}/bin/$tool"
+              if [ -e "$toolsrc" ]; then
+                ln -s "$toolsrc" "$out/bin"
+              fi
+            done
 
-            wrap \
-              strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \
-              "${selfDarwin.binutils-unwrapped}/bin/strip"
+            # Copy only the required headers to avoid accidentally linking headers that belong to other packages,
+            # which can cause problems when building Libsystem in the source-based SDK.
+            declare -a machohdrs=(
+              arch.h
+              fat.h
+              fixup-chains.h
+              getsect.h
+              ldsyms.h
+              loader.h
+              nlist.h
+              ranlib.h
+              reloc.h
+              stab.h
+              swap.h
+              arm
+              arm64
+              hppa
+              i386
+              i860
+              m68k
+              m88k
+              ppc
+              sparc
+              x86_64
+            )
+
+            mkdir -p "$out/include/mach-o"
+            for header in "''${machohdrs[@]}"; do
+              machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header"
+              if [ -e "$machosrc" ]; then
+                cp -r "$machosrc" "$out/include/mach-o/$header"
+              fi
+            done
           '';
-        };
 
-        binutils-unwrapped = (superDarwin.binutils-unwrapped.overrideAttrs (old: {
-          version = "boot";
-          passthru = (old.passthru or { }) // {
+          passthru = {
             isFromBootstrapFiles = true;
+            targetPrefix = "";
           };
-        })).override { enableManpages = false; };
+        };
 
-        locale = self.stdenv.mkDerivation {
-          name = "bootstrap-stage0-locale";
-          buildCommand = ''
-            mkdir -p $out/share/locale
-          '';
+        ld64 = bootstrapTools // {
+          targetPrefix = "";
+          version = "boot";
         };
 
-        print-reexports = bootstrapTools;
+        darwin = super.darwin.overrideScope (
+          selfDarwin: superDarwin:
+          {
+            # Prevent CF from being propagated to the initial stdenv. Packages that require it
+            # will have to manually add it to their build inputs.
+            CF = null;
 
-        rewrite-tbd = bootstrapTools;
+            binutils = super.wrapBintoolsWith {
+              name = "bootstrap-stage0-binutils-wrapper";
 
-        sigtool = bootstrapTools;
-      } // lib.optionalAttrs (! useAppleSDKLibs) {
-        Libsystem = self.stdenv.mkDerivation {
-          name = "bootstrap-stage0-Libsystem";
-          buildCommand = ''
-            mkdir -p $out
+              nativeTools = false;
+              nativeLibc = false;
 
-            cp -r ${selfDarwin.darwin-stubs}/usr/lib $out/lib
-            chmod -R +w $out/lib
-            substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system
+              expand-response-params = "";
+              libc = selfDarwin.Libsystem;
 
-            ln -s libSystem.B.tbd $out/lib/libSystem.tbd
+              inherit lib;
+              inherit (self) stdenvNoCC coreutils gnugrep;
+              runtimeShell = self.stdenvNoCC.shell;
 
-            for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do
-              ln -s libSystem.tbd $out/lib/lib$name.tbd
-            done
+              bintools = selfDarwin.binutils-unwrapped;
 
-            ln -s ${bootstrapTools}/lib/*.o $out/lib
+              # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly.
+              # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
+              extraBuildCommands = ''
+                echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
 
-            ln -s ${bootstrapTools}/lib/libresolv.9.dylib $out/lib
-            ln -s libresolv.9.dylib $out/lib/libresolv.dylib
+                export signingUtils=${selfDarwin.signingUtils}
 
-            ln -s ${bootstrapTools}/include-Libsystem $out/include
-          '';
-          passthru.isFromBootstrapFiles = true;
-        };
-      });
-
-      llvmPackages = super.llvmPackages // (
-        let
-          tools = super.llvmPackages.tools.extend (selfTools: _: {
-            libclang = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-clang";
-              version = "boot";
-              outputs = [ "out" "lib" ];
-              buildCommand = ''
-                mkdir -p $out/lib
-                ln -s $out $lib
-                ln -s ${bootstrapTools}/bin       $out/bin
-                ln -s ${bootstrapTools}/lib/clang $out/lib
-                ln -s ${bootstrapTools}/include   $out
-              '';
-              passthru = {
-                isFromBootstrapFiles = true;
-                hardeningUnsupportedFlags = [
-                  "fortify3"
-                  "shadowstack"
-                  "stackclashprotection"
-                  "zerocallusedregs"
-                ];
-              };
-            };
-            libllvm = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-llvm";
-              outputs = [ "out" "lib" ];
-              buildCommand = ''
-                mkdir -p $out/bin $out/lib
-                ln -s $out $lib
-                for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do
-                  cctoolsTool=''${tool//-/_}
-                  toolsrc="${bootstrapTools}/bin/$cctoolsTool"
-                  if [ -e "$toolsrc" ]; then
-                    ln -s "$toolsrc" $out/bin/llvm-$tool
-                  fi
-                done
-                ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil
-                ln -s ${bootstrapTools}/lib/libLLVM* $out/lib
+                wrap \
+                  install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \
+                  "${selfDarwin.binutils-unwrapped}/bin/install_name_tool"
+
+                wrap \
+                  strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \
+                  "${selfDarwin.binutils-unwrapped}/bin/strip"
               '';
-              passthru.isFromBootstrapFiles = true;
             };
-          });
-          libraries = super.llvmPackages.libraries.extend (_: _: {
-            libcxx = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-libcxx";
+
+            binutils-unwrapped =
+              (superDarwin.binutils-unwrapped.overrideAttrs (old: {
+                version = "boot";
+                passthru = (old.passthru or { }) // {
+                  isFromBootstrapFiles = true;
+                };
+              })).override
+                { enableManpages = false; };
+
+            locale = self.stdenv.mkDerivation {
+              name = "bootstrap-stage0-locale";
               buildCommand = ''
-                mkdir -p $out/lib $out/include
-                ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib
-                ln -s ${bootstrapTools}/include/c++      $out/include
+                mkdir -p $out/share/locale
               '';
-              passthru = {
-                isLLVM = true;
-                isFromBootstrapFiles = true;
-              };
             };
-            compiler-rt = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-compiler-rt";
+
+            print-reexports = bootstrapTools;
+
+            rewrite-tbd = bootstrapTools;
+
+            sigtool = bootstrapTools;
+          }
+          // lib.optionalAttrs (!useAppleSDKLibs) {
+            Libsystem = self.stdenv.mkDerivation {
+              name = "bootstrap-stage0-Libsystem";
               buildCommand = ''
-                mkdir -p $out/lib $out/share
-                ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
-                ln -s ${bootstrapTools}/lib/darwin       $out/lib
+                mkdir -p $out
+
+                cp -r ${selfDarwin.darwin-stubs}/usr/lib $out/lib
+                chmod -R +w $out/lib
+                substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system
+
+                ln -s libSystem.B.tbd $out/lib/libSystem.tbd
+
+                for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do
+                  ln -s libSystem.tbd $out/lib/lib$name.tbd
+                done
+
+                ln -s ${bootstrapTools}/lib/*.o $out/lib
+
+                ln -s ${bootstrapTools}/lib/libresolv.9.dylib $out/lib
+                ln -s libresolv.9.dylib $out/lib/libresolv.dylib
+
+                ln -s ${bootstrapTools}/include-Libsystem $out/include
               '';
               passthru.isFromBootstrapFiles = true;
             };
-          });
-        in
-        { inherit tools libraries; } // tools // libraries
-      );
-    };
+          }
+        );
 
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
+        llvmPackages =
+          super.llvmPackages
+          // (
+            let
+              tools = super.llvmPackages.tools.extend (
+                selfTools: _: {
+                  libclang = self.stdenv.mkDerivation {
+                    name = "bootstrap-stage0-clang";
+                    version = "boot";
+                    outputs = [
+                      "out"
+                      "lib"
+                    ];
+                    buildCommand = ''
+                      mkdir -p $out/lib
+                      ln -s $out $lib
+                      ln -s ${bootstrapTools}/bin       $out/bin
+                      ln -s ${bootstrapTools}/lib/clang $out/lib
+                      ln -s ${bootstrapTools}/include   $out
+                    '';
+                    passthru = {
+                      isFromBootstrapFiles = true;
+                      hardeningUnsupportedFlags = [
+                        "fortify3"
+                        "shadowstack"
+                        "stackclashprotection"
+                        "zerocallusedregs"
+                      ];
+                    };
+                  };
+                  libllvm = self.stdenv.mkDerivation {
+                    name = "bootstrap-stage0-llvm";
+                    outputs = [
+                      "out"
+                      "lib"
+                    ];
+                    buildCommand = ''
+                      mkdir -p $out/bin $out/lib
+                      ln -s $out $lib
+                      for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do
+                        cctoolsTool=''${tool//-/_}
+                        toolsrc="${bootstrapTools}/bin/$cctoolsTool"
+                        if [ -e "$toolsrc" ]; then
+                          ln -s "$toolsrc" $out/bin/llvm-$tool
+                        fi
+                      done
+                      ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil
+                      ln -s ${bootstrapTools}/lib/libLLVM* $out/lib
+                    '';
+                    passthru.isFromBootstrapFiles = true;
+                  };
+                }
+              );
+              libraries = super.llvmPackages.libraries.extend (
+                _: _: {
+                  libcxx = self.stdenv.mkDerivation {
+                    name = "bootstrap-stage0-libcxx";
+                    buildCommand = ''
+                      mkdir -p $out/lib $out/include
+                      ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib
+                      ln -s ${bootstrapTools}/include/c++      $out/include
+                    '';
+                    passthru = {
+                      isLLVM = true;
+                      isFromBootstrapFiles = true;
+                    };
+                  };
+                  compiler-rt = self.stdenv.mkDerivation {
+                    name = "bootstrap-stage0-compiler-rt";
+                    buildCommand = ''
+                      mkdir -p $out/lib $out/share
+                      ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
+                      ln -s ${bootstrapTools}/lib/darwin       $out/lib
+                    '';
+                    passthru.isFromBootstrapFiles = true;
+                  };
+                }
+              );
+            in
+            { inherit tools libraries; } // tools // libraries
+          );
+      };
+
+      extraPreHook = ''
+        stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
+      '';
+    }
+  )
 
   # This stage is primarily responsible for setting up versions of certain dependencies needed
   # by the rest of the build process. This stage also builds CF and Libsystem to simplify assertions
   # and assumptions for later by making sure both packages are present on x86_64-darwin and aarch64-darwin.
-  (prevStage:
+  (
+    prevStage:
     # previous stage0 stdenv:
     assert lib.all isFromBootstrapFiles (
-      with prevStage; [ bash cctools coreutils cpio gnugrep ld64 ] ++ lib.optionals useAppleSDKLibs [ pbzx ]
+      with prevStage;
+      [
+        bash
+        cctools
+        coreutils
+        cpio
+        gnugrep
+        ld64
+      ]
+      ++ lib.optionals useAppleSDKLibs [ pbzx ]
     );
 
-    assert lib.all isFromBootstrapFiles (with prevStage.darwin; [
-      binutils-unwrapped print-reexports rewrite-tbd sigtool
-    ]);
+    assert lib.all isFromBootstrapFiles (
+      with prevStage.darwin;
+      [
+        binutils-unwrapped
+        print-reexports
+        rewrite-tbd
+        sigtool
+      ]
+    );
 
-    assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]);
-    assert    useAppleSDKLibs  -> lib.all        isFromNixpkgs (with prevStage.darwin; [ Libsystem ]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]);
-    assert (with prevStage.darwin; (! useAppleSDKLibs) -> CF == null);
+    assert (!useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]);
+    assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ Libsystem ]);
+    assert lib.all isFromNixpkgs (
+      with prevStage.darwin;
+      [
+        dyld
+        launchd
+        xnu
+      ]
+    );
+    assert (with prevStage.darwin; (!useAppleSDKLibs) -> CF == null);
 
-    assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm compiler-rt libcxx
-    ]);
+    assert lib.all isFromBootstrapFiles (
+      with prevStage.llvmPackages;
+      [
+        clang-unwrapped
+        libclang
+        libllvm
+        llvm
+        compiler-rt
+        libcxx
+      ]
+    );
 
     stageFun prevStage {
-    name = "bootstrap-stage1";
-
-    overrides = self: super: {
-      inherit (prevStage) ccWrapperStdenv
-        cctools coreutils gnugrep ld64;
-
-      binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils";
-      curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl";
+      name = "bootstrap-stage1";
 
-      # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv.
-      cmake = self.cmakeMinimal;
-      cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: {
-        buildInputs = old.buildInputs ++ [ self.darwin.CF ];
-      });
+      overrides = self: super: {
+        inherit (prevStage)
+          ccWrapperStdenv
+          cctools
+          coreutils
+          gnugrep
+          ld64
+          ;
+
+        binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils";
+        curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl";
+
+        # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv.
+        cmake = self.cmakeMinimal;
+        cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: {
+          buildInputs = old.buildInputs ++ [ self.darwin.CF ];
+        });
 
-      # Disable tests because they use dejagnu, which fails to run.
-      libffi = super.libffi.override { doCheck = false; };
+        # Disable tests because they use dejagnu, which fails to run.
+        libffi = super.libffi.override { doCheck = false; };
 
-      # Use libconvReal to break an infinite recursion. It will be dropped in the next stage.
-      libiconv = super.libiconvReal;
+        # Use libconvReal to break an infinite recursion. It will be dropped in the next stage.
+        libiconv = super.libiconvReal;
 
-      # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
-      libxml2 = super.libxml2.override { pythonSupport = false; };
+        # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
+        libxml2 = super.libxml2.override { pythonSupport = false; };
 
-      ninja = super.ninja.override { buildDocs = false; };
+        ninja = super.ninja.override { buildDocs = false; };
 
-      # Use this stage’s CF to build Python. It’s required, but it can’t be included in the stdenv.
-      python3 = self.python3Minimal;
-      python3Minimal = (super.python3Minimal.override {
-        self = self.python3Minimal;
-      }).overrideAttrs (old: {
-        buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ];
-      });
+        # Use this stage’s CF to build Python. It’s required, but it can’t be included in the stdenv.
+        python3 = self.python3Minimal;
+        python3Minimal =
+          (super.python3Minimal.override { self = self.python3Minimal; }).overrideAttrs
+            (old: {
+              buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ];
+            });
 
-      scons = super.scons.override { python3Packages = self.python3Minimal.pkgs; };
+        scons = super.scons.override { python3Packages = self.python3Minimal.pkgs; };
 
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        apple_sdk = superDarwin.apple_sdk // {
-          inherit (prevStage.darwin.apple_sdk) sdkRoot;
-        };
+        darwin = super.darwin.overrideScope (
+          selfDarwin: superDarwin: {
+            apple_sdk = superDarwin.apple_sdk // {
+              inherit (prevStage.darwin.apple_sdk) sdkRoot;
+            };
 
-        # Use this stage’s CF to build configd. It’s required, but it can’t be included in the stdenv.
-        configd = superDarwin.configd.overrideAttrs (old: {
-          buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ];
-        });
+            # Use this stage’s CF to build configd. It’s required, but it can’t be included in the stdenv.
+            configd = superDarwin.configd.overrideAttrs (old: {
+              buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ];
+            });
 
-        signingUtils = prevStage.darwin.signingUtils.override {
-          inherit (selfDarwin) sigtool;
-        };
+            signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; };
 
-        postLinkSignHook = prevStage.darwin.postLinkSignHook.override {
-          inherit (selfDarwin) sigtool;
-        };
+            postLinkSignHook = prevStage.darwin.postLinkSignHook.override { inherit (selfDarwin) sigtool; };
 
-        # Rewrap binutils with the real Libsystem
-        binutils = superDarwin.binutils.override {
-          inherit (self) coreutils;
-          bintools = selfDarwin.binutils-unwrapped;
-          libc = selfDarwin.Libsystem;
-          # TODO(@sternenseemann): can this be removed?
-          runtimeShell = "${bootstrapTools}/bin/bash";
+            # Rewrap binutils with the real Libsystem
+            binutils = superDarwin.binutils.override {
+              inherit (self) coreutils;
+              bintools = selfDarwin.binutils-unwrapped;
+              libc = selfDarwin.Libsystem;
+              # TODO(@sternenseemann): can this be removed?
+              runtimeShell = "${bootstrapTools}/bin/bash";
 
-          # Bootstrap tools cctools needs the hook to make sure things are signed properly.
-          # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
-          extraBuildCommands = ''
-            echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
+              # Bootstrap tools cctools needs the hook to make sure things are signed properly.
+              # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
+              extraBuildCommands = ''
+                echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
 
-            export signingUtils=${selfDarwin.signingUtils}
+                export signingUtils=${selfDarwin.signingUtils}
 
-            wrap \
-              install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \
-              "${selfDarwin.binutils-unwrapped}/bin/install_name_tool"
+                wrap \
+                  install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \
+                  "${selfDarwin.binutils-unwrapped}/bin/install_name_tool"
 
-            wrap \
-              strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \
-              "${selfDarwin.binutils-unwrapped}/bin/strip"
-          '';
-        };
+                wrap \
+                  strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \
+                  "${selfDarwin.binutils-unwrapped}/bin/strip"
+              '';
+            };
 
-        # Avoid building unnecessary Python dependencies due to building LLVM manpages.
-        binutils-unwrapped = superDarwin.binutils-unwrapped.override {
-          inherit (self) cctools ld64;
-          enableManpages = false;
-        };
-      });
-
-      llvmPackages = super.llvmPackages // (
-        let
-          tools = super.llvmPackages.tools.extend (_: _: {
-            inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm;
-          });
-          libraries = super.llvmPackages.libraries.extend (_: _: {
-            inherit (prevStage.llvmPackages) compiler-rt libcxx;
-          });
-        in
-        { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries
-      );
-    };
+            # Avoid building unnecessary Python dependencies due to building LLVM manpages.
+            binutils-unwrapped = superDarwin.binutils-unwrapped.override {
+              inherit (self) cctools ld64;
+              enableManpages = false;
+            };
+          }
+        );
 
-    extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-      prevStage.updateAutotoolsGnuConfigScriptsHook
-      prevStage.gnu-config
-    ];
+        llvmPackages =
+          super.llvmPackages
+          // (
+            let
+              tools = super.llvmPackages.tools.extend (
+                _: _: {
+                  inherit (prevStage.llvmPackages)
+                    clang-unwrapped
+                    libclang
+                    libllvm
+                    llvm
+                    ;
+                }
+              );
+              libraries = super.llvmPackages.libraries.extend (
+                _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; }
+              );
+            in
+            {
+              inherit tools libraries;
+              inherit (prevStage.llvmPackages) release_version;
+            }
+            // tools
+            // libraries
+          );
+      };
 
+      extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
+        prevStage.updateAutotoolsGnuConfigScriptsHook
+        prevStage.gnu-config
+      ];
 
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
+      extraPreHook = ''
+        stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
+      '';
+    }
+  )
 
   # Build sysctl for use by LLVM’s check phase. It must be built separately to avoid an infinite recursion.
-  (prevStage:
+  (
+    prevStage:
     # previous stage1 stdenv:
-    assert lib.all isFromBootstrapFiles (with prevStage; [ cctools coreutils gnugrep ld64 ]);
+    assert lib.all isFromBootstrapFiles (
+      with prevStage;
+      [
+        cctools
+        coreutils
+        gnugrep
+        ld64
+      ]
+    );
 
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      autoconf automake bash bison brotli cmake cpio cyrus_sasl db
-      ed expat flex gettext gmp groff icu libedit libffi libiconv libidn2 libkrb5 libssh2
-      libtool libunistring libxml2 m4 ncurses nghttp2 ninja openldap openssh openssl
-      patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite
-      subversion texinfo unzip which xz zlib zstd
-    ]);
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage;
+      [
+        autoconf
+        automake
+        bash
+        bison
+        brotli
+        cmake
+        cpio
+        cyrus_sasl
+        db
+        ed
+        expat
+        flex
+        gettext
+        gmp
+        groff
+        icu
+        libedit
+        libffi
+        libiconv
+        libidn2
+        libkrb5
+        libssh2
+        libtool
+        libunistring
+        libxml2
+        m4
+        ncurses
+        nghttp2
+        ninja
+        openldap
+        openssh
+        openssl
+        patchutils
+        pbzx
+        perl
+        pkg-config.pkg-config
+        python3
+        python3Minimal
+        scons
+        serf
+        sqlite
+        subversion
+        texinfo
+        unzip
+        which
+        xz
+        zlib
+        zstd
+      ]
+    );
 
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale print-reexports rewrite-tbd sigtool
-    ]);
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage.darwin;
+      [
+        locale
+        print-reexports
+        rewrite-tbd
+        sigtool
+      ]
+    );
 
-    assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
-    assert (! useAppleSDKLibs) -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF ]);
-    assert    useAppleSDKLibs  -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd xnu ]);
+    assert
+      (!useAppleSDKLibs)
+      -> lib.all isBuiltByBootstrapFilesCompiler (
+        with prevStage.darwin;
+        [
+          Libsystem
+          configd
+        ]
+      );
+    assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]);
+    assert
+      useAppleSDKLibs
+      -> lib.all isFromNixpkgs (
+        with prevStage.darwin;
+        [
+          CF
+          Libsystem
+          libobjc
+        ]
+      );
+    assert lib.all isFromNixpkgs (
+      with prevStage.darwin;
+      [
+        binutils-unwrapped
+        dyld
+        launchd
+        xnu
+      ]
+    );
 
-    assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm compiler-rt libcxx
-    ]);
+    assert lib.all isFromBootstrapFiles (
+      with prevStage.llvmPackages;
+      [
+        clang-unwrapped
+        libclang
+        libllvm
+        llvm
+        compiler-rt
+        libcxx
+      ]
+    );
 
     assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == "boot";
 
     stageFun prevStage {
-    name = "bootstrap-stage1-sysctl";
-
-    overrides = self: super: {
-      inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash binutils-unwrapped bison brotli cctools cmake cmakeMinimal
-        coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu ld64
-        libedit libffi libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4
-        ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config
-        python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz
-        zlib zstd;
-
-      # Avoid pulling in openldap just to run Meson’s tests.
-      meson = super.meson.overrideAttrs {
-        doInstallCheck = false;
-      };
+      name = "bootstrap-stage1-sysctl";
 
-      # The bootstrap Python needs its own `pythonAttr` to make sure the override works properly.
-      python3 = self.python3-bootstrap;
-      python3-bootstrap = super.python3.override {
-        self = self.python3-bootstrap;
-        pythonAttr = "python3-bootstrap";
-        enableLTO = false;
-      };
+      overrides = self: super: {
+        inherit (prevStage)
+          ccWrapperStdenv
+          autoconf
+          automake
+          bash
+          binutils-unwrapped
+          bison
+          brotli
+          cctools
+          cmake
+          cmakeMinimal
+          coreutils
+          cpio
+          curl
+          cyrus_sasl
+          db
+          ed
+          expat
+          flex
+          gettext
+          gmp
+          gnugrep
+          groff
+          icu
+          ld64
+          libedit
+          libffi
+          libidn2
+          libkrb5
+          libssh2
+          libtool
+          libunistring
+          libxml2
+          m4
+          ncurses
+          nghttp2
+          ninja
+          openldap
+          openssh
+          openssl
+          patchutils
+          pbzx
+          perl
+          pkg-config
+          python3Minimal
+          scons
+          sed
+          serf
+          sharutils
+          sqlite
+          subversion
+          texinfo
+          unzip
+          which
+          xz
+          zlib
+          zstd
+          ;
+
+        # Avoid pulling in openldap just to run Meson’s tests.
+        meson = super.meson.overrideAttrs { doInstallCheck = false; };
+
+        # The bootstrap Python needs its own `pythonAttr` to make sure the override works properly.
+        python3 = self.python3-bootstrap;
+        python3-bootstrap = super.python3.override {
+          self = self.python3-bootstrap;
+          pythonAttr = "python3-bootstrap";
+          enableLTO = false;
+        };
 
-      darwin = super.darwin.overrideScope (_: superDarwin: {
-        inherit (prevStage.darwin)
-          CF sdkRoot Libsystem binutils binutils-unwrapped configd darwin-stubs dtrace dyld
-          launchd libclosure libdispatch libobjc locale objc4 postLinkSignHook
-          print-reexports rewrite-tbd signingUtils sigtool;
+        darwin = super.darwin.overrideScope (
+          _: superDarwin: {
+            inherit (prevStage.darwin)
+              CF
+              sdkRoot
+              Libsystem
+              binutils
+              binutils-unwrapped
+              configd
+              darwin-stubs
+              dtrace
+              dyld
+              launchd
+              libclosure
+              libdispatch
+              libobjc
+              locale
+              objc4
+              postLinkSignHook
+              print-reexports
+              rewrite-tbd
+              signingUtils
+              sigtool
+              ;
+
+            apple_sdk = superDarwin.apple_sdk // {
+              inherit (prevStage.darwin.apple_sdk) sdkRoot;
+            };
+          }
+        );
 
-        apple_sdk = superDarwin.apple_sdk // {
-          inherit (prevStage.darwin.apple_sdk) sdkRoot;
-        };
-      });
-
-      llvmPackages = super.llvmPackages // (
-        let
-          tools = super.llvmPackages.tools.extend (_: _: {
-            inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm;
-            clang = prevStage.stdenv.cc;
-          });
-          libraries = super.llvmPackages.libraries.extend (_: _: {
-            inherit (prevStage.llvmPackages) compiler-rt libcxx;
-          });
-        in
-        { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries
-      );
-    };
+        llvmPackages =
+          super.llvmPackages
+          // (
+            let
+              tools = super.llvmPackages.tools.extend (
+                _: _: {
+                  inherit (prevStage.llvmPackages)
+                    clang-unwrapped
+                    libclang
+                    libllvm
+                    llvm
+                    ;
+                  clang = prevStage.stdenv.cc;
+                }
+              );
+              libraries = super.llvmPackages.libraries.extend (
+                _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; }
+              );
+            in
+            {
+              inherit tools libraries;
+              inherit (prevStage.llvmPackages) release_version;
+            }
+            // tools
+            // libraries
+          );
+      };
 
-    extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-      prevStage.updateAutotoolsGnuConfigScriptsHook
-      prevStage.gnu-config
-    ];
+      extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
+        prevStage.updateAutotoolsGnuConfigScriptsHook
+        prevStage.gnu-config
+      ];
 
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
+      extraPreHook = ''
+        stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
+      '';
+    }
+  )
 
   # First rebuild of LLVM. While this LLVM is linked to a bunch of junk from the bootstrap tools,
   # the libc++ and libc++abi it produces are not. The compiler will be rebuilt in a later stage,
@@ -720,450 +990,1114 @@ in
   #
   # The first build of cctools is deferred until this stage because it depends on LLVM headers
   # that are not included in the bootstrap tools tarball.
-  (prevStage:
+  (
+    prevStage:
     # previous stage-sysctl stdenv:
-    assert lib.all isFromBootstrapFiles (with prevStage; [ cctools coreutils gnugrep ld64 ]);
+    assert lib.all isFromBootstrapFiles (
+      with prevStage;
+      [
+        cctools
+        coreutils
+        gnugrep
+        ld64
+      ]
+    );
 
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      atf autoconf automake bash bison brotli cmake cpio cyrus_sasl db
-      ed expat flex gettext gmp groff icu kyua libedit libffi libiconv libidn2 libkrb5 libssh2
-      libtapi libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openldap openssh openssl
-      patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite
-      subversion sysctl.provider texinfo unzip which xz zlib zstd
-    ]);
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage;
+      [
+        atf
+        autoconf
+        automake
+        bash
+        bison
+        brotli
+        cmake
+        cpio
+        cyrus_sasl
+        db
+        ed
+        expat
+        flex
+        gettext
+        gmp
+        groff
+        icu
+        kyua
+        libedit
+        libffi
+        libiconv
+        libidn2
+        libkrb5
+        libssh2
+        libtapi
+        libtool
+        libunistring
+        libxml2
+        m4
+        meson
+        ncurses
+        nghttp2
+        ninja
+        openldap
+        openssh
+        openssl
+        patchutils
+        pbzx
+        perl
+        pkg-config.pkg-config
+        python3
+        python3Minimal
+        scons
+        serf
+        sqlite
+        subversion
+        sysctl.provider
+        texinfo
+        unzip
+        which
+        xz
+        zlib
+        zstd
+      ]
+    );
 
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale print-reexports rewrite-tbd sigtool
-    ]);
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage.darwin;
+      [
+        locale
+        print-reexports
+        rewrite-tbd
+        sigtool
+      ]
+    );
 
-    assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
-    assert (! useAppleSDKLibs) -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF ]);
-    assert    useAppleSDKLibs  -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd xnu ]);
+    assert
+      (!useAppleSDKLibs)
+      -> lib.all isBuiltByBootstrapFilesCompiler (
+        with prevStage.darwin;
+        [
+          Libsystem
+          configd
+        ]
+      );
+    assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]);
+    assert
+      useAppleSDKLibs
+      -> lib.all isFromNixpkgs (
+        with prevStage.darwin;
+        [
+          CF
+          Libsystem
+          libobjc
+        ]
+      );
+    assert lib.all isFromNixpkgs (
+      with prevStage.darwin;
+      [
+        binutils-unwrapped
+        dyld
+        launchd
+        xnu
+      ]
+    );
 
-    assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm compiler-rt libcxx
-    ]);
+    assert lib.all isFromBootstrapFiles (
+      with prevStage.llvmPackages;
+      [
+        clang-unwrapped
+        libclang
+        libllvm
+        llvm
+        compiler-rt
+        libcxx
+      ]
+    );
 
     stageFun prevStage {
-    name = "bootstrap-stage-xclang";
-
-    overrides = self: super: {
-      inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal
-        cpio curl cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv
-        libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja
-        openldap openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal
-        scons sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zlib zstd;
-
-      # Disable ld64’s install check phase because the required LTO libraries are not built yet.
-      ld64 = super.ld64.overrideAttrs { doInstallCheck = false; };
-
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        inherit (prevStage.darwin)
-          CF Libsystem configd darwin-stubs dyld launchd libclosure libdispatch libobjc
-          locale objc4 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool;
-
-        apple_sdk = superDarwin.apple_sdk // {
-          inherit (prevStage.darwin.apple_sdk) sdkRoot;
-        };
-
-        binutils = superDarwin.binutils.override {
-          inherit (prevStage) expand-response-params;
-          libc = selfDarwin.Libsystem;
-        };
+      name = "bootstrap-stage-xclang";
 
-        # Avoid building unnecessary Python dependencies due to building LLVM manpages.
-        binutils-unwrapped = superDarwin.binutils-unwrapped.override { enableManpages = false; };
-      });
-
-      llvmPackages = super.llvmPackages // (
-        let
-          llvmMajor = lib.versions.major super.llvmPackages.release_version;
-
-          # libc++, and libc++abi do not need CoreFoundation. Avoid propagating the CF from prior
-          # stages to the final stdenv via rpath by dropping it from `extraBuildInputs`.
-          stdenvNoCF = self.stdenv.override {
-            extraBuildInputs = [ ];
-          };
+      overrides = self: super: {
+        inherit (prevStage)
+          ccWrapperStdenv
+          atf
+          autoconf
+          automake
+          bash
+          binutils-unwrapped
+          bison
+          brotli
+          cmake
+          cmakeMinimal
+          cpio
+          curl
+          cyrus_sasl
+          db
+          ed
+          expat
+          flex
+          gettext
+          gmp
+          groff
+          icu
+          kyua
+          libedit
+          libffi
+          libiconv
+          libidn2
+          libkrb5
+          libssh2
+          libtool
+          libunistring
+          libxml2
+          m4
+          meson
+          ncurses
+          nghttp2
+          ninja
+          openldap
+          openssh
+          openssl
+          patchutils
+          pbzx
+          perl
+          pkg-config
+          python3
+          python3Minimal
+          scons
+          sed
+          serf
+          sharutils
+          sqlite
+          subversion
+          sysctl
+          texinfo
+          unzip
+          which
+          xz
+          zlib
+          zstd
+          ;
+
+        # Disable ld64’s install check phase because the required LTO libraries are not built yet.
+        ld64 = super.ld64.overrideAttrs { doInstallCheck = false; };
+
+        darwin = super.darwin.overrideScope (
+          selfDarwin: superDarwin: {
+            inherit (prevStage.darwin)
+              CF
+              Libsystem
+              configd
+              darwin-stubs
+              dyld
+              launchd
+              libclosure
+              libdispatch
+              libobjc
+              locale
+              objc4
+              postLinkSignHook
+              print-reexports
+              rewrite-tbd
+              signingUtils
+              sigtool
+              ;
+
+            apple_sdk = superDarwin.apple_sdk // {
+              inherit (prevStage.darwin.apple_sdk) sdkRoot;
+            };
 
-          libcxxBootstrapStdenv = self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override {
-            nixSupport.cc-cflags = [ "-nostdlib" ];
-            nixSupport.cc-ldflags = [ "-lSystem" ];
-          });
+            binutils = superDarwin.binutils.override {
+              inherit (prevStage) expand-response-params;
+              libc = selfDarwin.Libsystem;
+            };
 
-          tools = super.llvmPackages.tools.extend (selfTools: superTools: {
-            # LLVM’s check phase takes a while to run, so disable it in the first LLVM build to speed up the bootstrap.
-            libllvm = superTools.libllvm.override { doCheck = false; };
-          });
+            # Avoid building unnecessary Python dependencies due to building LLVM manpages.
+            binutils-unwrapped = superDarwin.binutils-unwrapped.override { enableManpages = false; };
+          }
+        );
 
-          libraries = super.llvmPackages.libraries.extend (selfLib: superLib: {
-            compiler-rt = null;
-            libcxx = superLib.libcxx.override ({
-              stdenv = libcxxBootstrapStdenv;
-            });
-          });
-        in
-        { inherit tools libraries; } // tools // libraries
-      );
-    };
+        llvmPackages =
+          super.llvmPackages
+          // (
+            let
+              llvmMajor = lib.versions.major super.llvmPackages.release_version;
+
+              # libc++, and libc++abi do not need CoreFoundation. Avoid propagating the CF from prior
+              # stages to the final stdenv via rpath by dropping it from `extraBuildInputs`.
+              stdenvNoCF = self.stdenv.override { extraBuildInputs = [ ]; };
+
+              libcxxBootstrapStdenv = self.overrideCC stdenvNoCF (
+                self.llvmPackages.clangNoCompilerRtWithLibc.override {
+                  nixSupport.cc-cflags = [ "-nostdlib" ];
+                  nixSupport.cc-ldflags = [ "-lSystem" ];
+                }
+              );
+
+              tools = super.llvmPackages.tools.extend (
+                selfTools: superTools: {
+                  # LLVM’s check phase takes a while to run, so disable it in the first LLVM build to speed up the bootstrap.
+                  libllvm = superTools.libllvm.override { doCheck = false; };
+                }
+              );
+
+              libraries = super.llvmPackages.libraries.extend (
+                selfLib: superLib: {
+                  compiler-rt = null;
+                  libcxx = superLib.libcxx.override ({ stdenv = libcxxBootstrapStdenv; });
+                }
+              );
+            in
+            { inherit tools libraries; } // tools // libraries
+          );
+      };
 
-    extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-      prevStage.updateAutotoolsGnuConfigScriptsHook
-      prevStage.gnu-config
-    ];
+      extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
+        prevStage.updateAutotoolsGnuConfigScriptsHook
+        prevStage.gnu-config
+      ];
 
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
+      extraPreHook = ''
+        stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
+      '';
+    }
+  )
 
   # This stage rebuilds Libsystem. It also rebuilds bash, which will be needed in later stages
   # to use in patched shebangs (e.g., to make sure `icu-config` uses bash from nixpkgs).
-  (prevStage:
+  (
+    prevStage:
     # previous stage-xclang stdenv:
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      atf autoconf automake bash bison cctools cmake cmakeMinimal coreutils cpio
-      cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua ld64 libedit libtapi libtool m4 meson ninja
-      openbsm openldap openpam openssh patchutils pbzx perl pkg-config.pkg-config python3
-      python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz
-    ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      brotli libffi libiconv libidn2 libkrb5 libssh2 libunistring libxml2 ncurses
-      nghttp2 openssl zlib zstd
-    ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale print-reexports rewrite-tbd sigtool
-    ]);
-
-    assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
-    assert (! useAppleSDKLibs) -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF ]);
-    assert    useAppleSDKLibs  -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm
-    ]);
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage;
+      [
+        atf
+        autoconf
+        automake
+        bash
+        bison
+        cctools
+        cmake
+        cmakeMinimal
+        coreutils
+        cpio
+        cyrus_sasl
+        db
+        ed
+        expat
+        flex
+        gettext
+        gmp
+        gnugrep
+        groff
+        icu
+        kyua
+        ld64
+        libedit
+        libtapi
+        libtool
+        m4
+        meson
+        ninja
+        openbsm
+        openldap
+        openpam
+        openssh
+        patchutils
+        pbzx
+        perl
+        pkg-config.pkg-config
+        python3
+        python3Minimal
+        scons
+        serf
+        sqlite
+        subversion
+        sysctl.provider
+        texinfo
+        unzip
+        which
+        xz
+      ]
+    );
+
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage;
+      [
+        brotli
+        libffi
+        libiconv
+        libidn2
+        libkrb5
+        libssh2
+        libunistring
+        libxml2
+        ncurses
+        nghttp2
+        openssl
+        zlib
+        zstd
+      ]
+    );
+
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage.darwin;
+      [
+        locale
+        print-reexports
+        rewrite-tbd
+        sigtool
+      ]
+    );
+
+    assert
+      (!useAppleSDKLibs)
+      -> lib.all isBuiltByBootstrapFilesCompiler (
+        with prevStage.darwin;
+        [
+          Libsystem
+          configd
+        ]
+      );
+    assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]);
+    assert
+      useAppleSDKLibs
+      -> lib.all isFromNixpkgs (
+        with prevStage.darwin;
+        [
+          CF
+          Libsystem
+          libobjc
+        ]
+      );
+    assert lib.all isFromNixpkgs (
+      with prevStage.darwin;
+      [
+        binutils-unwrapped
+        dyld
+        launchd
+        libclosure
+        libdispatch
+        xnu
+      ]
+    );
+
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage.llvmPackages;
+      [
+        clang-unwrapped
+        libclang
+        libllvm
+        llvm
+      ]
+    );
     assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]);
     assert prevStage.llvmPackages.compiler-rt == null;
 
     stageFun prevStage {
 
-    name = "bootstrap-stage2";
-
-    overrides = self: super: {
-      inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake binutils-unwrapped bison brotli cctools cmake cmakeMinimal coreutils
-        cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua ld64 libedit libffi
-        libiconv libidn2 libkrb5 libssh2 libtapi libtool libunistring libxml2 m4 meson ncurses nghttp2
-        ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config
-        python3 python3Minimal scons serf sqlite subversion sysctl texinfo unzip which xz
-        zlib zstd;
-
-      # Bash must be linked against the system CoreFoundation instead of the open-source one.
-      # Otherwise, there will be a dependency cycle: bash -> CF -> icu -> bash (for icu^dev).
-      bash = super.bash.overrideAttrs (super: {
-        buildInputs = super.buildInputs ++ [ self.darwin.apple_sdk.frameworks.CoreFoundation ];
-      });
-
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        inherit (prevStage.darwin)
-          binutils-unwrapped configd darwin-stubs launchd locale postLinkSignHook
-          print-reexports rewrite-tbd signingUtils sigtool;
-
-        apple_sdk = superDarwin.apple_sdk // {
-          inherit (prevStage.darwin.apple_sdk) sdkRoot;
-        };
-
-        # Rewrap binutils so it uses the rebuilt Libsystem.
-        binutils = superDarwin.binutils.override {
-          inherit (prevStage) expand-response-params;
-          libc = selfDarwin.Libsystem;
-        } // {
-          passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; };
-        };
-      });
+      name = "bootstrap-stage2";
 
-      llvmPackages = super.llvmPackages // (
-        let
-          tools = super.llvmPackages.tools.extend (_: _: {
-            inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang lld libllvm llvm;
-          });
+      overrides = self: super: {
+        inherit (prevStage)
+          ccWrapperStdenv
+          atf
+          autoconf
+          automake
+          binutils-unwrapped
+          bison
+          brotli
+          cctools
+          cmake
+          cmakeMinimal
+          coreutils
+          cpio
+          curl
+          cyrus_sasl
+          db
+          ed
+          expat
+          flex
+          gettext
+          gmp
+          gnugrep
+          groff
+          icu
+          kyua
+          ld64
+          libedit
+          libffi
+          libiconv
+          libidn2
+          libkrb5
+          libssh2
+          libtapi
+          libtool
+          libunistring
+          libxml2
+          m4
+          meson
+          ncurses
+          nghttp2
+          ninja
+          openbsm
+          openldap
+          openpam
+          openssh
+          openssl
+          patchutils
+          pbzx
+          perl
+          pkg-config
+          python3
+          python3Minimal
+          scons
+          serf
+          sqlite
+          subversion
+          sysctl
+          texinfo
+          unzip
+          which
+          xz
+          zlib
+          zstd
+          ;
+
+        # Bash must be linked against the system CoreFoundation instead of the open-source one.
+        # Otherwise, there will be a dependency cycle: bash -> CF -> icu -> bash (for icu^dev).
+        bash = super.bash.overrideAttrs (super: {
+          buildInputs = super.buildInputs ++ [ self.darwin.apple_sdk.frameworks.CoreFoundation ];
+        });
 
-          libraries = super.llvmPackages.libraries.extend (selfLib: superLib: {
-            inherit (prevStage.llvmPackages) libcxx;
+        darwin = super.darwin.overrideScope (
+          selfDarwin: superDarwin: {
+            inherit (prevStage.darwin)
+              binutils-unwrapped
+              configd
+              darwin-stubs
+              launchd
+              locale
+              postLinkSignHook
+              print-reexports
+              rewrite-tbd
+              signingUtils
+              sigtool
+              ;
+
+            apple_sdk = superDarwin.apple_sdk // {
+              inherit (prevStage.darwin.apple_sdk) sdkRoot;
+            };
 
-            # Make sure compiler-rt is linked against the CF from this stage, which can be
-            # propagated to the final stdenv. CF is required by ASAN.
-            compiler-rt = superLib.compiler-rt.override ({
-              inherit (self.llvmPackages) libllvm;
-              stdenv = self.stdenv.override {
-                extraBuildInputs = [ self.darwin.CF ];
+            # Rewrap binutils so it uses the rebuilt Libsystem.
+            binutils =
+              superDarwin.binutils.override {
+                inherit (prevStage) expand-response-params;
+                libc = selfDarwin.Libsystem;
+              }
+              // {
+                passthru = {
+                  inherit (prevStage.bintools.passthru) isFromBootstrapFiles;
+                };
               };
-            });
-          });
-        in
-        { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries
-      );
+          }
+        );
 
-      # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to
-      # the final stdenv, which happens because of the rpath hook.
-      stdenv =
-        let
-          stdenvNoCF = super.stdenv.override {
-            extraBuildInputs = [ ];
-          };
-        in
-        self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override {
-          inherit (self.llvmPackages) libcxx;
-        });
-    };
+        llvmPackages =
+          super.llvmPackages
+          // (
+            let
+              tools = super.llvmPackages.tools.extend (
+                _: _: {
+                  inherit (prevStage.llvmPackages)
+                    clang-unwrapped
+                    clangNoCompilerRtWithLibc
+                    libclang
+                    lld
+                    libllvm
+                    llvm
+                    ;
+                }
+              );
+
+              libraries = super.llvmPackages.libraries.extend (
+                selfLib: superLib: {
+                  inherit (prevStage.llvmPackages) libcxx;
+
+                  # Make sure compiler-rt is linked against the CF from this stage, which can be
+                  # propagated to the final stdenv. CF is required by ASAN.
+                  compiler-rt = superLib.compiler-rt.override ({
+                    inherit (self.llvmPackages) libllvm;
+                    stdenv = self.stdenv.override { extraBuildInputs = [ self.darwin.CF ]; };
+                  });
+                }
+              );
+            in
+            {
+              inherit tools libraries;
+              inherit (prevStage.llvmPackages) release_version;
+            }
+            // tools
+            // libraries
+          );
 
-    extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-      prevStage.updateAutotoolsGnuConfigScriptsHook
-      prevStage.gnu-config
-    ];
+        # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to
+        # the final stdenv, which happens because of the rpath hook.
+        stdenv =
+          let
+            stdenvNoCF = super.stdenv.override { extraBuildInputs = [ ]; };
+          in
+          self.overrideCC stdenvNoCF (
+            self.llvmPackages.clangNoCompilerRtWithLibc.override { inherit (self.llvmPackages) libcxx; }
+          );
+      };
 
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
+      extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
+        prevStage.updateAutotoolsGnuConfigScriptsHook
+        prevStage.gnu-config
+      ];
+
+      extraPreHook = ''
+        stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
+      '';
+    }
+  )
 
   # Rebuild LLVM with LLVM. This stage also rebuilds certain dependencies needed by LLVM.
   #
   # LLVM requires: libcxx libffi libiconv libxml2 ncurses python3 zlib
-  (prevStage:
+  (
+    prevStage:
     # previous stage2 stdenv:
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      autoconf automake bison brotli cctools cmake cmakeMinimal coreutils cpio cyrus_sasl
-      db ed expat flex gettext gmp gnugrep groff icu ld64 libedit libffi libiconv libidn2 libkrb5 libssh2 libtool
-      libtapi libunistring libxml2 m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl
-      patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite
-      subversion sysctl.provider texinfo unzip which xz zstd zlib
-    ]);
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage;
+      [
+        autoconf
+        automake
+        bison
+        brotli
+        cctools
+        cmake
+        cmakeMinimal
+        coreutils
+        cpio
+        cyrus_sasl
+        db
+        ed
+        expat
+        flex
+        gettext
+        gmp
+        gnugrep
+        groff
+        icu
+        ld64
+        libedit
+        libffi
+        libiconv
+        libidn2
+        libkrb5
+        libssh2
+        libtool
+        libtapi
+        libunistring
+        libxml2
+        m4
+        meson
+        ncurses
+        nghttp2
+        ninja
+        openbsm
+        openldap
+        openpam
+        openssh
+        openssl
+        patchutils
+        pbzx
+        perl
+        pkg-config.pkg-config
+        python3
+        python3Minimal
+        scons
+        serf
+        sqlite
+        subversion
+        sysctl.provider
+        texinfo
+        unzip
+        which
+        xz
+        zstd
+        zlib
+      ]
+    );
     assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ bash ]);
 
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale print-reexports rewrite-tbd sigtool
-    ]);
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage.darwin;
+      [
+        locale
+        print-reexports
+        rewrite-tbd
+        sigtool
+      ]
+    );
 
-    assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
-    assert (! useAppleSDKLibs) -> lib.all        isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
-    assert (! useAppleSDKLibs) -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF ]);
-    assert    useAppleSDKLibs  -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]);
+    assert
+      (!useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
+    assert
+      (!useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
+    assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]);
+    assert
+      useAppleSDKLibs
+      -> lib.all isFromNixpkgs (
+        with prevStage.darwin;
+        [
+          CF
+          Libsystem
+          libobjc
+        ]
+      );
+    assert lib.all isFromNixpkgs (
+      with prevStage.darwin;
+      [
+        binutils-unwrapped
+        dyld
+        launchd
+        libclosure
+        libdispatch
+        xnu
+      ]
+    );
 
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm
-    ]);
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage.llvmPackages;
+      [
+        clang-unwrapped
+        libclang
+        libllvm
+        llvm
+      ]
+    );
     assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]);
 
     stageFun prevStage {
 
-    name = "bootstrap-stage3";
-
-    overrides = self: super: {
-      inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal
-        coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit
-        libidn2 libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap
-        openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons
-        sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd;
+      name = "bootstrap-stage3";
 
-      # Disable tests because they use dejagnu, which fails to run.
-      libffi = super.libffi.override { doCheck = false; };
-
-      # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
-      libxml2 = super.libxml2.override { pythonSupport = false; };
-
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        inherit (prevStage.darwin)
-          CF Libsystem binutils binutils-unwrapped configd
-          darwin-stubs dyld launchd libclosure libdispatch libobjc locale objc4
-          postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool;
+      overrides = self: super: {
+        inherit (prevStage)
+          ccWrapperStdenv
+          autoconf
+          automake
+          bash
+          binutils-unwrapped
+          bison
+          brotli
+          cmake
+          cmakeMinimal
+          coreutils
+          cpio
+          curl
+          cyrus_sasl
+          db
+          ed
+          expat
+          flex
+          gettext
+          gmp
+          gnugrep
+          groff
+          libedit
+          libidn2
+          libkrb5
+          libssh2
+          libtool
+          libunistring
+          m4
+          meson
+          nghttp2
+          ninja
+          openbsm
+          openldap
+          openpam
+          openssh
+          openssl
+          patchutils
+          pbzx
+          perl
+          pkg-config
+          python3
+          python3Minimal
+          scons
+          sed
+          serf
+          sharutils
+          sqlite
+          subversion
+          sysctl
+          texinfo
+          unzip
+          which
+          xz
+          zstd
+          ;
+
+        # Disable tests because they use dejagnu, which fails to run.
+        libffi = super.libffi.override { doCheck = false; };
+
+        # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
+        libxml2 = super.libxml2.override { pythonSupport = false; };
+
+        darwin = super.darwin.overrideScope (
+          selfDarwin: superDarwin: {
+            inherit (prevStage.darwin)
+              CF
+              Libsystem
+              binutils
+              binutils-unwrapped
+              configd
+              darwin-stubs
+              dyld
+              launchd
+              libclosure
+              libdispatch
+              libobjc
+              locale
+              objc4
+              postLinkSignHook
+              print-reexports
+              rewrite-tbd
+              signingUtils
+              sigtool
+              ;
+
+            apple_sdk = superDarwin.apple_sdk // {
+              inherit (prevStage.darwin.apple_sdk) sdkRoot;
+            };
+          }
+        );
 
-        apple_sdk = superDarwin.apple_sdk // {
-          inherit (prevStage.darwin.apple_sdk) sdkRoot;
-        };
-      });
-
-      llvmPackages = super.llvmPackages // (
-        let
-          libraries = super.llvmPackages.libraries.extend (_: _: {
-           inherit (prevStage.llvmPackages) compiler-rt libcxx;
-          });
-        in
-        { inherit libraries; } // libraries
-      );
-    };
+        llvmPackages =
+          super.llvmPackages
+          // (
+            let
+              libraries = super.llvmPackages.libraries.extend (
+                _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; }
+              );
+            in
+            { inherit libraries; } // libraries
+          );
+      };
 
-    extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-      prevStage.updateAutotoolsGnuConfigScriptsHook
-      prevStage.gnu-config
-    ];
+      extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
+        prevStage.updateAutotoolsGnuConfigScriptsHook
+        prevStage.gnu-config
+      ];
 
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
+      extraPreHook = ''
+        stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
+      '';
+    }
+  )
 
   # Construct a standard environment with the new clang. Also use the new compiler to rebuild
   # everything that will be part of the final stdenv and isn’t required by it, CF, or Libsystem.
-  (prevStage:
+  (
+    prevStage:
     # previous stage3 stdenv:
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl
-      db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 libssh2 libtool
-      libunistring m4 meson nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx
-      perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion
-      sysctl.provider texinfo unzip which xz zstd
-    ]);
-
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [
-      bash cctools icu ld64 libtapi libffi libiconv libxml2 zlib
-    ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale print-reexports rewrite-tbd sigtool
-    ]);
-
-    assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
-    assert (! useAppleSDKLibs) -> lib.all        isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
-    assert (! useAppleSDKLibs) -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF ]);
-    assert    useAppleSDKLibs  -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]);
-
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm compiler-rt libcxx
-    ]);
-
-    stageFun prevStage {
-
-    name = "bootstrap-stage4";
-
-    overrides = self: super: {
-      inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash binutils-unwrapped bison cmake cmakeMinimal curl cyrus_sasl db expat flex groff
-        libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 python3Minimal scons
-        serf sqlite subversion sysctl texinfo unzip which
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage;
+      [
+        autoconf
+        automake
+        bison
+        brotli
+        cmake
+        cmakeMinimal
+        coreutils
+        cpio
+        cyrus_sasl
+        db
+        ed
+        expat
+        flex
+        gettext
+        gmp
+        gnugrep
+        groff
+        libedit
+        libidn2
+        libkrb5
+        libssh2
+        libtool
+        libunistring
+        m4
+        meson
+        nghttp2
+        ninja
+        openbsm
+        openldap
+        openpam
+        openssh
+        openssl
+        patchutils
+        pbzx
+        perl
+        pkg-config.pkg-config
+        python3
+        python3Minimal
+        scons
+        serf
+        sqlite
+        subversion
+        sysctl.provider
+        texinfo
+        unzip
+        which
+        xz
+        zstd
+      ]
+    );
 
-        # CF dependencies - don’t rebuild them.
+    assert lib.all isBuiltByNixpkgsCompiler (
+      with prevStage;
+      [
+        bash
+        cctools
         icu
+        ld64
+        libtapi
+        libffi
+        libiconv
+        libxml2
+        zlib
+      ]
+    );
 
-        # LLVM dependencies - don’t rebuild them.
-        libffi libiconv libiconv-darwin libxml2 ncurses zlib;
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage.darwin;
+      [
+        locale
+        print-reexports
+        rewrite-tbd
+        sigtool
+      ]
+    );
 
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        inherit (prevStage.darwin) dyld CF Libsystem darwin-stubs
-          # CF dependencies - don’t rebuild them.
-          libobjc objc4;
+    assert
+      (!useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
+    assert
+      (!useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
+    assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]);
+    assert
+      useAppleSDKLibs
+      -> lib.all isFromNixpkgs (
+        with prevStage.darwin;
+        [
+          CF
+          Libsystem
+          libobjc
+        ]
+      );
+    assert lib.all isFromNixpkgs (
+      with prevStage.darwin;
+      [
+        binutils-unwrapped
+        dyld
+        launchd
+        libclosure
+        libdispatch
+        xnu
+      ]
+    );
 
-        apple_sdk = superDarwin.apple_sdk // {
-          inherit (prevStage.darwin.apple_sdk) sdkRoot;
-        };
+    assert lib.all isBuiltByNixpkgsCompiler (
+      with prevStage.llvmPackages;
+      [
+        clang-unwrapped
+        libclang
+        libllvm
+        llvm
+        compiler-rt
+        libcxx
+      ]
+    );
 
-        signingUtils = superDarwin.signingUtils.override {
-          inherit (selfDarwin) sigtool;
-        };
+    stageFun prevStage {
 
-        binutils = superDarwin.binutils.override {
-          inherit (prevStage) expand-response-params;
+      name = "bootstrap-stage4";
 
-          bintools = selfDarwin.binutils-unwrapped;
-          libc = selfDarwin.Libsystem;
-        };
+      overrides = self: super: {
+        inherit (prevStage)
+          ccWrapperStdenv
+          autoconf
+          automake
+          bash
+          binutils-unwrapped
+          bison
+          cmake
+          cmakeMinimal
+          curl
+          cyrus_sasl
+          db
+          expat
+          flex
+          groff
+          libedit
+          libtool
+          m4
+          meson
+          ninja
+          openldap
+          openssh
+          patchutils
+          perl
+          pkg-config
+          python3
+          python3Minimal
+          scons
+          serf
+          sqlite
+          subversion
+          sysctl
+          texinfo
+          unzip
+          which
 
-        # binutils-unwrapped needs to build the LLVM man pages, which requires a lot of Python stuff
-        # that ultimately ends up depending on git. Fortunately, the git dependency is only for check
-        # inputs. The following set of overrides allow the LLVM documentation to be built without
-        # pulling curl (and other packages like ffmpeg) into the stdenv bootstrap.
-        binutils-unwrapped = superDarwin.binutils-unwrapped.override (old: {
-          llvm-manpages = super.llvmPackages.llvm-manpages.override {
-            python3Packages = self.python3.pkgs.overrideScope (_: superPython: {
-              hatch-vcs = superPython.hatch-vcs.overrideAttrs {
-                doInstallCheck = false;
-              };
-              markdown-it-py = superPython.markdown-it-py.overrideAttrs {
-                doInstallCheck = false;
-              };
-              mdit-py-plugins = superPython.mdit-py-plugins.overrideAttrs {
-                doInstallCheck = false;
-              };
-              myst-parser = superPython.myst-parser.overrideAttrs {
-                doInstallCheck = false;
-              };
-            });
-          };
-        });
-      });
+          # CF dependencies - don’t rebuild them.
+          icu
+
+          # LLVM dependencies - don’t rebuild them.
+          libffi
+          libiconv
+          libiconv-darwin
+          libxml2
+          ncurses
+          zlib
+          ;
+
+        darwin = super.darwin.overrideScope (
+          selfDarwin: superDarwin: {
+            inherit (prevStage.darwin)
+              dyld
+              CF
+              Libsystem
+              darwin-stubs
+              # CF dependencies - don’t rebuild them.
+              libobjc
+              objc4
+              ;
+
+            apple_sdk = superDarwin.apple_sdk // {
+              inherit (prevStage.darwin.apple_sdk) sdkRoot;
+            };
 
-      llvmPackages = super.llvmPackages // (
-        let
-          tools = super.llvmPackages.tools.extend (_: _: {
-            inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm;
-            libcxxClang = lib.makeOverridable (import ../../build-support/cc-wrapper) {
-              nativeTools = false;
-              nativeLibc = false;
+            signingUtils = superDarwin.signingUtils.override { inherit (selfDarwin) sigtool; };
 
+            binutils = superDarwin.binutils.override {
               inherit (prevStage) expand-response-params;
 
-              extraPackages = [
-                self.llvmPackages.compiler-rt
-              ];
+              bintools = selfDarwin.binutils-unwrapped;
+              libc = selfDarwin.Libsystem;
+            };
 
-              extraBuildCommands =
-                let
-                  inherit (self.llvmPackages) clang-unwrapped compiler-rt release_version;
-
-                  # Clang 16+ uses only the major version in resource-root, but older versions use the complete one.
-                  clangResourceRootIncludePath = clangLib: clangRelease:
-                    let
-                      clangVersion =
-                        if lib.versionAtLeast clangRelease "16"
-                        then lib.versions.major clangRelease
-                        else clangRelease;
-                    in
-                    "${clangLib}/lib/clang/${clangVersion}/include";
-                in
-                ''
-                  rsrc="$out/resource-root"
-                  mkdir "$rsrc"
-                  ln -s "${clangResourceRootIncludePath clang-unwrapped.lib release_version}" "$rsrc"
-                  ln -s "${compiler-rt.out}/lib"   "$rsrc/lib"
-                  ln -s "${compiler-rt.out}/share" "$rsrc/share"
-                  echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-                '';
-
-              cc = self.llvmPackages.clang-unwrapped;
-              bintools = self.darwin.binutils;
-
-              isClang = true;
-              libc = self.darwin.Libsystem;
-              inherit (self.llvmPackages) libcxx;
+            # binutils-unwrapped needs to build the LLVM man pages, which requires a lot of Python stuff
+            # that ultimately ends up depending on git. Fortunately, the git dependency is only for check
+            # inputs. The following set of overrides allow the LLVM documentation to be built without
+            # pulling curl (and other packages like ffmpeg) into the stdenv bootstrap.
+            binutils-unwrapped = superDarwin.binutils-unwrapped.override (old: {
+              llvm-manpages = super.llvmPackages.llvm-manpages.override {
+                python3Packages = self.python3.pkgs.overrideScope (
+                  _: superPython: {
+                    hatch-vcs = superPython.hatch-vcs.overrideAttrs { doInstallCheck = false; };
+                    markdown-it-py = superPython.markdown-it-py.overrideAttrs { doInstallCheck = false; };
+                    mdit-py-plugins = superPython.mdit-py-plugins.overrideAttrs { doInstallCheck = false; };
+                    myst-parser = superPython.myst-parser.overrideAttrs { doInstallCheck = false; };
+                  }
+                );
+              };
+            });
+          }
+        );
 
-              inherit lib;
-              inherit (self) stdenvNoCC coreutils gnugrep runtimeShell;
-            };
-          });
-          libraries = super.llvmPackages.libraries.extend (_: _:{
-            inherit (prevStage.llvmPackages) compiler-rt libcxx;
-          });
-        in
-        { inherit tools libraries; } // tools // libraries
-      );
-    };
+        llvmPackages =
+          super.llvmPackages
+          // (
+            let
+              tools = super.llvmPackages.tools.extend (
+                _: _: {
+                  inherit (prevStage.llvmPackages)
+                    clang-unwrapped
+                    libclang
+                    libllvm
+                    llvm
+                    ;
+                  libcxxClang = lib.makeOverridable (import ../../build-support/cc-wrapper) {
+                    nativeTools = false;
+                    nativeLibc = false;
+
+                    inherit (prevStage) expand-response-params;
+
+                    extraPackages = [ self.llvmPackages.compiler-rt ];
+
+                    extraBuildCommands =
+                      let
+                        inherit (self.llvmPackages) clang-unwrapped compiler-rt release_version;
+
+                        # Clang 16+ uses only the major version in resource-root, but older versions use the complete one.
+                        clangResourceRootIncludePath =
+                          clangLib: clangRelease:
+                          let
+                            clangVersion =
+                              if lib.versionAtLeast clangRelease "16" then lib.versions.major clangRelease else clangRelease;
+                          in
+                          "${clangLib}/lib/clang/${clangVersion}/include";
+                      in
+                      ''
+                        rsrc="$out/resource-root"
+                        mkdir "$rsrc"
+                        ln -s "${clangResourceRootIncludePath clang-unwrapped.lib release_version}" "$rsrc"
+                        ln -s "${compiler-rt.out}/lib"   "$rsrc/lib"
+                        ln -s "${compiler-rt.out}/share" "$rsrc/share"
+                        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+                      '';
+
+                    cc = self.llvmPackages.clang-unwrapped;
+                    bintools = self.darwin.binutils;
+
+                    isClang = true;
+                    libc = self.darwin.Libsystem;
+                    inherit (self.llvmPackages) libcxx;
+
+                    inherit lib;
+                    inherit (self)
+                      stdenvNoCC
+                      coreutils
+                      gnugrep
+                      runtimeShell
+                      ;
+                  };
+                }
+              );
+              libraries = super.llvmPackages.libraries.extend (
+                _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; }
+              );
+            in
+            { inherit tools libraries; } // tools // libraries
+          );
+      };
 
-    extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-      prevStage.updateAutotoolsGnuConfigScriptsHook
-      prevStage.gnu-config
-    ];
+      extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
+        prevStage.updateAutotoolsGnuConfigScriptsHook
+        prevStage.gnu-config
+      ];
 
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
+      extraPreHook = ''
+        stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
+      '';
+    }
+  )
 
   # Construct the final stdenv. The version of LLVM provided should match the one defined in
   # `all-packages.nix` for Darwin. Nothing should depend on the bootstrap tools or originate from
@@ -1171,189 +2105,371 @@ in
   #
   # When updating the Darwin stdenv, make sure that the result has no dependency (`nix-store -qR`)
   # on `bootstrapTools` or the binutils built in stage 1.
-  (prevStage:
+  (
+    prevStage:
     # previous stage4 stdenv:
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [
-      bash brotli bzip2 cctools cpio diffutils ed file findutils gawk
-      gettext gmp gnugrep gnumake gnused gnutar gzip icu ld64 libffi libiconv libidn2 libkrb5
-      libssh2 libtapi libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch
-      pbzx pcre xar xz zlib zstd
-    ]);
-
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ locale print-reexports rewrite-tbd sigtool ]);
-
-    assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]);
-    assert (! useAppleSDKLibs) -> lib.all            isFromNixpkgs (with prevStage.darwin; [ CF ]);
-    assert    useAppleSDKLibs  -> lib.all            isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]);
-
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm compiler-rt libcxx
-    ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit
-      libtool m4 meson ninja openldap openssh patchutils perl pkg-config.pkg-config python3 python3Minimal scons
-      serf sqlite subversion sysctl.provider texinfo unzip which
-    ]);
-
-    let
-      cc = prevStage.llvmPackages.clang;
-    in
-    {
-    inherit config overlays;
-    stdenv = import ../generic {
-      name = "stdenv-darwin";
-
-      buildPlatform = localSystem;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
-
-      inherit config;
-
-      preHook = ''
-        ${commonPreHook}
-        stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-        export PATH_LOCALE=${prevStage.darwin.locale}/share/locale
-      '';
-
-      initialPath = ((import ../generic/common-path.nix) { pkgs = prevStage; });
-
-      extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-        prevStage.updateAutotoolsGnuConfigScriptsHook
-      ] ++ [ prevStage.darwin.apple_sdk.sdkRoot ];
-
-      extraBuildInputs = [ prevStage.darwin.CF ];
-
-      inherit cc;
-
-      shell = cc.shell;
-
-      inherit (prevStage.stdenv) fetchurlBoot;
-
-      extraAttrs = {
-        inherit bootstrapTools;
-        libc = prevStage.darwin.Libsystem;
-        shellPackage = prevStage.bash;
-      } // lib.optionalAttrs useAppleSDKLibs {
-        # This objc4 will be propagated to all builds using the final stdenv,
-        # and we shouldn't mix different builds, because they would be
-        # conflicting LLVM modules. Export it here so we can grab it later.
-        inherit (prevStage.darwin) objc4;
-      };
-
-      disallowedRequisites = [ bootstrapTools.out ];
-
-      allowedRequisites = (with prevStage; [
+    assert lib.all isBuiltByNixpkgsCompiler (
+      with prevStage;
+      [
         bash
-        bzip2.bin
-        bzip2.out
-        cc.expand-response-params
+        brotli
+        bzip2
         cctools
-        ld64.out
-        ld64.lib
-        libtapi.out
-        coreutils
-        darwin.binutils
-        darwin.binutils.bintools
+        cpio
         diffutils
         ed
         file
         findutils
         gawk
         gettext
-        gmp.out
+        gmp
         gnugrep
-        gnugrep.pcre2.out
         gnumake
         gnused
         gnutar
         gzip
-        icu.out
-        libffi.out
+        icu
+        ld64
+        libffi
         libiconv
-        libunistring.out
-        libxml2.out
-        ncurses.dev
-        ncurses.man
-        ncurses.out
+        libidn2
+        libkrb5
+        libssh2
+        libtapi
+        libunistring
+        libxml2
+        libyaml
+        ncurses
+        nghttp2
         openbsm
         openpam
-        openssl.out
+        openssl
         patch
+        pbzx
+        pcre
         xar
-        xz.bin
-        xz.out
-        zlib.dev
-        zlib.out
-      ])
-      ++ lib.optionals localSystem.isAarch64 [
-        prevStage.updateAutotoolsGnuConfigScriptsHook
-        prevStage.gnu-config
+        xz
+        zlib
+        zstd
+      ]
+    );
+
+    assert lib.all isBuiltByNixpkgsCompiler (
+      with prevStage.darwin;
+      [
+        locale
+        print-reexports
+        rewrite-tbd
+        sigtool
       ]
-      ++ (with prevStage.llvmPackages; [
-        bintools-unwrapped
+    );
+
+    assert
+      (!useAppleSDKLibs)
+      -> lib.all isBuiltByNixpkgsCompiler (
+        with prevStage.darwin;
+        [
+          Libsystem
+          configd
+        ]
+      );
+    assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]);
+    assert
+      useAppleSDKLibs
+      -> lib.all isFromNixpkgs (
+        with prevStage.darwin;
+        [
+          CF
+          Libsystem
+          libobjc
+        ]
+      );
+    assert lib.all isFromNixpkgs (
+      with prevStage.darwin;
+      [
+        binutils-unwrapped
+        dyld
+        launchd
+        libclosure
+        libdispatch
+        xnu
+      ]
+    );
+
+    assert lib.all isBuiltByNixpkgsCompiler (
+      with prevStage.llvmPackages;
+      [
         clang-unwrapped
-        clang-unwrapped.lib
+        libclang
+        libllvm
+        llvm
         compiler-rt
-        compiler-rt.dev
         libcxx
-        libcxx.dev
-        lld
-        llvm
-        llvm.lib
-      ])
-      ++ (with prevStage.darwin; [
-        CF
-        Libsystem
-        dyld
-        locale
-        apple_sdk.sdkRoot
       ]
-      ++ lib.optionals useAppleSDKLibs [ objc4 ]);
+    );
 
-      __stdenvImpureHostDeps = commonImpureHostDeps;
-      __extraImpureHostDeps = commonImpureHostDeps;
+    assert lib.all isBuiltByBootstrapFilesCompiler (
+      with prevStage;
+      [
+        autoconf
+        automake
+        bison
+        cmake
+        cmakeMinimal
+        cyrus_sasl
+        db
+        expat
+        flex
+        groff
+        libedit
+        libtool
+        m4
+        meson
+        ninja
+        openldap
+        openssh
+        patchutils
+        perl
+        pkg-config.pkg-config
+        python3
+        python3Minimal
+        scons
+        serf
+        sqlite
+        subversion
+        sysctl.provider
+        texinfo
+        unzip
+        which
+      ]
+    );
 
-      overrides = self: super: {
-        inherit (prevStage)
-          bash brotli bzip2 coreutils cpio diffutils ed file findutils gawk
-          gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libiconv-darwin
-          libidn2 libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam
-          openssl patch pbzx pcre python3Minimal xar xz zlib zstd;
+    let
+      cc = prevStage.llvmPackages.clang;
+    in
+    {
+      inherit config overlays;
+      stdenv = import ../generic {
+        name = "stdenv-darwin";
+
+        buildPlatform = localSystem;
+        hostPlatform = localSystem;
+        targetPlatform = localSystem;
+
+        inherit config;
 
-        darwin = super.darwin.overrideScope (_: superDarwin: {
-          inherit (prevStage.darwin)
-            CF Libsystem darwin-stubs dyld locale libobjc rewrite-tbd xnu;
+        preHook = ''
+          ${commonPreHook}
+          stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
+          export PATH_LOCALE=${prevStage.darwin.locale}/share/locale
+        '';
+
+        initialPath = ((import ../generic/common-path.nix) { pkgs = prevStage; });
+
+        extraNativeBuildInputs =
+          lib.optionals localSystem.isAarch64 [ prevStage.updateAutotoolsGnuConfigScriptsHook ]
+          ++ [ prevStage.darwin.apple_sdk.sdkRoot ];
+
+        extraBuildInputs = [ prevStage.darwin.CF ];
+
+        inherit cc;
 
-          apple_sdk = superDarwin.apple_sdk // {
-            inherit (prevStage.darwin.apple_sdk) sdkRoot;
+        shell = cc.shell;
+
+        inherit (prevStage.stdenv) fetchurlBoot;
+
+        extraAttrs =
+          {
+            inherit bootstrapTools;
+            libc = prevStage.darwin.Libsystem;
+            shellPackage = prevStage.bash;
+          }
+          // lib.optionalAttrs useAppleSDKLibs {
+            # This objc4 will be propagated to all builds using the final stdenv,
+            # and we shouldn't mix different builds, because they would be
+            # conflicting LLVM modules. Export it here so we can grab it later.
+            inherit (prevStage.darwin) objc4;
           };
-        } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
-          inherit (prevStage.darwin) binutils binutils-unwrapped;
-        });
-      } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
-        inherit (prevStage) cctools ld64 libtapi;
-        inherit (prevStage.llvmPackages) clang llvm;
 
-        # Need to get rid of these when cross-compiling.
-        llvmPackages = super.llvmPackages // (
-          let
-            tools = super.llvmPackages.tools.extend (_: _: {
-              inherit (prevStage.llvmPackages) clang clang-unwrapped libclang libllvm llvm;
-            });
-            libraries = super.llvmPackages.libraries.extend (_: _: {
-              inherit (prevStage.llvmPackages) compiler-rt libcxx;
-            });
-          in
-          { inherit tools libraries; } // tools // libraries
-        );
+        disallowedRequisites = [ bootstrapTools.out ];
+
+        allowedRequisites =
+          (with prevStage; [
+            bash
+            bzip2.bin
+            bzip2.out
+            cc.expand-response-params
+            cctools
+            ld64.out
+            ld64.lib
+            libtapi.out
+            coreutils
+            darwin.binutils
+            darwin.binutils.bintools
+            diffutils
+            ed
+            file
+            findutils
+            gawk
+            gettext
+            gmp.out
+            gnugrep
+            gnugrep.pcre2.out
+            gnumake
+            gnused
+            gnutar
+            gzip
+            icu.out
+            libffi.out
+            libiconv
+            libunistring.out
+            libxml2.out
+            ncurses.dev
+            ncurses.man
+            ncurses.out
+            openbsm
+            openpam
+            openssl.out
+            patch
+            xar
+            xz.bin
+            xz.out
+            zlib.dev
+            zlib.out
+          ])
+          ++ lib.optionals localSystem.isAarch64 [
+            prevStage.updateAutotoolsGnuConfigScriptsHook
+            prevStage.gnu-config
+          ]
+          ++ (with prevStage.llvmPackages; [
+            bintools-unwrapped
+            clang-unwrapped
+            clang-unwrapped.lib
+            compiler-rt
+            compiler-rt.dev
+            libcxx
+            libcxx.dev
+            lld
+            llvm
+            llvm.lib
+          ])
+          ++ (
+            with prevStage.darwin;
+            [
+              CF
+              Libsystem
+              dyld
+              locale
+              apple_sdk.sdkRoot
+            ]
+            ++ lib.optionals useAppleSDKLibs [ objc4 ]
+          );
+
+        __stdenvImpureHostDeps = commonImpureHostDeps;
+        __extraImpureHostDeps = commonImpureHostDeps;
+
+        overrides =
+          self: super:
+          {
+            inherit (prevStage)
+              bash
+              brotli
+              bzip2
+              coreutils
+              cpio
+              diffutils
+              ed
+              file
+              findutils
+              gawk
+              gettext
+              gmp
+              gnugrep
+              gnumake
+              gnused
+              gnutar
+              gzip
+              icu
+              libffi
+              libiconv
+              libiconv-darwin
+              libidn2
+              libssh2
+              libunistring
+              libxml2
+              libyaml
+              ncurses
+              nghttp2
+              openbsm
+              openpam
+              openssl
+              patch
+              pbzx
+              pcre
+              python3Minimal
+              xar
+              xz
+              zlib
+              zstd
+              ;
+
+            darwin = super.darwin.overrideScope (
+              _: superDarwin:
+              {
+                inherit (prevStage.darwin)
+                  CF
+                  Libsystem
+                  darwin-stubs
+                  dyld
+                  locale
+                  libobjc
+                  rewrite-tbd
+                  xnu
+                  ;
+
+                apple_sdk = superDarwin.apple_sdk // {
+                  inherit (prevStage.darwin.apple_sdk) sdkRoot;
+                };
+              }
+              // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
+                inherit (prevStage.darwin) binutils binutils-unwrapped;
+              }
+            );
+          }
+          // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
+            inherit (prevStage) cctools ld64 libtapi;
+            inherit (prevStage.llvmPackages) clang llvm;
+
+            # Need to get rid of these when cross-compiling.
+            llvmPackages =
+              super.llvmPackages
+              // (
+                let
+                  tools = super.llvmPackages.tools.extend (
+                    _: _: {
+                      inherit (prevStage.llvmPackages)
+                        clang
+                        clang-unwrapped
+                        libclang
+                        libllvm
+                        llvm
+                        ;
+                    }
+                  );
+                  libraries = super.llvmPackages.libraries.extend (
+                    _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; }
+                  );
+                in
+                { inherit tools libraries; } // tools // libraries
+              );
+          };
       };
-    };
-  })
+    }
+  )
 
   # This "no-op" stage is just a place to put the assertions about the final stage.
-  (prevStage:
+  (
+    prevStage:
     # previous final stage stdenv:
     assert isBuiltByNixpkgsCompiler prevStage.cctools;
     assert isBuiltByNixpkgsCompiler prevStage.ld64;
@@ -1361,9 +2477,9 @@ in
     assert isBuiltByNixpkgsCompiler prevStage.darwin.print-reexports;
     assert isBuiltByNixpkgsCompiler prevStage.darwin.rewrite-tbd;
 
-    assert            isFromNixpkgs prevStage.darwin.CF;
-    assert            isFromNixpkgs prevStage.darwin.Libsystem;
-    assert            isFromNixpkgs prevStage.darwin.binutils-unwrapped;
+    assert isFromNixpkgs prevStage.darwin.CF;
+    assert isFromNixpkgs prevStage.darwin.Libsystem;
+    assert isFromNixpkgs prevStage.darwin.binutils-unwrapped;
 
     assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.clang-unwrapped;
     assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libllvm;
@@ -1372,8 +2488,11 @@ in
 
     # Make sure these evaluate since they were disabled explicitly in the bootstrap.
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
-    assert            isFromNixpkgs prevStage.binutils-unwrapped.src;
+    assert isFromNixpkgs prevStage.binutils-unwrapped.src;
     assert isBuiltByNixpkgsCompiler prevStage.curl;
 
-    { inherit (prevStage) config overlays stdenv; })
+    {
+      inherit (prevStage) config overlays stdenv;
+    }
+  )
 ]

From d004bfadb5ab4d0d440857740cde5bf55a3cc92c Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 11 Aug 2024 14:06:07 -0400
Subject: [PATCH 328/342] darwin.stdenv: update .git-blame-ignore-revs

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index fe5ae020247b2..8fec6f3ce6cec 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -159,3 +159,6 @@ fbdcdde04a7caa007e825a8b822c75fab9adb2d6
 
 # step-cli: format package.nix with nixfmt (#331629)
 fc7a83f8b62e90de5679e993d4d49ca014ea013d
+
+# darwin.stdenv: format with nixfmt-rfc-style (#333962)
+93c10ac9e561c6594d3baaeaff2341907390d9b8

From 643f0b1829213cfdaaca6b40c97d7522d9b0058f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 12 Aug 2024 11:47:03 +0300
Subject: [PATCH 329/342] qt6.qtdeclarative: slightly less bad hack to make it
 build on Darwin again

---
 .../development/libraries/qt-6/modules/qtdeclarative.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
index e1ed990dc0b38..2a377d481c3ca 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
@@ -4,24 +4,27 @@
 , qtshadertools
 , openssl
 , stdenv
-, python3
 , lib
 , pkgsBuildBuild
 }:
 
 qtModule {
   pname = "qtdeclarative";
-  strictDeps = !stdenv.isDarwin; # fails to detect python3 otherwise
+
   propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl ];
-  nativeBuildInputs = [ python3 ];
+  strictDeps = true;
+
   patches = [
     # prevent headaches from stale qmlcache data
     ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch
     # add version specific QML import path
     ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch
   ];
+
   cmakeFlags = [
     "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools"
+    # for some reason doesn't get found automatically on Darwin
+    "-DPython_EXECUTABLE=${lib.getExe pkgsBuildBuild.python3}"
   ]
   # Conditional is required to prevent infinite recursion during a cross build
   ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [

From 31b6b31d572df8db5240f9e00ea37f882129dc17 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:42:00 +0000
Subject: [PATCH 330/342] python311Packages.pinocchio: fix strict deps

add python to nativeBuildInputs
---
 pkgs/development/libraries/pinocchio/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix
index d922a7b3ce4dc..c298d6ce56545 100644
--- a/pkgs/development/libraries/pinocchio/default.nix
+++ b/pkgs/development/libraries/pinocchio/default.nix
@@ -64,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+  ] ++ lib.optionals pythonSupport [
+    python3Packages.python
   ];
 
   propagatedBuildInputs = [

From 6f5a1beac6113b5e916980919a9ccdaadb410554 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 9 Aug 2024 15:38:31 +0200
Subject: [PATCH 331/342] fuc: 2.1.0 -> 2.2.0

Required to build with Rust 1.80.

Link: https://github.com/rust-lang/rust/issues/127343
---
 pkgs/tools/misc/fuc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fuc/default.nix b/pkgs/tools/misc/fuc/default.nix
index f94895dcf3579..5a2f88fcb8f76 100644
--- a/pkgs/tools/misc/fuc/default.nix
+++ b/pkgs/tools/misc/fuc/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fuc";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "SUPERCILEX";
     repo = "fuc";
     rev = version;
-    hash = "sha256-7hXSw79hIxfPRm7nSQhdG3/M9cZ+hN4X0kRHR2PDK0U=";
+    hash = "sha256-ZEiMyX85woPOKaMtw8qqrUXUhY8Ewm71I25inUMH1GQ=";
   };
 
-  cargoHash = "sha256-hnfH8ET4PVbi5qzXxa3gbOHYnlVqXA15efUefF+6zfs=";
+  cargoHash = "sha256-7xPZFZ+vWi6HbaHeIWEnOfQkHsLIMsHq+RuuDOWwusQ=";
 
   RUSTC_BOOTSTRAP = 1;
 

From 678a471a34d05f18d440c016eb4185c651adc1b8 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 9 Aug 2024 18:50:28 +0200
Subject: [PATCH 332/342] git-mit: 5.12.205 -> 5.13.11

Required to build with Rust 1.80.

Link: https://github.com/rust-lang/rust/issues/127343
---
 pkgs/applications/version-management/git-mit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix
index d8af866b64e87..45e083d5b08c4 100644
--- a/pkgs/applications/version-management/git-mit/default.nix
+++ b/pkgs/applications/version-management/git-mit/default.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "5.12.205";
+  version = "5.13.11";
 in
 rustPlatform.buildRustPackage {
   pname = "git-mit";
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
     owner = "PurpleBooth";
     repo = "git-mit";
     rev = "v${version}";
-    hash = "sha256-I9tIw7ZtQ85L1Pt0+/CxugtmnClbEbn4xKjSkBqBa0o=";
+    hash = "sha256-sLSPnr89AvosutY8jw0KiiXihVT+A+fuHs6AKvMEUF4=";
   };
 
-  cargoHash = "sha256-GWoh//sHhIVxmFuyAHRot/JG5wL3Zn2yIeRncaPENN4=";
+  cargoHash = "sha256-iaAxwUtGKG3AG3mdiKveZekFSEqHBf4O9WLs23YeSPs=";
 
   nativeBuildInputs = [ pkg-config ];
 

From f7f94afaf3d249d235924176261d725588387357 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 9 Aug 2024 18:17:41 +0200
Subject: [PATCH 333/342] cargo-generate: 0.21.1 -> 0.21.3

Required to build with Rust 1.80.

Link: https://github.com/rust-lang/rust/issues/127343
---
 pkgs/development/tools/rust/cargo-generate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 716f9e9778155..f4c25a60dbc4c 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-generate";
-  version = "0.21.1";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "cargo-generate";
     repo = "cargo-generate";
     rev = "v${version}";
-    sha256 = "sha256-Pza1MK5yWpuNfaaFAJy5/Pf+t0TN1Hzc5wKcpmMpEf0=";
+    sha256 = "sha256-1F/865UgdqwfpITFhXCuL7CmducL7w0lVDyfui9UzjU=";
   };
 
-  cargoHash = "sha256-b6WfsDTAZgxA977JhdlafE+POPvMLl8Z7CzEf+L2+Us=";
+  cargoHash = "sha256-szPO1V09EThpo2N03Ll+ZJUpvjp2b+/C/sviOzFfG+k=";
 
   nativeBuildInputs = [ pkg-config ];
 

From a2ba2b72865a9ab0b4dc26072671bf424be0ba74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 12 Aug 2024 14:05:18 -0700
Subject: [PATCH 334/342] python312Packages.imgw-pib: init at 1.0.5

---
 .../python-modules/imgw-pib/default.nix       | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/imgw-pib/default.nix

diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix
new file mode 100644
index 0000000000000..f7ca3a58c29a2
--- /dev/null
+++ b/pkgs/development/python-modules/imgw-pib/default.nix
@@ -0,0 +1,47 @@
+{
+  aiohttp,
+  aioresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  freezegun,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+  syrupy,
+}:
+
+buildPythonPackage rec {
+  pname = "imgw-pib";
+  version = "1.0.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bieniu";
+    repo = "imgw-pib";
+    rev = "refs/tags/${version}";
+    hash = "sha256-2t1dzumDVUr+Lma1lnri8l2x6fUx1LKEQne7Qzh7pwc=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "imgw_pib" ];
+
+  nativeCheckInputs = [
+    aioresponses
+    freezegun
+    pytest-asyncio
+    pytestCheckHook
+    syrupy
+  ];
+
+  meta = {
+    changelog = "https://github.com/bieniu/imgw-pib/releases/tag/${version}";
+    description = "Python async wrapper for IMGW-PIB API";
+    homepage = "https://github.com/bieniu/imgw-pib";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 006e1ff7133db..facfa2eda2f51 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5936,6 +5936,8 @@ self: super: with self; {
 
   imgtool = callPackage ../development/python-modules/imgtool { };
 
+  imgw-pib = callPackage ../development/python-modules/imgw-pib { };
+
   imia = callPackage ../development/python-modules/imia { };
 
   iminuit = callPackage ../development/python-modules/iminuit { };

From 142b144328d38edc62510689ec7633ac938d645c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 12 Aug 2024 14:07:46 -0700
Subject: [PATCH 335/342] home-assistant: support imgw_pib component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2d543219a3676..2cfa3a5088ac4 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1851,7 +1851,8 @@
       aioimaplib
     ];
     "imgw_pib" = ps: with ps; [
-    ]; # missing inputs: imgw_pib
+      imgw-pib
+    ];
     "improv_ble" = ps: with ps; [
       aioesphomeapi
       aioruuvigateway
@@ -5165,6 +5166,7 @@
     "image_processing"
     "image_upload"
     "imap"
+    "imgw_pib"
     "incomfort"
     "influxdb"
     "inkbird"

From f0b3f348b526bb40d9bb73bde6c4ae1469883f43 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 13 Aug 2024 02:30:39 +0200
Subject: [PATCH 336/342] python312Packages.homeassistant-stubs: 2024.7.4 ->
 2024.8.1

https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.8.1
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index de2f6c2852624..d0505688b4844 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2024.7.4";
+  version = "2024.8.1";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-xrYZTvHobr/53CdxKibQLEJ6wk4sdc1Ni/1icA9Sgc8=";
+    hash = "sha256-/zhTPS3x1SSMAfxhUo+IzvuHBrSCnezw8YxgJc0adTU=";
   };
 
   build-system = [

From a041a771275ea31564ba0c1d0218ee6f5bc71e8a Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Tue, 13 Aug 2024 01:17:38 +0000
Subject: [PATCH 337/342] python311Packages.example-robot-data: fix strict deps

add python to nativeBuildInputs to fix build
---
 pkgs/development/libraries/example-robot-data/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix
index 67e1de59891d0..d4211be982ef9 100644
--- a/pkgs/development/libraries/example-robot-data/default.nix
+++ b/pkgs/development/libraries/example-robot-data/default.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+  ] ++ lib.optionals pythonSupport [
+    python3Packages.python
   ];
 
   buildInputs = lib.optionals pythonSupport [

From f8ebe241590b6f26ece294c1c59b9f3a5e5bf078 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 13 Aug 2024 03:30:40 +0200
Subject: [PATCH 338/342] Reapply "python312Packages.zigpy: 0.65.2 -> 0.65.3"

This reverts commit 0df677d721234016b0a9fac7fb72d0f3ceeb8b4e.

This was reverted on master, but the the fixes had already landed on
staging-next, so it shouldn't have been revert here.
---
 pkgs/development/python-modules/zigpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index c6df4fb89f42b..c86a79435d28a 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.65.2";
+  version = "0.65.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-rNqo4NtIdg9MoOKde26/RUcfX/VYiVkNj97v/RJcB4E=";
+    hash = "sha256-zE8Hqha1yv7OsaXYrKzf3o2JLO/RcDSAxixWoMj2T3M=";
   };
 
   postPatch = ''

From 471970df1f40ae7cba92433618da4ebb64997c3c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 13 Aug 2024 12:37:47 +0200
Subject: [PATCH 339/342] home-assistant-custom-lovelace-modules.mushroom:
 4.0.2 -> 4.0.3

https://github.com/piitaya/lovelace-mushroom/releases/tag/v4.0.3
---
 .../custom-lovelace-modules/mushroom/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
index 29dcb782f43eb..b1603b40b11fa 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
@@ -5,16 +5,16 @@
 
 buildNpmPackage rec {
   pname = "mushroom";
-  version = "4.0.2";
+  version = "4.0.3";
 
   src = fetchFromGitHub {
     owner = "piitaya";
     repo = "lovelace-mushroom";
     rev = "v${version}";
-    hash = "sha256-Ybhz8MsMa3cr7GoRRZTPj4+XdI/oWtlE3yQDsEHgYaA=";
+    hash = "sha256-H5u0Q4yiSCyk+oeCiTeYqol0+mUKaxFul7gXgto+Nmg=";
   };
 
-  npmDepsHash = "sha256-BuGikB97xgyASqCYzEyQX/daQ41HCua4K2MVyvJbkPQ=";
+  npmDepsHash = "sha256-Qx0qDxpb35uIU7R6gG/mEo0EZJjYx0hPb/cBPRn9KlQ=";
 
   installPhase = ''
     runHook preInstall

From f9acfb6eb973e788cc642e3fd9443e727b2dc382 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 13 Aug 2024 01:15:04 +0100
Subject: [PATCH 340/342] jujutsu: add upstream patch for libgit2 1.8

---
 .../version-management/jujutsu/default.nix            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix
index 6d1fc0926e526..0e5451256045a 100644
--- a/pkgs/applications/version-management/jujutsu/default.nix
+++ b/pkgs/applications/version-management/jujutsu/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchpatch2
 , rustPlatform
 , Security
 , SystemConfiguration
@@ -28,7 +29,15 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1lONtpataRi0yE6LpN6oNnC3OAW918v8GFCUwinYJWI=";
   };
 
-  cargoHash = "sha256-dRbOTxlFXfmeHUKH2UeN84OwlQ1urCND/Nfk9vSeLwA=";
+  cargoPatches = [
+    # cargo: bump `git2` to 0.19.0
+    (fetchpatch2 {
+      url = "https://github.com/martinvonz/jj/commit/38f6ee89183d886e432472c5888908c9900c9c18.patch?full_index=1";
+      hash = "sha256-BVcak7uIEhwoO0f9hf0GVKKSVmp/ueKD5C9F8J0iL3w=";
+    })
+  ];
+
+  cargoHash = "sha256-FxcvLT0YnXcjDCKxuyijYsVSMLjx1glDzmFH5ctSx6s=";
 
   cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors
   useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping

From 355530f35a053bc20143467836649bddf981a6eb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 13 Aug 2024 20:30:06 +0200
Subject: [PATCH 341/342] abseil-cpp_202401: reinit

---
 .../libraries/abseil-cpp/202401.nix           | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 +++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/abseil-cpp/202401.nix

diff --git a/pkgs/development/libraries/abseil-cpp/202401.nix b/pkgs/development/libraries/abseil-cpp/202401.nix
new file mode 100644
index 0000000000000..ad5417d6eb623
--- /dev/null
+++ b/pkgs/development/libraries/abseil-cpp/202401.nix
@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, gtest
+, static ? stdenv.hostPlatform.isStatic
+, cxxStandard ? null
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "abseil-cpp";
+  version = "20240116.2";
+
+  src = fetchFromGitHub {
+    owner = "abseil";
+    repo = "abseil-cpp";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg=";
+  };
+
+  cmakeFlags = [
+    "-DABSL_BUILD_TEST_HELPERS=ON"
+    "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
+    "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
+  ] ++ lib.optionals (cxxStandard != null) [
+    "-DCMAKE_CXX_STANDARD=${cxxStandard}"
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ gtest ];
+
+  meta = {
+    description = "Open-source collection of C++ code designed to augment the C++ standard library";
+    homepage = "https://abseil.io/";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.GaetanLepage ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index def6c277622bb..f56051a8f200a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19396,12 +19396,18 @@ with pkgs;
       then overrideSDK stdenv { darwinMinVersion = "10.13"; }
       else stdenv;
   };
-  abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix {
+  abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix {
     # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
     stdenv = if stdenv.isDarwin && stdenv.isx86_64
       then overrideSDK stdenv { darwinMinVersion = "10.13"; }
       else stdenv;
   };
+  abseil-cpp_202407 = callPackage ../development/libraries/abseil-cpp/202407.nix {
+     # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
+    stdenv = if stdenv.isDarwin && stdenv.isx86_64
+      then overrideSDK stdenv { darwinMinVersion = "10.13"; }
+      else stdenv;
+  };
   abseil-cpp = abseil-cpp_202407;
 
   accountsservice = callPackage ../development/libraries/accountsservice { };

From e7e3cdf5e373805d59c56f56f7f8cec18636f8be Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 13 Aug 2024 20:30:21 +0200
Subject: [PATCH 342/342] onnxruntime: pin abseil-cpp_202401

---
 pkgs/development/libraries/onnxruntime/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
index 4eef69d925ee2..bb344664e6593 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -3,7 +3,7 @@
 , lib
 , fetchFromGitHub
 , Foundation
-, abseil-cpp
+, abseil-cpp_202401
 , cmake
 , cpuinfo
 , eigen
@@ -30,6 +30,8 @@
 let
   version = "1.18.1";
 
+  abseil-cpp = abseil-cpp_202401;
+
   stdenv = throw "Use effectiveStdenv instead";
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv;