From f22692dc23849201290a935881b573ac81c7a9a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 00:29:58 +0000
Subject: [PATCH 001/156] SDL2_ttf: 2.22.0 -> 2.24.0

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

diff --git a/pkgs/by-name/sd/SDL2_ttf/package.nix b/pkgs/by-name/sd/SDL2_ttf/package.nix
index 93daeee6cbe3..88b5c8f8ba4a 100644
--- a/pkgs/by-name/sd/SDL2_ttf/package.nix
+++ b/pkgs/by-name/sd/SDL2_ttf/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL2_ttf";
-  version = "2.22.0";
+  version = "2.24.0";
 
   src = fetchurl {
     url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${finalAttrs.version}.tar.gz";
-    hash = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM=";
+    hash = "sha256-Cyvx57ZWitvbybuSRkP3nZ3tr+Bh+h7Wh9HZrE5FO/0=";
   };
 
   nativeBuildInputs = [

From f8158e825bc57de45b2afc9a7aa4da90c08c45b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 03:18:26 +0000
Subject: [PATCH 002/156] spacenavd: 1.3 -> 1.3.1

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

diff --git a/pkgs/misc/drivers/spacenavd/default.nix b/pkgs/misc/drivers/spacenavd/default.nix
index 7c0eb92e33a7..f71387d26405 100644
--- a/pkgs/misc/drivers/spacenavd/default.nix
+++ b/pkgs/misc/drivers/spacenavd/default.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "spacenavd";
-  version = "1.3";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "FreeSpacenav";
     repo = "spacenavd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-26geQYOXjMZZ/FpPpav7zfql0davTBwB4Ir+X1oep9Q=";
+    hash = "sha256-O6gkd+9iW6X8eMN99Ajz9Z0tqZBtbVEYDb67yI1b/Bk=";
   };
 
   buildInputs = [

From 152056209b1c5adea1308aaa0fcee3d955f9eeb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jan 2025 11:35:53 +0000
Subject: [PATCH 003/156] irpf: 2024-1.5 -> 2024-1.6

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

diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index e947cbb2739f..e2e44e50a13b 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2024-1.5";
+  version = "2024-1.6";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-Pz8oI96GpLcHFEtnKUHnUHtZL3/QGhtG93ab5Au/tw0=";
+      hash = "sha256-wYSfU6tkYuSns+RnSy2c3yRR05t/8iXLhRMqPQR+oO0=";
     };
 
   passthru.updateScript = writeScript "update-irpf" ''

From 362ab3dacdcdfbc20e6b868525a328fae08bbe3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jan 2025 01:21:27 +0000
Subject: [PATCH 004/156] imgbrd-grabber: 7.12.2 -> 7.13.0

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

diff --git a/pkgs/by-name/im/imgbrd-grabber/package.nix b/pkgs/by-name/im/imgbrd-grabber/package.nix
index dc28c5e3132d..6e4646c1afc7 100644
--- a/pkgs/by-name/im/imgbrd-grabber/package.nix
+++ b/pkgs/by-name/im/imgbrd-grabber/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "imgbrd-grabber";
-  version = "7.12.2";
+  version = "7.13.0";
 
   src = fetchFromGitHub {
     owner = "Bionus";
     repo = "imgbrd-grabber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6XfIaASfbvdPovtdDEJtsk4pEL4Dhmyq8ml4X7KZ4DE=";
+    hash = "sha256-7EIXmqfTADG95vxKU1cFGnzZD3NJJN28HOF71YZD6nI=";
     fetchSubmodules = true;
   };
 

From 6cab8a3e045bf3350b326f3d349ef7ca95d37114 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jan 2025 04:01:05 +0000
Subject: [PATCH 005/156] evolution-ews: 3.54.2 -> 3.54.3.0

---
 .../mailreaders/evolution/evolution-ews/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
index 7bfb6d45ef0d..59ca6b5c0477 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-ews";
-  version = "3.54.2";
+  version = "3.54.3.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-77UZ2inoIX58t3dNQ9BGJiSMO+WKGUbIpjwyDl2IPNQ=";
+    hash = "sha256-GscHzyWRqERRJXViGkkwx2GyF028XsscihhSYpRqFPY=";
   };
 
   patches = [

From 490d6ecdf9c073fddc00f9ad2dac06889db9298a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jan 2025 13:43:53 +0000
Subject: [PATCH 006/156] ocamlPackages.miou: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix
index 57c40e831c42..a1374cd17865 100644
--- a/pkgs/development/ocaml-modules/miou/default.nix
+++ b/pkgs/development/ocaml-modules/miou/default.nix
@@ -6,13 +6,13 @@
 
 buildDunePackage rec {
   pname = "miou";
-  version = "0.3.0";
+  version = "0.3.1";
 
   minimalOCamlVersion = "5.0.0";
 
   src = fetchurl {
     url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz";
-    hash = "sha256-kjGAbm1glF427gYOXKSogb+HpgUQqK5fqL9F06FtC4Q=";
+    hash = "sha256-K3otUuwFmRVrbnxYYZDMmd2WTYQHmXY/byQHu4PjlHE=";
   };
 
   meta = {

From 394f6fe075cd62459f0473908a0af1e5cea841b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jan 2025 22:31:26 +0000
Subject: [PATCH 007/156] qtox: 1.18.0 -> 1.18.2

---
 .../networking/instant-messengers/qtox/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 70d9d9551e9a..0c3d2e114762 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtox";
-  version = "1.18.0";
+  version = "1.18.2";
 
   src = fetchFromGitHub {
     owner = "TokTok";
     repo = "qTox";
     tag = "v${version}";
-    hash = "sha256-UgUlWeFrNoNR1ZwobfNLmDBn9/Aw4LUMeSgIfrq/uqo=";
+    hash = "sha256-NPJ1tBIcM4zR5izsoiydUO2+cEuWOdWAf2xte7bwOxg=";
   };
 
   buildInputs = [

From 1da907e6d39cc3d32e8408a5f863fad3f5e43c5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Jan 2025 01:42:19 +0000
Subject: [PATCH 008/156] ocamlPackages.spdx_licenses: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/ocaml-modules/spdx_licenses/default.nix b/pkgs/development/ocaml-modules/spdx_licenses/default.nix
index 807de8387fee..a8e9b9eb2b4d 100644
--- a/pkgs/development/ocaml-modules/spdx_licenses/default.nix
+++ b/pkgs/development/ocaml-modules/spdx_licenses/default.nix
@@ -6,13 +6,13 @@
 
 buildDunePackage rec {
   pname = "spdx_licenses";
-  version = "1.2.0";
+  version = "1.3.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/kit-ty-kate/spdx_licenses/releases/download/v${version}/spdx_licenses-${version}.tar.gz";
-    hash = "sha256-9ViB7PRDz70w3RJczapgn2tJx9wTWgAbdzos6r3J2r4=";
+    hash = "sha256-UkKAJ+MCCKr68p4sgTZ8/6NMJibWGCG6tQruMpMsjzA=";
   };
 
   meta = {

From 61cc8b99aa2501d36fb0cfc92029f41a97b711a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 09:34:49 +0000
Subject: [PATCH 009/156] brainflow: 5.15.0 -> 5.16.0

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

diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix
index 445283cc05a9..abaf20e2879f 100644
--- a/pkgs/by-name/br/brainflow/package.nix
+++ b/pkgs/by-name/br/brainflow/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "brainflow";
-  version = "5.15.0";
+  version = "5.16.0";
 
   src = fetchFromGitHub {
     owner = "brainflow-dev";
     repo = "brainflow";
     tag = finalAttrs.version;
-    hash = "sha256-NBdSVYW2xWY5jgXeaeW0yBzIzvSWt5Qp2A9zIn7+0Yw=";
+    hash = "sha256-yQ4jJUIA4E+rQiR2VtEupgZoAzek/2lzol74vmppb/k=";
   };
 
   patches = [ ];

From 3d29092753fac7499478b77f38aea30e441adc73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Jan 2025 18:03:33 +0000
Subject: [PATCH 010/156] ocamlPackages.ocaml-version: 3.7.2 -> 3.7.3

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

diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index 4744d7b104f3..3074f31b9080 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -7,11 +7,11 @@
 
 buildDunePackage rec {
   pname = "ocaml-version";
-  version = "3.7.2";
+  version = "3.7.3";
 
   src = fetchurl {
     url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
-    hash = "sha256-fTbh4fAJkkQr8Az6Limt5i8/zQnxTZSrhbfK8i08da0=";
+    hash = "sha256-LVbB4RwjbRoXy/Mxmr16WJTyLnM08PzLot1HPKWXGt4=";
   };
 
   checkInputs = [ alcotest ];

From 5356b1a56bee6eb9e6fbf4a1ec94c31af933fc06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2025 17:12:50 +0000
Subject: [PATCH 011/156] minify: 2.21.2 -> 2.21.3

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

diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index ccbb8c0f90a8..dce607c82b21 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "minify";
-  version = "2.21.2";
+  version = "2.21.3";
 
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-iR52KkstnpruTG7xJKbAIn15Ybrt03ctiSTU2EOnC24=";
+    hash = "sha256-WnkC6wydFDZDt6tPpsDipK/6Hwj3lfzx+20nDTUfn7g=";
   };
 
-  vendorHash = "sha256-tWNC2/sFqX+KcFrTD8ifN2f3TRHA3enT5glESy8spgo=";
+  vendorHash = "sha256-jZJpaUsHLjPrVTzzxfb9oqm8d6LM28OKdm1v4m7zxC8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a67e49cb831e87dca239e9002252e482b02c31f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Jan 2025 03:24:04 +0000
Subject: [PATCH 012/156] neovim-qt-unwrapped: 0.2.18 -> 0.2.19

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

diff --git a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
index aa43c0fa7bd3..b4a888905608 100644
--- a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "neovim-qt-unwrapped";
-  version = "0.2.18";
+  version = "0.2.19";
 
   src = fetchFromGitHub {
     owner = "equalsraf";
     repo = "neovim-qt";
     rev = "v${version}";
-    hash = "sha256-BitFHHwL2aqBUpY/8eHaZIFvnDCeABC6w33Vmbx0z2g=";
+    hash = "sha256-r77tg3xVemHW/zDNA6dYerFjFaYDDeHsD68WhMfI70Q=";
   };
 
   cmakeFlags = [

From 558314344fbfaceee80b58a7f60bede77a491a06 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 26 Jan 2025 22:31:06 +0000
Subject: [PATCH 013/156] f2fs-tools: backport upstream C23 fix

Without the change the build against c23 compiler (like `gcc-15`) fails as:

    f2fs-tools> In file included from libf2fs_zoned.c:10:
    f2fs-tools> ../include/f2fs_fs.h:107:25: error: two or more data types in declaration specifiers
    f2fs-tools>   107 | typedef u8              bool;
    f2fs-tools>       |                         ^~~~
---
 pkgs/by-name/f2/f2fs-tools/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/f2/f2fs-tools/package.nix b/pkgs/by-name/f2/f2fs-tools/package.nix
index 60ec724b8ad4..7426211f2914 100644
--- a/pkgs/by-name/f2/f2fs-tools/package.nix
+++ b/pkgs/by-name/f2/f2fs-tools/package.nix
@@ -39,6 +39,13 @@ stdenv.mkDerivation rec {
       url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/patch/?id=b15b6cc56ac7764be17acbdbf96448f388992adc";
       hash = "sha256-9XrNf9MMMDGOsuP3DvUhm30Sa2xICDtXbUIvM/TP35o=";
     })
+
+    # Fix the build against C23 compilers (like gcc-15):
+    (fetchpatch {
+      name = "c23.patch";
+      url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/patch/?id=6617d15a660becc23825007ab3fc2d270b5b250f";
+      hash = "sha256-XgceNqwCDa5m9CJTQCmjfiDhZ7x/rO+UiBZwrovgywA=";
+    })
   ];
 
   enableParallelBuilding = true;

From 926bb4273e564ef15a4e55811f370ef3d331d311 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 1 Feb 2025 16:54:01 +0000
Subject: [PATCH 014/156] parted: backport upstream C23 fix

Without the change the build against c23 compiler (like `gcc-15`) fails as:

    parted> parted.c: In function '_init_commands':
    parted> parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type []
    parted>  2469 |         do_version,
    parted>       |         ^~~~~~~~~~
    parted>       |         |
    parted>       |         int (*)(void)
---
 pkgs/by-name/pa/parted/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/pa/parted/package.nix b/pkgs/by-name/pa/parted/package.nix
index 4fc1615665e3..7f8a181303e4 100644
--- a/pkgs/by-name/pa/parted/package.nix
+++ b/pkgs/by-name/pa/parted/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   lvm2,
   libuuid,
   gettext,
@@ -24,6 +25,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-O0Pb4zzKD5oYYB66tWt4UrEo7Bo986mzDM3l5zNZ5hI=";
   };
 
+  patches = [
+    # Fix the build against C23 compilers (like gcc-15):
+    (fetchpatch {
+      name = "c23.patch";
+      url = "https://git.savannah.gnu.org/gitweb/?p=parted.git;a=patch;h=16343bda6ce0d41edf43f8dac368db3bbb63d271";
+      hash = "sha256-8FgnwMrzMHPZNU+b/mRHCSu8sn6H7GhVLIhMUel40Hk=";
+    })
+  ];
+
   outputs = [
     "out"
     "dev"

From fa3cb966a91b715d7ffdba43e3957236ad7fd891 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 1 Feb 2025 17:02:08 +0000
Subject: [PATCH 015/156] parted: enable parallel building and testing

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

diff --git a/pkgs/by-name/pa/parted/package.nix b/pkgs/by-name/pa/parted/package.nix
index 7f8a181303e4..f01ce55da3bd 100644
--- a/pkgs/by-name/pa/parted/package.nix
+++ b/pkgs/by-name/pa/parted/package.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
     ++ lib.optional (lvm2 == null) "--disable-device-mapper"
     ++ lib.optional enableStatic "--enable-static";
 
+  enableParallelBuilding = true;
+
   # Tests were previously failing due to Hydra running builds as uid 0.
   # That should hopefully be fixed now.
   doCheck = !stdenv.hostPlatform.isMusl; # translation test

From eae349ff91aadd51d00c44c1a4b19a2238f619ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2025 12:54:47 +0000
Subject: [PATCH 016/156] entr: 5.6 -> 5.7

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

diff --git a/pkgs/by-name/en/entr/package.nix b/pkgs/by-name/en/entr/package.nix
index 571557c7b75a..810426a1ea58 100644
--- a/pkgs/by-name/en/entr/package.nix
+++ b/pkgs/by-name/en/entr/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "entr";
-  version = "5.6";
+  version = "5.7";
 
   src = fetchurl {
     url = "https://eradman.com/entrproject/code/entr-${version}.tar.gz";
-    hash = "sha256-AiK435KNO1o7UZTWPn3gmFM+BBkNnZoVS5JsbB+d0U4=";
+    hash = "sha256-kMXZQ4IMcM7zfrQaOCpupPXdf9le/vE7K1Ug0yD10Gc=";
   };
 
   postPatch = ''

From 8cd960c4db0fb61b8a25d2f60d89afe3b10716c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2025 15:49:17 +0000
Subject: [PATCH 017/156] top-git: 0.19.13 -> 0.19.14

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

diff --git a/pkgs/by-name/to/top-git/package.nix b/pkgs/by-name/to/top-git/package.nix
index 77f034c748c3..77d981b36c87 100644
--- a/pkgs/by-name/to/top-git/package.nix
+++ b/pkgs/by-name/to/top-git/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "topgit";
-  version = "0.19.13";
+  version = "0.19.14";
 
   src = fetchFromGitHub {
     owner = "mackyle";
     repo = "topgit";
     rev = "${pname}-${version}";
-    sha256 = "sha256-K0X1DGc1LQsoteUhoHLxVJRrZaaPLKSSF61OKyGB5Qg=";
+    sha256 = "sha256-FMrkoJwgBkFvi3tewtqu+b9sRuNPCNCG6BrcnAbx0sk=";
   };
 
   makeFlags = [ "prefix=${placeholder "out"}" ];

From 211aeb8da9f05a41c75d893335bf18e548701c7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2025 16:47:31 +0000
Subject: [PATCH 018/156] ibus-engines.typing-booster-unwrapped: 2.27.1 ->
 2.27.27

---
 .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index b587e1cbfa73..2572a0a4ff70 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus-typing-booster";
-  version = "2.27.1";
+  version = "2.27.27";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    hash = "sha256-BD+FhBAXWuaO4lP0B8q2IEhP9xR1FSFPvuFkFIKl7XQ=";
+    hash = "sha256-nh/dn71RFLuEHhkKWT5sZPUQxiG4pIJ8a3SXnW+A+Ts=";
   };
 
   nativeBuildInputs = [

From e04a2515a132919534a528286e62c40a3ec69fc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Jan 2025 02:24:13 +0000
Subject: [PATCH 019/156] clamav: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 3a3b264ef3d6..afa9701563db 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clamav";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
-    hash = "sha256-oxjngKw5prPWxGlxOC+W7d6Xzki442HrgOY0Fe1Batg=";
+    hash = "sha256-jJL4reKo8snWaI0dY+5X9sr5ZddNzgbQlxxnCcjmwEw=";
   };
 
   patches = [

From d175238731d9f984bee6adbb4a3b69b555b36db0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Jan 2025 01:59:25 +0000
Subject: [PATCH 020/156] fstl: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
index 68f55c84c571..f58b7b7c6365 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -8,7 +8,7 @@
 
 mkDerivation rec {
   pname = "fstl";
-  version = "0.10.0";
+  version = "0.11.0";
 
   nativeBuildInputs = [ cmake ];
 
@@ -25,7 +25,7 @@ mkDerivation rec {
     owner = "fstl-app";
     repo = "fstl";
     rev = "v" + version;
-    hash = "sha256-z2X78GW/IeiPCnwkeLBCLjILhfMe2sT3V9Gbw4TSf4c=";
+    hash = "sha256-6V1L5aUZQl4zAkXD7yY8Ap0+QXgogQNxaTyZAxHFqM4=";
   };
 
   meta = with lib; {

From f80dfb3f0b1c5dc928da0ed750217fac5a92eec9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2025 00:09:19 +0000
Subject: [PATCH 021/156] schemacrawler: 16.25.1 -> 16.25.2

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

diff --git a/pkgs/by-name/sc/schemacrawler/package.nix b/pkgs/by-name/sc/schemacrawler/package.nix
index fbca83937a39..25fb91fc771f 100644
--- a/pkgs/by-name/sc/schemacrawler/package.nix
+++ b/pkgs/by-name/sc/schemacrawler/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schemacrawler";
-  version = "16.25.1";
+  version = "16.25.2";
 
   src = fetchzip {
     url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
-    hash = "sha256-IWVkLSYErfyw4D4GYf+36QTpUQLhWm1DNrhwlPbIuR8=";
+    hash = "sha256-pFOe+IgkPrIAFpZW6O4Mgt77EFDlz4F/xO+WYjBvHrs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From faa80240eea21bb97b8f55f9bbe50d01ce41ffeb Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 26 Feb 2025 22:39:42 +0100
Subject: [PATCH 022/156] qtorganizer-mkcal: 0-unstable-2025-02-14 ->
 0-unstable-2025-02-19

---
 pkgs/by-name/qt/qtorganizer-mkcal/package.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
index 2b7497545794..fdb57dd262ee 100644
--- a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
+++ b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtorganizer-mkcal";
-  version = "0-unstable-2025-02-14";
+  version = "0-unstable-2025-02-19";
 
   src = fetchFromGitHub {
     owner = "dcaliste";
     repo = "qtorganizer-mkcal";
-    rev = "3090565d70ecdfaad2cba57d5a895fa69afd024a";
-    hash = "sha256-ZNAcqjkVf9efP+WWTDr2YFZT+eZdIJAfX45Gm0+Y81A=";
+    rev = "312412de3f810fbedc7c4f27bd33adb2c3fbe967";
+    hash = "sha256-uv2cEs84bM614vg5K+t4vyXas+1b5Jm39tfGSwWj6n0=";
   };
 
   postPatch = ''
@@ -51,10 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
-  cmakeFlags = [
-    (lib.cmakeBool "INSTALL_TESTS" false)
-  ];
-
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   preCheck =

From 7a00bc50ca5236a8212401dbf6d1cbcbeecb9cd9 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Mon, 24 Feb 2025 17:11:12 +0900
Subject: [PATCH 023/156] edgedb: change name to gel, 6.1.2 -> 7.0.3

https://github.com/geldata/gel-cli/releases/tag/v7.0.0
https://github.com/geldata/gel-cli/releases/tag/v7.0.1
https://github.com/geldata/gel-cli/releases/tag/v7.0.2
https://github.com/geldata/gel-cli/releases/tag/v7.0.3

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 .../0001-dynamically-patchelf-binaries.patch  | 19 ++++++------
 .../by-name/{ed/edgedb => ge/gel}/package.nix | 29 +++++++++++--------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 28 insertions(+), 21 deletions(-)
 rename pkgs/by-name/{ed/edgedb => ge/gel}/0001-dynamically-patchelf-binaries.patch (67%)
 rename pkgs/by-name/{ed/edgedb => ge/gel}/package.nix (69%)

diff --git a/pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch b/pkgs/by-name/ge/gel/0001-dynamically-patchelf-binaries.patch
similarity index 67%
rename from pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch
rename to pkgs/by-name/ge/gel/0001-dynamically-patchelf-binaries.patch
index 5b7b720fc7e7..b232b589ac99 100644
--- a/pkgs/by-name/ed/edgedb/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/by-name/ge/gel/0001-dynamically-patchelf-binaries.patch
@@ -1,14 +1,14 @@
-diff --git a/src/portable/install.rs b/src/portable/install.rs
-index 15944e4..f873349 100644
---- a/src/portable/install.rs
-+++ b/src/portable/install.rs
-@@ -134,8 +134,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {
+diff --git a/src/portable/server/install.rs b/src/portable/server/install.rs
+index feb47f1..157d17a 100644
+--- a/src/portable/server/install.rs
++++ b/src/portable/server/install.rs
+@@ -229,8 +229,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {
      for entry in arch.entries()? {
          let mut entry = entry?;
          let path = entry.path()?;
 +        let is_inside_bin = {
 +            let mut path_iter = path.iter();
-+            path_iter.next(); // discards first folder
++            path_iter.next(); // discards first path
 +            path_iter.as_path().starts_with("bin")
 +        };
          if let Some(path) = build_path(&target_dir, &path)? {
@@ -20,9 +20,9 @@ index 15944e4..f873349 100644
          }
      }
      bar.finish_and_clear();
-@@ -222,3 +230,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {
- 
-     Ok(info)
+@@ -244,3 +252,12 @@ fn unlink_cache(cache_file: &Path) {
+         })
+         .ok();
  }
 +
 +fn nix_patchelf_if_needed(dest_path: &Path) {
@@ -32,3 +32,4 @@ index 15944e4..f873349 100644
 +        .arg(dest_path)
 +        .output();
 +}
++
diff --git a/pkgs/by-name/ed/edgedb/package.nix b/pkgs/by-name/ge/gel/package.nix
similarity index 69%
rename from pkgs/by-name/ed/edgedb/package.nix
rename to pkgs/by-name/ge/gel/package.nix
index 9348ca320028..f82431586d1d 100644
--- a/pkgs/by-name/ed/edgedb/package.nix
+++ b/pkgs/by-name/ge/gel/package.nix
@@ -11,24 +11,24 @@
   xz,
   replaceVars,
   # for passthru.tests:
-  edgedb,
+  gel,
   testers,
 }:
 rustPlatform.buildRustPackage rec {
-  pname = "edgedb";
-  version = "6.1.2";
+  pname = "gel";
+  version = "7.0.3";
 
   src = fetchFromGitHub {
-    owner = "edgedb";
-    repo = "edgedb-cli";
+    owner = "geldata";
+    repo = "gel-cli";
     tag = "v${version}";
-    hash = "sha256-7epi7cF6u3Y/Fomcd1+lQfIIRKzuqL6Qk3gTZGZnjv8=";
+    hash = "sha256-QP4LtLgF2OWCsPCFzpLR8k/RetfEevSd8Uv/PciHCwk=";
     fetchSubmodules = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Iq960LU3Xxu5LHBENsZ48diPVJrdTHxtChtSp7yghCw=";
+    hash = "sha256-s8UKYZs4GorM0qvAvE+HL+Qma2x05IDtuqYebMDrZHk=";
   };
 
   nativeBuildInputs = [
@@ -60,16 +60,21 @@ rustPlatform.buildRustPackage rec {
     OPENSSL_NO_VENDOR = true;
   };
 
+  # cli warns when edgedb found but gel doesn't
+  postInstall = ''
+    mv $out/bin/edgedb $out/bin/gel
+  '';
+
   doCheck = false;
 
   passthru.tests.version = testers.testVersion {
-    package = edgedb;
-    command = "edgedb --version";
+    package = gel;
+    command = "gel --version";
   };
 
   meta = {
-    description = "EdgeDB cli";
-    homepage = "https://www.edgedb.com/docs/cli/index";
+    description = "Gel cli";
+    homepage = "https://docs.geldata.com/reference/cli";
     license = with lib.licenses; [
       asl20
       # or
@@ -79,6 +84,6 @@ rustPlatform.buildRustPackage rec {
       ahirner
       kirillrdy
     ];
-    mainProgram = "edgedb";
+    mainProgram = "gel";
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a902583045ee..edb2b0fcc4f5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -351,6 +351,7 @@ mapAliases {
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
 
   edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
+  edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
   elasticsearch7Plugins = elasticsearchPlugins;
   electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17
 

From fb146990ca6cc1e3c429f15dd8ca4fac8f4342ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Mar 2025 08:55:48 +0000
Subject: [PATCH 024/156] openapi-generator-cli: 7.10.0 -> 7.12.0

---
 pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix
index 6993dd519eb3..b62b1ae224ee 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -9,7 +9,7 @@
 
 let
   this = stdenv.mkDerivation (finalAttrs: {
-    version = "7.10.0";
+    version = "7.12.0";
     pname = "openapi-generator-cli";
 
     jarfilename = "openapi-generator-cli-${finalAttrs.version}.jar";
@@ -20,7 +20,7 @@ let
 
     src = fetchurl {
       url = "mirror://maven/org/openapitools/openapi-generator-cli/${finalAttrs.version}/${finalAttrs.jarfilename}";
-      sha256 = "sha256-YV4BRwWvNIYeeJ4LKhEHXTyA2xNPiB6TcmVHmkqDmW4=";
+      sha256 = "sha256-M+ffp6HwTVhAXuEq4Z4sb8KpFJfPLlb6aPGHWpXL8iA=";
     };
 
     dontUnpack = true;

From cfb9f640274c9b9b208b82d0b512850bd7ae6bad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Mar 2025 09:30:17 +0000
Subject: [PATCH 025/156] parsedmarc: 8.17.0 -> 8.18.1

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

diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix
index 12ddccef2e08..ef557cb316f6 100644
--- a/pkgs/development/python-modules/parsedmarc/default.nix
+++ b/pkgs/development/python-modules/parsedmarc/default.nix
@@ -42,14 +42,14 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "8.17.0";
+  version = "8.18.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-enPrFSjjf3aZjSsFSfYVYE/uyHju090vZyPaXOfjrBs=";
+    hash = "sha256-qE/WMovVlB9u0lyVl3HapHzvhG+fGTC+6DDBUKRU/2w=";
   };
 
   nativeBuildInputs = [

From 57bbcfa3395f85095460737e1ff289ae4d79fe4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Mar 2025 17:55:10 +0000
Subject: [PATCH 026/156] vcpkg: 2025.01.13 -> 2025.02.14

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

diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 41116767cbcb..ee751ff49052 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "vcpkg";
-  version = "2025.01.13";
+  version = "2025.02.14";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg";
     rev = finalAttrs.version;
-    hash = "sha256-T4ihf3PC53Ch33E/MF5VR3DWKHty4PryInnkiQdHdGM=";
+    hash = "sha256-HmaP1WKl8s5eKAC32nTALFd4gbqKnzWnJn6L0/fFmqk=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"

From 31104f427e0e069e1f70cafaf60e3796418b6167 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 2 Mar 2025 21:43:30 +0800
Subject: [PATCH 027/156] swayws: 1.2.0 -> 1.3.0

---
 pkgs/by-name/sw/swayws/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sw/swayws/package.nix b/pkgs/by-name/sw/swayws/package.nix
index 0923d3b65ce9..ce2ef2e9d7d9 100644
--- a/pkgs/by-name/sw/swayws/package.nix
+++ b/pkgs/by-name/sw/swayws/package.nix
@@ -4,31 +4,31 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "swayws";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitLab {
     owner = "w0lff";
-    repo = pname;
+    repo = "swayws";
     # Specifying commit hash rather than tag because upstream has
     # rewritten a tag before:
     # https://gitlab.com/w0lff/swayws/-/issues/1#note_1342349382
-    rev = "98f0d5c1896b10e890e1727654f1cf3b34a2371e";
-    hash = "sha256-zeM6/x2vjZ2IL+nZz1WBf5yY4C6ovmxyvgVLD54BKVc=";
+    rev = "0c125d65f9fe9269f78ddaf575cd39f00f749659";
+    hash = "sha256-ILS7r1gL6fXeX58CJ+gHvQ5Cst7PbK4yNw2Dh5l9IEc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/n41JGypLsFd02tW5WuxXsATn7/I09N+dOiq0H0QDug=";
+  cargoHash = "sha256-AS1vEnNLDLsNaIZ6pLrsQpQy9+bSoCn5oyj8SXjJ+OE=";
 
   # swayws does not have any tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Sway workspace tool which allows easy moving of workspaces to and from outputs";
     mainProgram = "swayws";
     homepage = "https://gitlab.com/w0lff/swayws";
-    license = licenses.mit;
-    maintainers = [ maintainers.atila ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.atila ];
   };
 }

From 41d25838b370e8ee375d31c32986db09937a1e7a Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 2 Mar 2025 21:50:30 -0800
Subject: [PATCH 028/156] llvmPackages_git: 21.0.0-unstable-2025-02-23 ->
 21.0.0-unstable-2025-03-02

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

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 0a2018476f51..7aefdf201bb7 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -32,9 +32,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.0-rc3".officialRelease.sha256 = "sha256-mLSBoyq24FD+khynC6sC5IkDFqizgAn07lR9+ZRXlV0=";
     "21.0.0-git".gitRelease = {
-      rev = "4d928d5b5858de18f47f68c0d309dafd24cea875";
-      rev-version = "21.0.0-unstable-2025-02-23";
-      sha256 = "sha256-wR/PuKdQhCVC0ONnJ/KUIcE6fUSkm0ZEeyhF4B9ZFA4=";
+      rev = "71f4c7dabec0f32b2d475e8e08f0da99628a067c";
+      rev-version = "21.0.0-unstable-2025-03-02";
+      sha256 = "sha256-RNqQMVs0syNEXPNW6qOlvXGXYhZnN4s91Wc5vGcSuZM=";
     };
   } // llvmVersions;
 

From 17bc9f505bbb39b21449dd5b7b56fef131138a76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Mar 2025 13:41:02 +0000
Subject: [PATCH 029/156] go-dnscollector: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix
index a6a280402cab..8f5eb3c77d01 100644
--- a/pkgs/by-name/go/go-dnscollector/package.nix
+++ b/pkgs/by-name/go/go-dnscollector/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-dnscollector";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "go-dnscollector";
     rev = "v${version}";
-    sha256 = "sha256-JhkvWj5mQlFiGQ2A0yGIr0/4g9mYlWnK5DQfeSRX+Qo=";
+    sha256 = "sha256-rJHU/hDmnANziJj/K2FGccZjWFe8eyggtjIc2nt0pgo=";
   };
 
-  vendorHash = "sha256-crOswUMoFKsDdo8HiChSRSeR0eHHC1f8G6OcPuUGoww=";
+  vendorHash = "sha256-bAqr2ZVR6x1hJ80oZogA5ZXEuoz5A7yp5rxry1rIhSY=";
 
   subPackages = [ "." ];
 

From 19ac89803d7954c29537bb7129469d5798ed7c86 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 5 Mar 2025 02:23:28 +0400
Subject: [PATCH 030/156] serial-studio: enable on darwin

---
 pkgs/by-name/se/serial-studio/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/serial-studio/package.nix b/pkgs/by-name/se/serial-studio/package.nix
index 795c5d73dd38..5cb29976b08f 100644
--- a/pkgs/by-name/se/serial-studio/package.nix
+++ b/pkgs/by-name/se/serial-studio/package.nix
@@ -42,12 +42,18 @@ stdenv.mkDerivation rec {
     ./0002-Connect-Button-Fix.patch
   ];
 
-  meta = with lib; {
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv $out/Serial-Studio.app $out/Applications
+    makeWrapper $out/Applications/Serial-Studio.app/Contents/MacOS/Serial-Studio $out/bin/serial-studio
+  '';
+
+  meta = {
     description = "Multi-purpose serial data visualization & processing program";
     mainProgram = "serial-studio";
     homepage = "https://serial-studio.github.io/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
 }

From ae2b4fb7b5e53b56a976e47ccbb422846a493c2e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 4 Mar 2025 23:31:26 +0100
Subject: [PATCH 031/156] darwin.cf-private: remove alias

---
 pkgs/top-level/darwin-aliases.nix  | 2 ++
 pkgs/top-level/darwin-packages.nix | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index 5a6ac1b1eed6..c3f66479f0da 100644
--- a/pkgs/top-level/darwin-aliases.nix
+++ b/pkgs/top-level/darwin-aliases.nix
@@ -63,6 +63,8 @@ mapAliases ({
   cctools-llvm = pkgs.cctools; # added 2024-07-01
   cctools-port = pkgs.cctools; # added 2024-07-17
 
+  cf-private = throw "'cf-private' has been renamed to 'apple_sdk.frameworks.CoreFoundation'.";
+
   ### D ###
 
   discrete-scroll = pkgs.discrete-scroll; # added 2024-11-27
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 91f6d001d877..98688d1de530 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -172,9 +172,6 @@ makeScopeWithSplicing' {
 
       libSystem = callPackage ../os-specific/darwin/libSystem { };
 
-      # TODO(@connorbaker): See https://github.com/NixOS/nixpkgs/issues/229389.
-      cf-private = self.apple_sdk.frameworks.CoreFoundation;
-
       DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
 
       print-reexports = callPackage ../os-specific/darwin/print-reexports { };

From eae9c56b072b48a245aaa027eb1332926bd2d933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 17:40:00 -0800
Subject: [PATCH 032/156] python313Packages.pyfronius: 0.7.3 -> 0.7.5

Diff: https://github.com/nielstron/pyfronius/compare/refs/tags/release-0.7.3...0.7.5

Changelog: https://github.com/nielstron/pyfronius/releases/tag/0.7.5
---
 .../python-modules/pyfronius/default.nix         | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix
index b9d1d7ffb3c3..01d22fb7be14 100644
--- a/pkgs/development/python-modules/pyfronius/default.nix
+++ b/pkgs/development/python-modules/pyfronius/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   aiohttp,
+  aiounittest,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyfronius";
-  version = "0.7.3";
+  version = "0.7.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,25 +19,26 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nielstron";
     repo = "pyfronius";
-    tag = "release-${version}";
-    hash = "sha256-7GtY/6uuLe7K9T7xMVt2ytpA6MKVWnyEoLtA5dSMiH4=";
+    tag = version;
+    hash = "sha256-dwqFT6UuXYTTaJxDTe5sH8FJxANw6pJakOadHplBFog=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [ aiohttp ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    aiounittest
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "pyfronius" ];
 
   meta = with lib; {
     description = "Python module to communicate with Fronius Symo";
     homepage = "https://github.com/nielstron/pyfronius";
-    changelog = "https://github.com/nielstron/pyfronius/releases/tag/release-${version}";
+    changelog = "https://github.com/nielstron/pyfronius/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
-    # https://github.com/nielstron/pyfronius/issues/18
-    broken = versionAtLeast aiohttp.version "3.10.1";
   };
 }

From 3325c6af405581f35e65e9ce05ea78634d799739 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 03:10:15 +0000
Subject: [PATCH 033/156] cloudlist: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix
index 0a7738c20a61..0748232051c9 100644
--- a/pkgs/by-name/cl/cloudlist/package.nix
+++ b/pkgs/by-name/cl/cloudlist/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "cloudlist";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cloudlist";
     tag = "v${version}";
-    hash = "sha256-6XgqhCL8ehK8k3k8fKLFZSmUz8G3MwqXhjEpA99F0K4=";
+    hash = "sha256-HYCD7mCfIJOijKTPvL5OixZ6zmI/P/+0Agx9bBhxy0Y=";
   };
 
-  vendorHash = "sha256-4vR03dC8ZfBM7Jw3JqGxZ/DGxfTx8279j7CzSOQKPkQ=";
+  vendorHash = "sha256-fZ7l4+No/a8EYqC1nacSyh5fD2QAdzANjTTmbY0d/L4=";
 
   subPackages = [ "cmd/cloudlist/" ];
 

From 3ba95d5d51155694e6a78f69c95405f4ed3c2770 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 04:18:52 +0000
Subject: [PATCH 034/156] alpaca: 5.0.5 -> 5.0.6

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

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index ec7471afc2ea..c2aacf0663e9 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -20,14 +20,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "5.0.5";
+  version = "5.0.6";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-VfD10mMlRNi6Ye3IXy60ygx9DGTpzG06T6zQLm+8dFo=";
+    hash = "sha256-iBce9ROWajUBq3GX/IU7yMoWTFNw98HnaE0kp+t73G0=";
   };
 
   nativeBuildInputs = [

From 581106f28a964ef274371145589bb00cc029cd2f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Mar 2025 10:17:05 +0100
Subject: [PATCH 035/156] python312Packages.collections-extended: fix for
 python>=3.11

---
 .../collections-extended/default.nix          | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix
index 72648a5268d4..8ec5841773c5 100644
--- a/pkgs/development/python-modules/collections-extended/default.nix
+++ b/pkgs/development/python-modules/collections-extended/default.nix
@@ -5,26 +5,29 @@
   hypothesis,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
-  pythonAtLeast,
 }:
 
 buildPythonPackage rec {
   pname = "collections-extended";
   version = "2.0.2";
-  format = "pyproject";
-
-  # https://github.com/mlenzen/collections-extended/issues/198
-  disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlenzen";
-    repo = pname;
-    rev = "v${version}";
+    repo = "collections-extended";
+    tag = "v${version}";
     hash = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  # shuffle's random option has been removed in python 3.11
+  postPatch = ''
+    substituteInPlace collections_extended/setlists.py \
+      --replace-fail \
+        "random_.shuffle(self._list, random=random)" \
+        "random_.shuffle(self._list)"
+  '';
+
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     hypothesis
@@ -33,10 +36,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "collections_extended" ];
 
-  meta = with lib; {
+  meta = {
     description = "Extra Python Collections - bags (multisets), setlists (unique list/indexed set), RangeMap and IndexedDict";
     homepage = "https://github.com/mlenzen/collections-extended";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ exarkun ];
+    changelog = "https://github.com/mlenzen/collections-extended/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ exarkun ];
   };
 }

From 89eed45883c801035cc7296c8a928f9c08c14653 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Wed, 5 Mar 2025 11:20:57 +0100
Subject: [PATCH 036/156] claude-code: 0.2.29 -> 0.2.30

---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 1d2eb8b6af09..59daa8d4a51c 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.29"
+        "@anthropic-ai/claude-code": "^0.2.30"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.29",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.29.tgz",
-      "integrity": "sha512-4lZbbg+Qqz+mY3SLKcUYjnOd6/PIB+SQh7ICVIXFYGB1zOB4mVfiY7l2nBt67iw+Rxko2wGJAfg6gPM57S/Q/g==",
+      "version": "0.2.30",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.30.tgz",
+      "integrity": "sha512-dX0CNMRpbJ3ZrIPuDzCowAdn5P0CZsa8ncBHOHt9WbqFy7y1wMbgUacJbGB41AgKp9YC7QD0C3G4nhfjW9onUA==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index dcaf5e5ad2bc..ad3d7129b370 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "0.2.29";
+  version = "0.2.30";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-Frc53cRlf0jtvarKAJCScU9wkN0m81irAwfIGnlfLNQ=";
+    hash = "sha256-i8C4lYryWUoLWLGryrte10nmKFbHLHJpoVD0z0CbdPo=";
   };
 
-  npmDepsHash = "sha256-4pCyeUY3Ava8gAi5kOJDRXdu3eay07sCMcO/Y/qy4w4=";
+  npmDepsHash = "sha256-p8ghlzCQ++gsVNmm3BliG3Q8VBu/PqJalBUJwP7GiyU=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From d35993a5ff6c4fc601b6f20bd6b1fe5da4e05d24 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Mar 2025 08:30:40 +0100
Subject: [PATCH 037/156] tahoe-lafs: unstable-2021-07-09 -> 1.20.0

Diff:
https://github.com/tahoe-lafs/tahoe-lafs/compare/8e28a9d0e02fde2388aca549da2b5c452ac4337f...tahoe-lafs-1.20.0
---
 pkgs/by-name/ta/tahoe-lafs/package.nix | 143 ++++++++++---------------
 1 file changed, 57 insertions(+), 86 deletions(-)

diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
index d478dd5e4670..207c585f297a 100644
--- a/pkgs/by-name/ta/tahoe-lafs/package.nix
+++ b/pkgs/by-name/ta/tahoe-lafs/package.nix
@@ -1,52 +1,21 @@
 {
   lib,
-  nettools,
-  python311,
-  texinfo,
+  python3Packages,
   fetchFromGitHub,
+  texinfo,
+  versionCheckHook,
 }:
 
-# FAILURES: The "running build_ext" phase fails to compile Twisted
-# plugins, because it tries to write them into Twisted's (immutable)
-# store path. The problem appears to be non-fatal, but there's probably
-# some loss of functionality because of it.
-
-let
-  # Tahoe-LAFS unstable-2021-07-09 is incompatible with Python 3.12, and
-  # uses eliot in a way incompatible after version 1.14.0.
-  # These versions should be unpinned, when updating Tahoe-LAFS to a more recent version.
-  python = python311.override {
-    self = python;
-    packageOverrides = self: super: {
-      eliot = super.eliot.overridePythonAttrs (oldAttrs: rec {
-        version = "1.14.0";
-
-        src = fetchFromGitHub {
-          owner = "itamarst";
-          repo = "eliot";
-          rev = "refs/tags/${version}";
-          hash = "sha256-1QE/s8P2g7DGIcuT+/AikAaWMTafNWn4BRZqpBn5ghk=";
-        };
-
-        disabledTests = [
-          "test_default"
-          "test_large_numpy_array"
-          "test_numpy"
-        ];
-      });
-    };
-  };
-  python3Packages = python.pkgs;
-in
 python3Packages.buildPythonApplication rec {
   pname = "tahoe-lafs";
-  version = "unstable-2021-07-09";
+  version = "1.20.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tahoe-lafs";
     repo = "tahoe-lafs";
-    rev = "8e28a9d0e02fde2388aca549da2b5c452ac4337f";
-    sha256 = "sha256-MuD/ZY+die7RCsuVdcePSD0DdwatXRi7CxW2iFt22L0=";
+    tag = "tahoe-lafs-${version}";
+    hash = "sha256-9qaL4GmdjClviKTnwAxaTywvJChQ5cVVgWs1IkFxhIY=";
   };
 
   outputs = [
@@ -55,86 +24,65 @@ python3Packages.buildPythonApplication rec {
     "info"
   ];
 
-  postPatch = ''
-    sed -i "src/allmydata/util/iputil.py" \
-        -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g"
-
-    # Chroots don't have /etc/hosts and /etc/resolv.conf, so work around
-    # that.
-    for i in $(find src/allmydata/test -type f)
-    do
-      sed -i "$i" -e"s/localhost/127.0.0.1/g"
-    done
-
-    sed -i 's/"zope.interface.*"/"zope.interface"/' src/allmydata/_auto_deps.py
-    sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py
-
-    # incompatible with latest autobahn
-    rm src/allmydata/test/web/test_logs.py
-  '';
-
   # Remove broken and expensive tests.
   preConfigure = ''
     (
       cd src/allmydata/test
 
       # Buggy?
-      rm cli/test_create.py test_client.py
+      rm cli/test_create.py
 
       # These require Tor and I2P.
       rm test_connections.py test_iputil.py test_hung_server.py test_i2p_provider.py test_tor_provider.py
-
-      # Fails due to the above tests missing
-      rm test_python3.py
-
-      # Expensive
-      rm test_system.py
     )
   '';
 
+  build-system = with python3Packages; [
+    hatch-vcs
+    hatchling
+  ];
+
   nativeBuildInputs = with python3Packages; [
+    # docs
+    recommonmark
     sphinx
+    sphinx-rtd-theme
     texinfo
   ];
 
-  # The `backup' command requires `sqlite3'.
-  propagatedBuildInputs =
+  dependencies =
     with python3Packages;
     [
-      appdirs
-      beautifulsoup4
-      characteristic
+      attrs
+      autobahn
+      cbor2
+      click
+      collections-extended
+      cryptography
       distro
       eliot
-      fixtures
+      filelock
       foolscap
       future
-      html5lib
+      klein
       magic-wormhole
       netifaces
-      pyasn1
-      pycrypto
+      psutil
+      pycddl
+      pyopenssl
+      pyrsistent
       pyutil
       pyyaml
-      recommonmark
-      service-identity
-      simplejson
-      sphinx-rtd-theme
-      testtools
+      six
       treq
       twisted
+      werkzeug
       zfec
       zope-interface
     ]
     ++ twisted.optional-dependencies.tls
     ++ twisted.optional-dependencies.conch;
 
-  nativeCheckInputs = with python3Packages; [
-    mock
-    hypothesis
-    twisted
-  ];
-
   # Install the documentation.
   postInstall = ''
     (
@@ -150,11 +98,34 @@ python3Packages.buildPythonApplication rec {
     )
   '';
 
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      beautifulsoup4
+      fixtures
+      html5lib
+      hypothesis
+      mock
+      prometheus-client
+      testtools
+      twisted
+    ]
+    ++ [
+      versionCheckHook
+    ];
+  versionCheckProgram = "${placeholder "out"}/bin/tahoe";
+  versionCheckProgramArg = "--version";
+
   checkPhase = ''
+    runHook preCheck
+
+    runHook versionCheckHook
     trial --rterrors allmydata
+
+    runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system";
     mainProgram = "tahoe";
     longDescription = ''
@@ -165,10 +136,10 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://tahoe-lafs.org/";
     license = [
-      licenses.gpl2Plus # or
+      lib.licenses.gpl2Plus # or
       "TGPPLv1+"
     ];
     maintainers = with lib.maintainers; [ MostAwesomeDude ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

From f8bbde094502ea0c12b6e616f11e925d0be804f0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Mar 2025 12:06:20 +0100
Subject: [PATCH 038/156] python312Packages.tf2onnx: unmark as broken

---
 .../python-modules/tf2onnx/default.nix        | 71 +++++++------------
 1 file changed, 27 insertions(+), 44 deletions(-)

diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix
index cd904628903a..35ba5f495a0c 100644
--- a/pkgs/development/python-modules/tf2onnx/default.nix
+++ b/pkgs/development/python-modules/tf2onnx/default.nix
@@ -2,29 +2,25 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  # runtime dependencies
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  flatbuffers,
   numpy,
   onnx,
+  onnxruntime,
+  protobuf,
   requests,
   six,
-  flatbuffers,
-  protobuf,
   tensorflow,
-  # check dependencies
-  pytestCheckHook,
-  graphviz,
-  parameterized,
-  pytest-cov-stub,
-  pyyaml,
-  timeout-decorator,
-  onnxruntime,
-  keras,
 }:
 
 buildPythonPackage rec {
   pname = "tf2onnx";
   version = "1.16.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "onnx";
@@ -38,49 +34,36 @@ buildPythonPackage rec {
       --replace-fail "'pytest-runner'" ""
   '';
 
-  pythonRelaxDeps = [ "flatbuffers" ];
+  build-system = [
+    setuptools
+  ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "protobuf"
+  ];
+
+  dependencies = [
+    flatbuffers
     numpy
     onnx
+    onnxruntime
+    protobuf
     requests
     six
-    flatbuffers
-    protobuf
     tensorflow
-    onnxruntime
   ];
 
   pythonImportsCheck = [ "tf2onnx" ];
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    graphviz
-    parameterized
-    pytest-cov-stub
-    pyyaml
-    timeout-decorator
-    keras
-  ];
+  # All tests fail at import with:
+  # AttributeError: `...` is not available with Keras 3.
+  doCheck = false;
 
-  # TODO investigate the failures
-  disabledTestPaths = [
-    "tests/test_backend.py"
-    "tests/test_einsum_helper.py"
-    "tests/test_einsum_optimizers.py"
-  ];
-
-  disabledTests = [ "test_profile_conversion_time" ];
-
-  meta = with lib; {
+  meta = {
     description = "Convert TensorFlow, Keras, Tensorflow.js and Tflite models to ONNX";
     homepage = "https://github.com/onnx/tensorflow-onnx";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ happysalada ];
-    # Duplicated `protobuf` in the derivation:
-    # - version 4.24.4 (from onnx), the default version of protobuf in nixpkgs
-    # - version 4.21.12 (from tensorflow), pinned as such because tensorflow is outdated and does
-    #   not support more recent versions of protobuf
-    broken = true;
+    changelog = "https://github.com/onnx/tensorflow-onnx/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ happysalada ];
   };
 }

From 270a49da99a00771d812015cab69b7b486dac85d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 11:55:07 +0000
Subject: [PATCH 039/156] python312Packages.msgraph-core: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix
index f9382b4bd42a..467638fe9841 100644
--- a/pkgs/development/python-modules/msgraph-core/default.nix
+++ b/pkgs/development/python-modules/msgraph-core/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "msgraph-core";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python-core";
     tag = "v${version}";
-    hash = "sha256-GtIKZRnjG9fZcVNcaT+B9SbCo3yxUiqKPIZ2Er0WhAU=";
+    hash = "sha256-SKuqYEDsHiasvs7nwrizYqfA6tTcc8XfZo8BD8guJHA=";
   };
 
   build-system = [ setuptools ];

From 7c7f62800c0120e6a9a64f6b4e769146406ae67b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 5 Mar 2025 13:28:19 +0100
Subject: [PATCH 040/156] qtorganizer-mkcal: Disable tests

Flaky: https://github.com/dcaliste/qtorganizer-mkcal/issues/9
---
 pkgs/by-name/qt/qtorganizer-mkcal/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
index fdb57dd262ee..07085a003207 100644
--- a/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
+++ b/pkgs/by-name/qt/qtorganizer-mkcal/package.nix
@@ -51,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+  # Flaky: https://github.com/dcaliste/qtorganizer-mkcal/issues/9
+  doCheck = false;
 
   preCheck =
     let

From 06e133c3cc9538f56ca2bb954d9d72560a578274 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Mar 2025 13:43:27 +0100
Subject: [PATCH 041/156] python312Packages.pytensor: 2.28.2 -> 2.28.3

Diff: https://github.com/pymc-devs/pytensor/compare/refs/tags/rel-2.28.2...rel-2.28.3

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

diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index a0534abc0d92..d359937f282b 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "pytensor";
-  version = "2.28.2";
+  version = "2.28.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymc-devs";
     repo = "pytensor";
     tag = "rel-${version}";
-    hash = "sha256-ZLCIc4fB++B7oMo+jyt5XACG9N1XAwIzJJmIXDISWtA=";
+    hash = "sha256-MtY0JbziboJNHKe8wXaPtOWgFnpv8yQZeg6hNirnSEI=";
   };
 
   pythonRelaxDeps = [

From e3f319bd098ec21adf87bd62b4c87417434df90e Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 5 Mar 2025 08:42:36 -0500
Subject: [PATCH 042/156] erlang_27: 27.2.4 -> 27.3

https://www.erlang.org/news/175
https://erlang.org/download/OTP-27.3.README
---
 pkgs/development/interpreters/erlang/27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index 1fa9fba66484..fd7c08786fa8 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "27.2.4";
-  sha256 = "sha256-0Oj5rU3mUgeYlaHoiOknJz4JsAlQUk1dEgZzYB6xMl0=";
+  version = "27.3";
+  sha256 = "sha256-ZT+d2altco156Bsk/n+Nk9P6Npg0zQIO+nY+I7CGtrw=";
 }

From c5a7c8b47373ed338b4b0f64cf7c690d1747a1df Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Wed, 5 Mar 2025 15:26:04 +0100
Subject: [PATCH 043/156] whitesur-cursors: 0-unstable-2022-06-17 ->
 0-unstable-2025-01-13

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

diff --git a/pkgs/by-name/wh/whitesur-cursors/package.nix b/pkgs/by-name/wh/whitesur-cursors/package.nix
index a6d522dadee3..1eb142333195 100644
--- a/pkgs/by-name/wh/whitesur-cursors/package.nix
+++ b/pkgs/by-name/wh/whitesur-cursors/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "whitesur-cursors";
-  version = "0-unstable-2022-06-17";
+  version = "0-unstable-2025-01-13";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "WhiteSur-cursors";
-    rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8";
-    hash = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0=";
+    rev = "c8759f13de18612051e7c1250946f54e49128b61";
+    hash = "sha256-xzqX/Xa+SEJ6t5T6LMe4m0RBcwioX2B/DHUa6kigzm4=";
   };
 
   installPhase = ''

From 2de0c12f6751f2361e4741461067a15f3bd664ae Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Mar 2025 00:32:09 +0100
Subject: [PATCH 044/156] python312Packages.keras: 3.8.0 -> 3.9.0

Diff: https://github.com/keras-team/keras/compare/refs/tags/v3.8.0...v3.9.0

Changelog: https://github.com/keras-team/keras/releases/tag/v3.9.0
---
 .../python-modules/keras/default.nix          | 51 +++++++------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 4b871998f851..61713c18972b 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -14,6 +14,7 @@
   ml-dtypes,
   namex,
   numpy,
+  tf2onnx,
   onnxruntime,
   optree,
   packaging,
@@ -30,18 +31,19 @@
   pytestCheckHook,
   tf-keras,
   torch,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "keras";
-  version = "3.8.0";
+  version = "3.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "keras-team";
     repo = "keras";
     tag = "v${version}";
-    hash = "sha256-sbAGiI1Ai0MPiQ8AMpa5qX6hYt/plsIqhn9xYLBb120=";
+    hash = "sha256-T1QY1GwE0X5ARtAueB6kF310kTaeOA+8Obdzx0NrOUs=";
   };
 
   build-system = [
@@ -54,6 +56,7 @@ buildPythonPackage rec {
     ml-dtypes
     namex
     numpy
+    tf2onnx
     onnxruntime
     optree
     packaging
@@ -75,40 +78,26 @@ buildPythonPackage rec {
     pytestCheckHook
     tf-keras
     torch
+    writableTmpDirAsHomeHook
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
+  disabledTests = [
+    # Tries to install the package in the sandbox
+    "test_keras_imports"
 
-  disabledTests =
-    [
-      # Requires onnx which is currently broken
-      "test_export_onnx"
-
-      # Tries to install the package in the sandbox
-      "test_keras_imports"
-
-      # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects
-      "test_reloading_default_saved_model"
-
-      # ValueError: The truth value of an empty array is ambiguous.
-      # Use `array.size > 0` to check that an array is not empty.
-      "test_min_max_norm"
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      # TypeError: Cannot convert a MPS Tensor to float64 dtype as the MPS framework doesn't support float64. Please use float32 instead.
-      "test_dynamic_backend_torch"
-      # AttributeError: module 'numpy' has no attribute 'float128'. Did you mean: 'float16'?
-      "test_spectrogram_error"
-    ];
+    # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects
+    "test_reloading_default_saved_model"
+  ];
 
   disabledTestPaths = [
-    # Require onnx which is currently broken
+    # These tests succeed when run individually, but crash within the full test suite:
+    # ImportError: /nix/store/4bw0x7j3wfbh6i8x3plmzknrdwdzwfla-abseil-cpp-20240722.1/lib/libabsl_cord_internal.so.2407.0.0:
+    # undefined symbol: _ZN4absl12lts_2024072216strings_internal13StringifySink6AppendESt17basic_string_viewIcSt11char_traitsIcEE
     "keras/src/export/onnx_test.py"
 
-    # Datasets are downloaded from the internet
+    # Require internet access
     "integration_tests/dataset_tests"
+    "keras/src/applications/applications_test.py"
 
     # TypeError: test_custom_fit.<locals>.CustomModel.train_step() missing 1 required positional argument: 'data'
     "integration_tests/jax_custom_fit_test.py"
@@ -124,14 +113,8 @@ buildPythonPackage rec {
     # AssertionError: 0 != 2
     "integration_tests/torch_workflow_test.py"
 
-    # Most tests require internet access
-    "keras/src/applications/applications_test.py"
-
     # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects
     "keras/src/backend/tensorflow/saved_model_test.py"
-
-    # KeyError: 'Unable to synchronously open object (bad object header version number)'
-    "keras/src/saving/file_editor_test.py"
   ];
 
   meta = {

From 062eb42eba19a38847f16cf52dd3477d8987e593 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 5 Mar 2025 00:11:40 +0100
Subject: [PATCH 045/156] chromium: prepare for M134

---
 .../networking/browsers/chromium/common.nix   | 21 +++++++++++++++++--
 .../browsers/chromium/depot_tools.py          |  2 +-
 .../patches/chromium-134-rust-adler2.patch    | 13 ++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-adler2.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e77128287c77..84053f289853 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -216,6 +216,7 @@ let
 
   isElectron = packageName == "electron";
   needsCompgen = chromiumVersionAtLeast "133";
+  rustcVersion = buildPackages.rustc.version;
 
   chromiumDeps = lib.mapAttrs (
     path: args:
@@ -522,6 +523,9 @@ let
           revert = true;
           hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";
         })
+      ]
+      ++ lib.optionals (chromiumVersionAtLeast "134" && lib.versionOlder rustcVersion "1.86") [
+        ./patches/chromium-134-rust-adler2.patch
       ];
 
     postPatch =
@@ -726,7 +730,20 @@ let
         # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
         chrome_pgo_phase = 0;
         clang_base_path = "${llvmCcAndBintools}";
-        use_qt = false;
+      }
+      // (
+        # M134 changed use_qt to use_qt5 (and use_qt6)
+        if chromiumVersionAtLeast "134" then
+          {
+            use_qt5 = false;
+            use_qt6 = false;
+          }
+        else
+          {
+            use_qt = false;
+          }
+      )
+      // {
         # To fix the build as we don't provide libffi_pic.a
         # (ld.lld: error: unable to find library -l:libffi_pic.a):
         use_system_libffi = true;
@@ -738,7 +755,7 @@ let
         enable_rust = true;
         # While we technically don't need the cache-invalidation rustc_version provides, rustc_version
         # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py).
-        rustc_version = buildPackages.rustc.version;
+        rustc_version = rustcVersion;
       }
       // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) {
         # https://www.mail-archive.com/v8-users@googlegroups.com/msg14528.html
diff --git a/pkgs/applications/networking/browsers/chromium/depot_tools.py b/pkgs/applications/networking/browsers/chromium/depot_tools.py
index 077d59077c7c..0b097a8daffd 100755
--- a/pkgs/applications/networking/browsers/chromium/depot_tools.py
+++ b/pkgs/applications/networking/browsers/chromium/depot_tools.py
@@ -114,7 +114,7 @@ chromium.get_deps(
         },
         **{
         f"checkout_{arch}": True
-        for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64"]
+        for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"]
         },
     },
     "",
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-adler2.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-adler2.patch
new file mode 100644
index 000000000000..3487954ec998
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-adler2.patch
@@ -0,0 +1,13 @@
+diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
+index 6b996aa1fe3865187d02c017e56c0918bcc9b8f4..68b085be200fa4f116aa709b9157c4d2efdf7d6a 100644
+--- a/build/rust/std/BUILD.gn
++++ b/build/rust/std/BUILD.gn
+@@ -89,7 +89,7 @@ if (toolchain_has_rust) {
+     # These are no longer present in the Windows toolchain.
+     stdlib_files += [
+       "addr2line",
+-      "adler2",
++      "adler",
+       "gimli",
+       "libc",
+       "memchr",

From e95ea5544fe494f5ff62bd260d516af15ab5ba05 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 5 Mar 2025 14:21:59 +0100
Subject: [PATCH 046/156] element-web: use yarnConfigHook

---
 .../el/element-web-unwrapped/package.nix      | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index b03d2a2c79a8..22c01011aa96 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   fetchYarnDeps,
   jq,
-  yarn,
-  fixup-yarn-lock,
+  yarnConfigHook,
   nodejs,
   jitsi-meet,
 }:
@@ -36,8 +35,7 @@ stdenv.mkDerivation (
     };
 
     nativeBuildInputs = [
-      yarn
-      fixup-yarn-lock
+      yarnConfigHook
       jq
       nodejs
     ];
@@ -53,25 +51,6 @@ stdenv.mkDerivation (
       runHook postBuild
     '';
 
-    configurePhase = ''
-      runHook preConfigure
-
-      export HOME=$PWD/tmp
-      # with the update of openssl3, some key ciphers are not supported anymore
-      # this flag will allow those codecs again as a workaround
-      # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07
-      # and https://github.com/element-hq/element-web/issues/21043
-      export NODE_OPTIONS=--openssl-legacy-provider
-      mkdir -p $HOME
-
-      fixup-yarn-lock yarn.lock
-      yarn config --offline set yarn-offline-mirror $offlineCache
-      yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
-      patchShebangs node_modules
-
-      runHook postConfigure
-    '';
-
     installPhase = ''
       runHook preInstall
 

From 15fd40ac1338621c057f33f4d8261902517347f9 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 5 Mar 2025 14:18:32 +0100
Subject: [PATCH 047/156] element-desktop: use yarnConfigHook

---
 pkgs/by-name/el/element-desktop/package.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index e231764e59bd..6e47fe087994 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   makeDesktopItem,
-  fixup-yarn-lock,
-  yarn,
+  yarnConfigHook,
   nodejs,
   fetchYarnDeps,
   jq,
@@ -48,8 +47,7 @@ stdenv.mkDerivation (
     };
 
     nativeBuildInputs = [
-      yarn
-      fixup-yarn-lock
+      yarnConfigHook
       nodejs
       makeWrapper
       jq
@@ -57,18 +55,6 @@ stdenv.mkDerivation (
 
     inherit seshat;
 
-    configurePhase = ''
-      runHook preConfigure
-
-      export HOME=$(mktemp -d)
-      yarn config --offline set yarn-offline-mirror $offlineCache
-      fixup-yarn-lock yarn.lock
-      yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
-      patchShebangs node_modules/
-
-      runHook postConfigure
-    '';
-
     # Only affects unused scripts in $out/share/element/electron/scripts. Also
     # breaks because there are some `node`-scripts with a `npx`-shebang and
     # this shouldn't be in the closure just for unused scripts.

From a59ffb727d361138e9c4865321bfd988f30e9d19 Mon Sep 17 00:00:00 2001
From: gbtb <37017396+gbtb@users.noreply.github.com>
Date: Thu, 6 Mar 2025 02:03:14 +1000
Subject: [PATCH 048/156] rocketchat-desktop: remove gbtb from maintainers

---
 pkgs/by-name/ro/rocketchat-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix
index ab9ef85903f9..f8a38900e4b2 100644
--- a/pkgs/by-name/ro/rocketchat-desktop/package.nix
+++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/RocketChat/Rocket.Chat.Electron";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.mit;
-    maintainers = with maintainers; [ gbtb ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 29ef052bcc291edf6a6a5f51148502b6e5176ae0 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 5 Mar 2025 17:36:43 +0100
Subject: [PATCH 049/156] chromium,chromedriver: 133.0.6943.141 ->
 134.0.6998.35

https://chromereleases.googleblog.com/2025/03/stable-channel-update-for-desktop.html

This update includes 14 security fixes.

CVEs:
CVE-2025-1914 CVE-2025-1915 CVE-2025-1916 CVE-2025-1917 CVE-2025-1918
CVE-2025-1919 CVE-2025-1921 CVE-2025-1922 CVE-2025-1923
---
 .../networking/browsers/chromium/info.json    | 315 +++++++++---------
 1 file changed, 155 insertions(+), 160 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index abb6509ac58f..004fa28d6ae3 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,26 +1,26 @@
 {
   "chromium": {
-    "version": "133.0.6943.141",
+    "version": "134.0.6998.35",
     "chromedriver": {
-      "hash_darwin": "sha256-ko7IT0yCfrz1Mdaen8FYsNBWMM6s7bzjZey4cG+QIIs=",
-      "hash_darwin_aarch64": "sha256-4wiQUAesLgPJLWKFl8pAiB6QsReB3RAiPR5yw0F4/Vs="
+      "hash_darwin": "sha256-5TirtxNycNy8l9BbZ0D5P27LjKzwTl0t1vUoTIxCQcE=",
+      "hash_darwin_aarch64": "sha256-Fp1x43sQ6H7sYjtntxanbifmur6hDEri+Hw7947XZPM="
     },
     "deps": {
       "depot_tools": {
-        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
-        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
+        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
+        "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
       },
       "gn": {
-        "rev": "c97a86a72105f3328a540f5a5ab17d11989ab7dd",
-        "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss="
+        "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00",
+        "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U="
       },
       "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "2a5d6da0d6165d7b107502095a937fe7704fcef6",
-        "hash": "sha256-MJlCEe1WBh+7Pl3H4jnkMuSykTBSgh5x/ZPnNwYM4DE=",
+        "rev": "ea6ef4c2ac15ae95d2cfd65682da62c093415099",
+        "hash": "sha256-Y/3V1cmna7nSJkS05SYsDxtPTz8bF7Q8fWYxVhVSy/g=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -30,23 +30,23 @@
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "1f7db7501cf902d5d3ad5fd9b31bea33bb8bf9da",
-        "hash": "sha256-d1Am+7O7KYKEfs9HpAHlw6n6nWpd219gw2Cr5RaBl7w="
+        "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
+        "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "83dfa1f5bfce32d5f75695542468e37ead8163b8",
-        "hash": "sha256-SUpg+lGtjchvh2CejKEIADAo6ozvHYj2BxzMcMZODCw="
+        "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961",
+        "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "d1e95b102f113ded38974cf06a65fe0457b6004b",
-        "hash": "sha256-cRqctLgtiqODZf3B8ZIA2wJWCiEsuYTH24ppFtzDh3M="
+        "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
+        "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "039fea2058d14b408637a931b36a717169617227",
-        "hash": "sha256-Uf9DfH62xWzcOsvaekeqXiwsIaIJMFK7kXK82ReY66Y="
+        "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5",
+        "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -65,18 +65,18 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "4d214097ba7305ec2b3f2dfcf0aa4fd2104c960a",
-        "hash": "sha256-QvwWHVdLnDqJ6hz0Eli5AnM5gaXDya0En7BIm4vlm6c="
+        "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418",
+        "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "06395a2863cb1ebdb47617a995b73f95c14fe120",
-        "hash": "sha256-bx0zCgqgGPjm3wjo8Y3T5kWp14WW9uoDtvn5+QOAPw0="
+        "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
+        "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik="
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "981c424462d9e5210dc843e92b325c93d3bee4e9",
-        "hash": "sha256-O/3qN0pCHSzTURuqzk4schY+aRgRCHHbaTVzbQl3ur4="
+        "rev": "e7d001c82ee5bead5140481671828d5e156a525a",
+        "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -90,13 +90,13 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "8304737811a7851e2bfdcf6f667b68dbac4e962a",
-        "hash": "sha256-kjBkeTaZ0aCpMVyHOJLK5mbGBMB5xG1bnx7pr6d92jc="
+        "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7",
+        "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
-        "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
-        "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk="
+        "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e",
+        "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4="
       },
       "src/third_party/angle/third_party/rapidjson/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson",
@@ -105,13 +105,13 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "9509eb274dfec320e970d4c85e17ecf15f27ebe3",
-        "hash": "sha256-EZBAJP6puSn1vIO+JRPzZkp+uftneyga0zOXpf0W2os="
+        "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd",
+        "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8",
-        "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI="
+        "rev": "2e328dd4eace9648adcc943cac6a1792b5dcdec5",
+        "hash": "sha256-mh4s57NonFQzWNaPiKfe9kW4Ow7XAN+hW6Xpvgjvb0w="
       },
       "src/third_party/content_analysis_sdk/src": {
         "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
@@ -120,13 +120,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "b129d9f2cb897cedba77a60bd5e3621c14ee5484",
-        "hash": "sha256-79NsUzY9fxOXlzwutAF80salew+uVHsadj2BgtEQbfo="
+        "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa",
+        "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "d4321eef8c5c94107783d903355c1cbbbb8a3776",
-        "hash": "sha256-28I6Q/Ip6FhlZa2uFuMrW5YJFaDJrv/bc/wztpfO42g="
+        "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570",
+        "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -135,19 +135,14 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "a8a4e98a2367080af683c48feedd7f7481a31a96",
-        "hash": "sha256-kc3s0LLYi3rNVTPzKQiX46JqnPkqV98tbVQr7OHuRvs="
+        "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306",
+        "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
         "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
         "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA="
       },
-      "src/third_party/dawn/third_party/webgpu-headers": {
-        "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686",
-        "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4="
-      },
       "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
         "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
@@ -160,8 +155,8 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "ba2bd8ab91d41b60b879b134d850d326eb86ef12",
-        "hash": "sha256-FOHgZOI7w7LzZZ14O72b7B/D/Gkvv/2KCf8+bZEPXNM="
+        "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b",
+        "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -175,13 +170,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "d777ea2a7004ff7ef40ef983b41a5125f316f898",
-        "hash": "sha256-GOzeQ6BOXSqpDtgYOIyQae+jCKkqzMsU5N2WE95UR6Q="
+        "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe",
+        "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "02dd5c3ffbfed2bcbc93b553ed0e90a1ac951cb4",
-        "hash": "sha256-1JL9QLMycOXvSrwuvqHxYjSxru6qOmrsJIKMAzPId2s="
+        "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90",
+        "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -190,8 +185,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "8e5d239c953a309d4bf8aa70481bafa921834cc3",
-        "hash": "sha256-2sBXPPb9o/YKE9v9W+IxJ7o/6yOzP0q5GZWcWvohUM4="
+        "rev": "d5166861902b565df446e15181eba270fe168275",
+        "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -200,8 +195,8 @@
       },
       "src/third_party/chromium-variations": {
         "url": "https://chromium.googlesource.com/chromium-variations.git",
-        "rev": "0fcd7c5b11aca584c5c03b2af870c9f3af6c631c",
-        "hash": "sha256-K9saSXK6fCRuRBdX2PPmotO2K3tatiDwuciCDK6O1MU="
+        "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062",
+        "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo="
       },
       "src/third_party/cld_3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
@@ -220,8 +215,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "ca156f7bc9109c552973414a63d310f76ef0cbf8",
-        "hash": "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o="
+        "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6",
+        "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -230,23 +225,23 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "497b90c6e283745f976d783ed2beaafeef42b1bf",
-        "hash": "sha256-s8ot4NvZfpUbLz/AMNX4F9e78AquKWk/YjguErBZCYE="
+        "rev": "ea21b22629965105426f3df5e58190513e95a17e",
+        "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "1b41ed2574ef931f2d1157ebb153c9d552f69670",
-        "hash": "sha256-FgI0D1neQ/jrNaQxMsj2hOM6nF14ZYfGHuqUznRK4Rc="
+        "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed",
+        "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
-        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
+        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
+        "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "41deafc3d1ae776a97d8fd1cfb457a06908e3a6d",
-        "hash": "sha256-8ev0h+/R1L8VXQqpKJ3zVIQ+kYHKWyNJYcGhPdVhSa4="
+        "rev": "044764a564924c9aa0897ba8c50149acc7ddf364",
+        "hash": "sha256-T8BlvYNMF77BubiR4tMvW8iAhqS0ppPAESO48/mNX3w="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -255,8 +250,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "24e0c2a125d2b37b35719124d1f758777c150ca8",
-        "hash": "sha256-c0QHya0eDKQc5YvvxIoL722fPm3XD3PagJb+pEwSAGQ="
+        "rev": "2a35a917be47766a895be610bedd66006980b7e6",
+        "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -265,8 +260,8 @@
       },
       "src/third_party/fast_float/src": {
         "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git",
-        "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f",
-        "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao="
+        "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
+        "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
@@ -300,18 +295,18 @@
       },
       "src/third_party/grpc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git",
-        "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
-        "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8="
+        "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
+        "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg="
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "afc7000cacb8cc90ae61036858c5306defa1236a",
-        "hash": "sha256-ZaAoUxqr3GZ05Zux2jDS4YCbFaeJ4Z+dc3gZCRL09NE="
+        "rev": "b1f47850878d232eea372ab167e760ccac4c4e32",
+        "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM="
       },
       "src/third_party/freetype-testing/src": {
         "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
-        "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
-        "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A="
+        "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
+        "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -320,13 +315,13 @@
       },
       "src/third_party/harfbuzz-ng/src": {
         "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b",
-        "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4="
+        "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c",
+        "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo="
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "e5673a4ff2d82f29b22f7bec114161cbc1ff8cf8",
-        "hash": "sha256-/F4p2VRDWJ0bZRtSoWtgK8gnQDaOrHwoKwGvuSRq3a0="
+        "rev": "bf387a71d7def4b48bf24c8e09d412dfb9962746",
+        "hash": "sha256-OcGUJxKEjeiYJgknpyb/KvDu76GMaddxWO0Lj7l9Eu8="
       },
       "src/third_party/ink_stroke_modeler/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
@@ -350,13 +345,13 @@
       },
       "src/third_party/libgav1/src": {
         "url": "https://chromium.googlesource.com/codecs/libgav1.git",
-        "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
-        "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE="
+        "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
+        "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg="
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "7d76a231b0e29caf86e68d1df858308cd53b2a66",
-        "hash": "sha256-ssYxqE/NZJGTAbuWTXg150qlvMS3QNaonEk9dK8jJWI="
+        "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4",
+        "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -375,8 +370,8 @@
       },
       "src/third_party/leveldatabase/src": {
         "url": "https://chromium.googlesource.com/external/leveldb.git",
-        "rev": "578eeb702ec0fbb6b9780f3d4147b1076630d633",
-        "hash": "sha256-tOSl9w9hEUnuQR+DxfZlHqEXXcpeyDlZrw2NWDUyXoY="
+        "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
+        "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w="
       },
       "src/third_party/libFuzzer/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
@@ -385,8 +380,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "3b4a590f7fc75a77823580c4c4e19d1c7bd6da52",
-        "hash": "sha256-+m6F1rqfIQcxKZbAJgQfKbokYPZSR+PrEHxMiE9IVKA="
+        "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130",
+        "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -395,28 +390,23 @@
       },
       "src/third_party/libaddressinput/src": {
         "url": "https://chromium.googlesource.com/external/libaddressinput.git",
-        "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
-        "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ="
+        "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
+        "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80="
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "0c13a5d54053f82bf8500b421b5cdefb1cc1b3ed",
-        "hash": "sha256-uGvdLJNzvd7WxRAjTxYVaX5Y7Oc54f8fLEtpErAdCdg="
-      },
-      "src/third_party/libavif/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
-        "rev": "e9a27bc6a84f01b6670c05c301c445f33a464992",
-        "hash": "sha256-4slyN5V7UCDbGHK/xZfC5MuOGhctVF6r/1lSnOHJB5Y="
+        "rev": "3990233fc06a35944d6d33797e63931802122a95",
+        "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "879ca873d6648a01de65e4cb0b86336b581aa513",
-        "hash": "sha256-JF1s3rDH0u5srtzyGQt/LU8iVlx1qPqE4RBE1AR8KPQ="
+        "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83",
+        "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "1864b0b55506bfc1eafc3785502f085f41aa0921",
-        "hash": "sha256-tTJ9tJBiWbAurKvb8aPn0KLHd724CYk5wlVIVZPWB0o="
+        "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b",
+        "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ="
       },
       "src/third_party/beto-core/src": {
         "url": "https://beto-core.googlesource.com/beto-core.git",
@@ -430,8 +420,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "67bc21f1f44567a3ba41d7a3d8d0bec0e74f4a9e",
-        "hash": "sha256-mx4Z/co1mZcu//nlGIg5yH+XiTWB0sdiEK8Jvbi4THU="
+        "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce",
+        "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y="
       },
       "src/third_party/speedometer/v3.0": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -455,8 +445,8 @@
       },
       "src/third_party/cros-components/src": {
         "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "59dd6e3d06e111c6a3d323a92e6478b9bbf15915",
-        "hash": "sha256-x9udwohR5jKPL6x2Hxu2FdS2aW3T8VIGZ4mLtgNQ5io="
+        "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71",
+        "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE="
       },
       "src/third_party/libdrm/src": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -510,13 +500,13 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "8058a0b54991257a0e1a2fcf08d993a8b70c1d3a",
-        "hash": "sha256-iwUQ7WI9ThluB2+a4T7FlE7gPyBxTt9PZJnG6k5PYew="
+        "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5",
+        "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
-        "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
-        "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0="
+        "rev": "b4f01ea3ed6fd00923caa383bb2cf6f7a0b7f633",
+        "hash": "sha256-yQ5MIUKtuWQM5SfD74vPeqGEdLJNss2/RBUZfq5701A="
       },
       "src/third_party/libwebp/src": {
         "url": "https://chromium.googlesource.com/webm/libwebp.git",
@@ -525,8 +515,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "47ddac2996378c34aab9318f0d218303b1d282e7",
-        "hash": "sha256-sB5iCuc3+Dp9uVm2mUt4XhQ3zazsueEVNNw6uTMGTuQ="
+        "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4",
+        "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -555,18 +545,18 @@
       },
       "src/third_party/openh264/src": {
         "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
-        "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
-        "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE="
+        "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3",
+        "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4="
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "991678c7c3b66807cb40619e46ebb7de1bc45a18",
-        "hash": "sha256-ULAd+neG99IXGMOT4Ur4tDdV+jxMucwQFid2xhHqcMY="
+        "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed",
+        "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
-        "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
-        "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc="
+        "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d",
+        "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo="
       },
       "src/third_party/openscreen/src/third_party/tinycbor/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git",
@@ -575,13 +565,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "a6637ded97c46aa4879769b1a6b0f2128e6ea257",
-        "hash": "sha256-Y2quVCJS62YFwxBSB42Wg03QQ10M8C1GTrRvhr73IN8="
+        "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0",
+        "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w="
       },
       "src/third_party/perfetto": {
         "url": "https://android.googlesource.com/platform/external/perfetto.git",
-        "rev": "2473cc95bc0d2d0c3c240be49ce4c2d0dc48edd4",
-        "hash": "sha256-OUnQ4XStZ0Olm/IvlaLzcRdHo/EMPlQ6ekVTSrG7HW0="
+        "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357",
+        "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -589,9 +579,9 @@
         "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U="
       },
       "src/third_party/pthreadpool/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git",
-        "rev": "560c60d342a76076f0557a3946924c6478470044",
-        "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE="
+        "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
+        "rev": "e1469417238e13eebaa001779fa031ed25c59def",
+        "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -615,18 +605,23 @@
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
-        "rev": "95484c3e02206f73309c08ee5ee23d2304ca092b",
-        "hash": "sha256-BaRyNHZLpXNsJltffV7T19QrMWkTcCq37JZiWjAdSHo="
+        "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
+        "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA="
+      },
+      "src/third_party/search_engines_data/resources": {
+        "url": "https://chromium.googlesource.com/external/search_engines_data.git",
+        "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3",
+        "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "ecebe831881cdf52c65df518777210071f7970dd",
-        "hash": "sha256-9pq0MEWRlR6bOamQW+onZkhGH82FUYRn3P1ooDUqnPY="
+        "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566",
+        "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
-        "rev": "3e1f0d1d8340cfe136d33fd27c75eb7694148214",
-        "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw="
+        "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
+        "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s="
       },
       "src/third_party/snappy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git",
@@ -640,8 +635,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "52586b554f93e50bc67277c6031673ed23a8d903",
-        "hash": "sha256-WPTpjJK6qFzXJg5eYLpEb6hqGgNzAkQOlSeA5a78Vpk="
+        "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342",
+        "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -650,18 +645,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "b25df276c8e912c22f57263ffcae6ca8f4c64342",
-        "hash": "sha256-Xl5dgjiKpkwf3Iv15Oj83AR1iJQ5qNzClCk24Y28TVw="
+        "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b",
+        "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "915d114daeb26a3dbdad1622f5a72c0aa255acbb",
-        "hash": "sha256-K7HND6c357xoDFAczG77RY4E7lGyEvt0J4NidSkRYTE="
+        "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0",
+        "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "10fb91c403b2f5e2142c751884dd12ed3fb13952",
-        "hash": "sha256-MvX2ApY5EF/jVMCkSSLHkPVIyHPe+CIlKJnkURzmxLU="
+        "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751",
+        "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -670,38 +665,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53",
-        "hash": "sha256-8hx8/1vaY4mRnfNaBsghWqpzyzY4hkVkNFbQEFZif9g="
+        "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644",
+        "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "f3c4a5053f1bd34056282e56659659873f9d47ad",
-        "hash": "sha256-1qIdXDDRDXT27O8o9gFNEQHQKJVAoqN3BDepL/iu1zQ="
+        "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd",
+        "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "36872f9062b17b1a30b8ed1d81ca5ea6bb608a72",
-        "hash": "sha256-+29yOL4VBAR8QpsK/WcCiJkPQxSoReTXVSoAhzsPPKc="
+        "rev": "39f924b810e561fd86b2558b6711ca68d4363f68",
+        "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "081b529a37f43249225114c4c0dea12a29ce605f",
-        "hash": "sha256-QyWnBxTo5KcbEB1/Kcz2679KCsSTRDini4Ef9YRY+lw="
+        "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d",
+        "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "86d6be76350413def51e96ed98a25cc2c9d048c9",
-        "hash": "sha256-2LQGTmViNb4G19zcHyEpor2E0c1wD9+JDknLfeT1M2Y="
+        "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406",
+        "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "b538fb5b08513aa78346cd414ad5e576a2a3e920",
-        "hash": "sha256-XoMQ9VhyS4eJ8TLxNKZ1YygeOJp65AsFSk2galRM7BE="
+        "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed",
+        "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "24ad452082bfbf3eb749d7894266666a8aae4bbb",
-        "hash": "sha256-OUdlPRua+Ujn2rdzmg62OLqlsgByBNh4yUnL11oM5gE="
+        "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e",
+        "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -710,8 +705,8 @@
       },
       "src/third_party/wasm_tts_engine/src": {
         "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "6d5bc87a28e49361dac2964015957698b04a0df8",
-        "hash": "sha256-uqPCMa95uoLhf+cjmc5iz3m3qGy2BNrr8oipfDbColA="
+        "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2",
+        "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY="
       },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -745,8 +740,8 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "e99550b44ea9eedb364beb553d1a48549d0da115",
-        "hash": "sha256-uklVbu4Sgb9FmmKcaep8ncd5FNfdPGwdKMvzVr2qUBI="
+        "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009",
+        "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -755,8 +750,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "cd3e2951ff0f36fa12bea747862c52533a2b39f3",
-        "hash": "sha256-5tdES3wILTC25Lvos5mWYlfT4ZnM2pBFy5LVACVMXEY="
+        "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100",
+        "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -775,18 +770,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "7440eee88f66c4b81d4e7d31f6ae07af66e059ea",
-        "hash": "sha256-qC4hSubtlNKwRikKNYtiEnvCtV0/IGvQegnhrMCTKKs="
+        "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad",
+        "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "b0a179d469680276adbd4007435989a6b7fd8b4f",
-        "hash": "sha256-uFzzxbTxCUl69URMJdb9BL9cHkwwiuSHyXGSVo2xX6w="
+        "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095",
+        "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "93c6f1082c25ef7fdf60ee2e4a029d65808d9343",
-        "hash": "sha256-OV1WncJaYvx1bB5najkKDNC2iMTU+m2vDAi9S/AjCyw="
+        "rev": "debba63b78f8791411bff379835982cb2e8cabfa",
+        "hash": "sha256-iOpnf4jq4bl0CJlHngJ1BV6b0VY1PigJIIjVXk4rqOE="
       }
     }
   },

From 7366bb5218fda4185b26fd3986b5b98d1c5efe98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 16:43:15 +0000
Subject: [PATCH 050/156] calamares: 3.3.13 -> 3.3.14

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

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index 73c779d9fe33..f1ab1365b2be 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
 
 mkDerivation rec {
   pname = "calamares";
-  version = "3.3.13";
+  version = "3.3.14";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz";
-    sha256 = "sha256-5Jz32JTgK6BImM0HcMtXi04k39CAirdmC/lbskVmSNQ=";
+    sha256 = "sha256-VUf4DbBn3qkjrmk7pruI6ysu6sHaPr7EL85FPjHCkMA=";
   };
 
   # On major changes, or when otherwise required, you *must* :

From 25d2e2d67fbddb877d7218395bd401d2bf7279ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Mar 2025 08:44:10 -0800
Subject: [PATCH 051/156] 
 home-assistant-custom-components.waste_collection_schedule: 2.6.0 -> 2.7.0

Diff: https://github.com/mampfes/hacs_waste_collection_schedule/compare/refs/tags/2.6.0...2.7.0

Changelog: https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.7.0
---
 .../custom-components/waste_collection_schedule/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index e67f4f32dff7..43f69ac891f2 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -7,18 +7,19 @@
   icalevents,
   lxml,
   pycryptodome,
+  pypdf,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
     tag = version;
-    hash = "sha256-gfL5Nxe8io7DTya5x8aQ5PhxiH8rb8L3/CA+UqKEDAk=";
+    hash = "sha256-llrECprqzjioEAF+eGbDJ8pkyG3ejTrQd5L60JpPp/Y=";
   };
 
   dependencies = [
@@ -27,6 +28,7 @@ buildHomeAssistantComponent rec {
     icalevents
     lxml
     pycryptodome
+    pypdf
   ];
 
   meta = with lib; {

From 01aaf2a79b7bd1029bf4c8ef8371d7d208e88c07 Mon Sep 17 00:00:00 2001
From: Justin ! <just1602@riseup.net>
Date: Wed, 5 Mar 2025 11:48:52 -0500
Subject: [PATCH 052/156] i3status-rust: add an attribute to be able to disable
 notmuch support

---
 pkgs/applications/window-managers/i3/status-rust.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 273a5900dde4..9058490ff7f0 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -14,6 +14,7 @@
 , pipewire
 , withICUCalendar ? false
 , withPipewire ? true
+, withNotmuch ? true
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -33,15 +34,16 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config makeWrapper ]
     ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]);
 
-  buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ]
-    ++ (lib.optionals withPipewire [ pipewire ]);
+  buildInputs = [ dbus libpulseaudio openssl lm_sensors ]
+    ++ (lib.optionals withPipewire [ pipewire ])
+    ++ (lib.optionals withNotmuch [ notmuch ]);
 
   buildFeatures = [
-    "notmuch"
     "maildir"
     "pulseaudio"
   ] ++ (lib.optionals withICUCalendar [ "icu_calendar" ])
-  ++ (lib.optionals withPipewire [ "pipewire" ]);
+  ++ (lib.optionals withPipewire [ "pipewire" ])
+  ++ (lib.optionals withNotmuch [ "notmuch" ]);
 
   prePatch = ''
     substituteInPlace src/util.rs \

From 0c5ca49ace5b7e8cd17554bc327017dc48b3f04f Mon Sep 17 00:00:00 2001
From: Justin ! <just1602@riseup.net>
Date: Wed, 5 Mar 2025 11:50:59 -0500
Subject: [PATCH 053/156] i3status-rust: format code

---
 .../window-managers/i3/status-rust.nix        | 76 ++++++++++++-------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 9058490ff7f0..8a10f6bb931e 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -1,20 +1,21 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, makeWrapper
-, dbus
-, libpulseaudio
-, notmuch
-, openssl
-, ethtool
-, lm_sensors
-, iw
-, iproute2
-, pipewire
-, withICUCalendar ? false
-, withPipewire ? true
-, withNotmuch ? true
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  makeWrapper,
+  dbus,
+  libpulseaudio,
+  notmuch,
+  openssl,
+  ethtool,
+  lm_sensors,
+  iw,
+  iproute2,
+  pipewire,
+  withICUCalendar ? false,
+  withPipewire ? true,
+  withNotmuch ? true,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,19 +32,29 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-EFFmH9aG7DvSA5rsAuszc1B8kcLdruSk3Hhp4V9t9Gk=";
 
-  nativeBuildInputs = [ pkg-config makeWrapper ]
-    ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]);
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ] ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]);
 
-  buildInputs = [ dbus libpulseaudio openssl lm_sensors ]
+  buildInputs =
+    [
+      dbus
+      libpulseaudio
+      openssl
+      lm_sensors
+    ]
     ++ (lib.optionals withPipewire [ pipewire ])
     ++ (lib.optionals withNotmuch [ notmuch ]);
 
-  buildFeatures = [
-    "maildir"
-    "pulseaudio"
-  ] ++ (lib.optionals withICUCalendar [ "icu_calendar" ])
-  ++ (lib.optionals withPipewire [ "pipewire" ])
-  ++ (lib.optionals withNotmuch [ "notmuch" ]);
+  buildFeatures =
+    [
+      "maildir"
+      "pulseaudio"
+    ]
+    ++ (lib.optionals withICUCalendar [ "icu_calendar" ])
+    ++ (lib.optionals withPipewire [ "pipewire" ])
+    ++ (lib.optionals withNotmuch [ "notmuch" ]);
 
   prePatch = ''
     substituteInPlace src/util.rs \
@@ -56,7 +67,13 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postFixup = ''
-    wrapProgram $out/bin/i3status-rs --prefix PATH : ${lib.makeBinPath [ iproute2 ethtool iw ]}
+    wrapProgram $out/bin/i3status-rs --prefix PATH : ${
+      lib.makeBinPath [
+        iproute2
+        ethtool
+        iw
+      ]
+    }
   '';
 
   # Currently no tests are implemented, so we avoid building the package twice
@@ -67,7 +84,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/greshake/i3status-rust";
     license = licenses.gpl3Only;
     mainProgram = "i3status-rs";
-    maintainers = with maintainers; [ backuitist globin ];
+    maintainers = with maintainers; [
+      backuitist
+      globin
+    ];
     platforms = platforms.linux;
   };
 }

From 70a6026a905c07432fa17d992e3340f6359925e7 Mon Sep 17 00:00:00 2001
From: SamLukeYes <samlukeyes123@gmail.com>
Date: Thu, 6 Mar 2025 01:08:20 +0800
Subject: [PATCH 054/156] librewolf: 135.0.1-1 -> 136.0-1

---
 .../networking/browsers/librewolf/src.json             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index e2ec560cabe6..a10a3b294f0e 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "135.0.1-1",
+  "packageVersion": "136.0-1",
   "source": {
-    "rev": "135.0.1-1",
-    "hash": "sha256-w//XSGqKd9nNX3NmsJvl4UN3tEA1/b9g0xn+hck4hKc="
+    "rev": "136.0-1",
+    "hash": "sha256-ELxcS33lYgYcBUjpfDBMGZfeWanUzcUb3gXI2kEE7O0="
   },
   "firefox": {
-    "version": "135.0.1",
-    "hash": "sha512-n/fCq2vBZg4znNzXdF+L2sW+JdOnm58DkzhZNScNfvSIWZhWvDjCKuCwZzifpxppmXA7dIBKbg6oJl65l4jOqQ=="
+    "version": "136.0",
+    "hash": "sha512-orfnToQEE4spT3s8Xx6urrjOhMmq0lN56Ox4WpaG9C3vn4wRnUvCdt03HRPXvrvksbCSr0FQCqjCssgnlxRFtA=="
   }
 }

From 3321bb6c544ebbea2550f178cea7f276cde968e2 Mon Sep 17 00:00:00 2001
From: nyukuru <nicholasod@proton.me>
Date: Wed, 5 Mar 2025 12:09:56 -0500
Subject: [PATCH 055/156] vimPlugins.lackluster-nvim: init at 2024-12-29

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

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 417ac9211472..fcfd7988e6b0 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -6401,6 +6401,19 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
+  lackluster-nvim = buildVimPlugin {
+    pname = "lackluster.nvim";
+    version = "2024-12-29";
+    src = fetchFromGitHub {
+      owner = "slugbyte";
+      repo = "lackluster.nvim";
+      rev = "662fba7e6719b7afc155076385c00d79290bc347";
+      sha256 = "1jp02km6hmryb9g36z239qkv34hmjx0hbwmg2ns1aq7cqzy1m5x1";
+    };
+    meta.homepage = "https://github.com/slugbyte/lackluster.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   lalrpop-vim = buildVimPlugin {
     pname = "lalrpop.vim";
     version = "2017-11-22";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 3f9b9da1386a..d39bb1fe6a6a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -490,6 +490,7 @@ https://github.com/frabjous/knap/,HEAD,
 https://github.com/b3nj5m1n/kommentary/,,
 https://github.com/udalov/kotlin-vim/,,
 https://github.com/mistweaverco/kulala.nvim/,HEAD,
+https://github.com/slugbyte/lackluster.nvim/,HEAD,
 https://github.com/qnighy/lalrpop.vim/,,
 https://github.com/Wansmer/langmapper.nvim/,HEAD,
 https://github.com/sk1418/last256/,,

From 824b1569faf0641653d5393f3d8aec8039a3ade9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 17:14:42 +0000
Subject: [PATCH 056/156] ledger-live-desktop: 2.100.0 -> 2.102.0

---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index ab6adb18f42b..3e969747f698 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.100.0";
+  version = "2.102.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-WDSlVcWOwri8CT4AD9/tahx5upJvKCQp45wltPp8zI8=";
+    hash = "sha256-mi4YOY8TYorLiUbRCmknY3NBzTXId7/vfdvzUJSrdrI=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 2f454a9ea54160a33a100c7a808e500de73ec834 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Mar 2025 10:33:14 +0100
Subject: [PATCH 057/156] hp2p: unstable-2023-10-25 -> 4.1

Diff:
https://github.com/cea-hpc/hp2p/compare/711f6cc5b4e552d969c2436ad77afd35d31bfd05...4.1

Changelog: https://github.com/cea-hpc/hp2p/releases/tag/4.1
---
 pkgs/by-name/hp/hp2p/package.nix | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/hp/hp2p/package.nix b/pkgs/by-name/hp/hp2p/package.nix
index 1d1bd5d80ae2..ecd1b0232aca 100644
--- a/pkgs/by-name/hp/hp2p/package.nix
+++ b/pkgs/by-name/hp/hp2p/package.nix
@@ -2,21 +2,22 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  mpi,
   python3Packages,
   autoconf,
   automake,
+  mpi,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hp2p";
-  version = "unstable-2023-10-25";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "cea-hpc";
     repo = "hp2p";
-    rev = "711f6cc5b4e552d969c2436ad77afd35d31bfd05";
-    sha256 = "sha256-mBTJZb3DPmIlL7N+PfjlWmBw0WfFF2DesImVZlbDQKc=";
+    tag = finalAttrs.version;
+    hash = "sha256-Rrqb6M9E3WNuxhJXYfBrrv3sFQ2avU33gLZNUtU9Yuc=";
   };
 
   enableParallelBuilding = true;
@@ -44,11 +45,21 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "MPI based benchmark for network diagnostics";
     homepage = "https://github.com/cea-hpc/hp2p";
-    platforms = platforms.unix;
-    license = licenses.cecill-c;
-    maintainers = [ maintainers.bzizou ];
+    changelog = "https://github.com/cea-hpc/hp2p/releases/tag/${finalAttrs.version}";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.cecill-c;
+    maintainers = [ lib.maintainers.bzizou ];
+    mainProgram = "hp2p.exe";
+    badPlatforms = [
+      # hp2p_algo_cpp.cpp:38:10: error: no member named 'random_shuffle' in namespace 'std'
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
-}
+})

From b9970c8ef7c915fe7cd980516528daeceab50b9e Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Wed, 5 Mar 2025 18:14:32 +0000
Subject: [PATCH 058/156] nix-heuristic-gc: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
index 2b16269ad9eb..0c0c8e76222a 100644
--- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix
+++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
@@ -9,12 +9,12 @@
 }:
 python3Packages.buildPythonPackage rec {
   pname = "nix-heuristic-gc";
-  version = "0.6.0";
+  version = "0.6.1";
   src = fetchFromGitHub {
     owner = "risicle";
     repo = "nix-heuristic-gc";
     tag = "v${version}";
-    hash = "sha256-lph+rm8qXoA6h2dJTYeuj9HJAx6PnKZSdsKBElbBUbY=";
+    hash = "sha256-3SSIbfOx6oYsCZgK71bbx2H3bAMZ3VJxWfiMVPq5FaE=";
   };
 
   # NIX_SYSTEM suggested at

From 4c098032d0c4bb29a47c5d83c6ff76be219993d0 Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Wed, 5 Mar 2025 19:34:05 +0100
Subject: [PATCH 059/156] oci-cli: 3.51.8 -> 3.52.0

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

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index eebd13ad60b9..105bb4170a77 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.51.8";
+  version = "3.52.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-p+X6kJDjuDaOLgZ9KwrZJgAqORKLxPrXwQ4X+JZb1W4=";
+    hash = "sha256-5b+KFKj1IjAJwu166Q4YRmvNGmjKMVFhDwzPzWeKT2w=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -105,6 +105,7 @@ py.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [
       adamcstephens
       ilian
+      FKouhai
     ];
   };
 }

From 67ed9abb8500d69510872a6af9c25e3a63641229 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 18:36:59 +0000
Subject: [PATCH 060/156] allure: 2.32.2 -> 2.33.0

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

diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix
index a3f1d9478a91..deafade29a69 100644
--- a/pkgs/by-name/al/allure/package.nix
+++ b/pkgs/by-name/al/allure/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "allure";
-  version = "2.32.2";
+  version = "2.33.0";
 
   src = fetchurl {
     url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
-    hash = "sha256-/hcsXcLT6V2mSJMHBcjFRMFA0uuILQQDIKmrLNRsh9s=";
+    hash = "sha256-ZRAvIBF89LFYWfmO/bPqL85/XQ9l0TRGOs/uQ9no7tA=";
   };
 
   dontConfigure = true;

From ade3d408f27076e84340fad59ab22143cff4ee3b Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 5 Mar 2025 10:47:57 -0800
Subject: [PATCH 061/156] signalbackup-tools: 20250304-1 -> 20250305-2

Diff: https://github.com/bepaald/signalbackup-tools/compare/20250304-1...20250305-2
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index f57ad2c53a3c..d9b088ed6c7a 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250304-1";
+  version = "20250305-2";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-rm3mzQTQCMBia7xexo+fC4sD+ufevbltSA46GsgQAXs=";
+    hash = "sha256-y655shDg3gnm5V1qhEbw6l0JzabhALXPeRQxyFhq2Cs=";
   };
 
   nativeBuildInputs = [

From 7c38e713a5410c3928a13b5b2ef2a1cef22ed1b3 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Wed, 5 Mar 2025 11:04:18 -0800
Subject: [PATCH 062/156] python312Packages.openai: 1.65.2 -> 1.65.3

Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.65.2...v1.65.3

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

diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index bebe570de612..38c21af25caf 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "openai";
-  version = "1.65.2";
+  version = "1.65.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "openai";
     repo = "openai-python";
     tag = "v${version}";
-    hash = "sha256-az6xp84braQBvhRxIJAlpk3d/HTWPTaFWJeCtOwtaP0=";
+    hash = "sha256-RsLJBuus/84B9NzX6PwYOfmbH7M1eKiXqbyoNlpiEzg=";
   };
 
   build-system = [

From 704b9848fefa2a713e6c0dcdd40e0fb17ed3a023 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 5 Mar 2025 22:08:37 +0300
Subject: [PATCH 063/156] kdePackages.kwin: backport fix recommended by
 upstream

(and another prerequisite commit)
---
 pkgs/kde/plasma/kwin/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index e213e27843f5..c8da5a8b6fd3 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -30,6 +30,17 @@ mkKdeDerivation {
     ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
     ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
     ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
+
+    # Backport fix for crashes with multiple displays as recommended by upstream
+    # FIXME: remove in 6.3.3
+    (fetchpatch {
+      url = "https://invent.kde.org/plasma/kwin/-/commit/bb263454548f65796e249adcf374aaebdc5e2db6.patch";
+      hash = "sha256-BsQq42LRilz9YZyfisNChBEQcf1YXeBNCiF3ASVXmug=";
+    })
+    (fetchpatch {
+      url = "https://invent.kde.org/plasma/kwin/-/commit/e652bdd3118fa55563caf0125deb0999f5ebd503.patch";
+      hash = "sha256-4WnyyucIawsFqqSYRT8uY+a1GSDhjtGoqaxEu0o4Il4=";
+    })
   ];
 
   postPatch = ''

From 790fc20209939c8a7128a6c2df6140b651d07e9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 19:22:01 +0000
Subject: [PATCH 064/156] jsoncons: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix
index 9f613f8af09d..095c33f9053c 100644
--- a/pkgs/by-name/js/jsoncons/package.nix
+++ b/pkgs/by-name/js/jsoncons/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jsoncons";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "danielaparker";
     repo = "jsoncons";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JGA3mQToTflm+1rLtKLzbX4x84S+6JoEQAQgx5+E278=";
+    hash = "sha256-EafFoS54svxY9zaFqzWYQ8QUxN2dHy2wI5UugxKnyUk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 6bde446b32cb8ee3d4355d2d5a13af3a6fd362eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 19:22:01 +0000
Subject: [PATCH 065/156] ghostfolio: 2.139.1 -> 2.143.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index d473c5e4e38e..ed65c1e152cc 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.139.1";
+  version = "2.143.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-0NOcmqgHHTUKOZ+l4FBzWO9qxK3vlxrr5dVpbMUNVDo=";
+    hash = "sha256-jOIt8JJghXaKsfwgR6aMfaXEHgIalc/gtwkGJ831bWI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-/2bGyWf/FBQzgwU5PFLDHtzaDVKqyfkS9naOsL6RQSU=";
+  npmDepsHash = "sha256-K+SOl7wuxLhEOoM1A7QG3tB1Xiuz+hstiePIDjmzWVA=";
 
   nativeBuildInputs = [
     prisma

From 1a603341810121a5f53b743019f040df9ed50e9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 19:56:37 +0000
Subject: [PATCH 066/156] pspg: 5.8.7 -> 5.8.8

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

diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix
index a7b2aa02f4b4..9fefda96285d 100644
--- a/pkgs/by-name/ps/pspg/package.nix
+++ b/pkgs/by-name/ps/pspg/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pspg";
-  version = "5.8.7";
+  version = "5.8.8";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = pname;
     rev = version;
-    sha256 = "sha256-SE+62EODKWcKFpMMbWDw+Dp5b2D/XKbMFiJiD/ObrhU=";
+    sha256 = "sha256-8Wi8fMEBc1A0foEzwO5Dq6c3yC0pJ9hbzCjjMp+Lapg=";
   };
 
   nativeBuildInputs = [

From c1c82774aecdefa3c43d6d032dfab8ca3ef1ade6 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 5 Mar 2025 21:16:12 +0100
Subject: [PATCH 067/156] yarnConfigHook: add yarn.lock consistency check
 (#387316)

---
 .../node/fetch-yarn-deps/default.nix          |  6 +++
 .../node/fetch-yarn-deps/yarn-config-hook.sh  | 40 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix
index 29a76d3d9f3e..8d7c3af68cb9 100644
--- a/pkgs/build-support/node/fetch-yarn-deps/default.nix
+++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix
@@ -13,6 +13,7 @@
   nodejs-slim,
   prefetch-yarn-deps,
   fixup-yarn-lock,
+  diffutils,
   yarn,
   makeSetupHook,
   cacert,
@@ -169,6 +170,11 @@ in
       yarn
       fixup-yarn-lock
     ];
+    substitutions = {
+      # Specify `diff` by abspath to ensure that the user's build
+      # inputs do not cause us to find the wrong binaries.
+      diff = "${diffutils}/bin/diff";
+    };
     meta = {
       description = "Install nodejs dependencies from an offline yarn cache produced by fetchYarnDeps";
     };
diff --git a/pkgs/build-support/node/fetch-yarn-deps/yarn-config-hook.sh b/pkgs/build-support/node/fetch-yarn-deps/yarn-config-hook.sh
index c7479ebd3920..1d81aad62e60 100644
--- a/pkgs/build-support/node/fetch-yarn-deps/yarn-config-hook.sh
+++ b/pkgs/build-support/node/fetch-yarn-deps/yarn-config-hook.sh
@@ -10,6 +10,46 @@ yarnConfigHook() {
         echo yarnConfigHook: No yarnOfflineCache or offlineCache were defined\! >&2
         exit 2
     fi
+
+    local -r cacheLockfile="$offlineCache/yarn.lock"
+    local -r srcLockfile="$PWD/yarn.lock"
+
+    echo "Validating consistency between $srcLockfile and $cacheLockfile"
+
+    if ! @diff@ "$srcLockfile" "$cacheLockfile"; then
+      # If the diff failed, first double-check that the file exists, so we can
+      # give a friendlier error msg.
+      if ! [ -e "$srcLockfile" ]; then
+        echo
+        echo "ERROR: Missing yarn.lock from src. Expected to find it at: $srcLockfile"
+        echo "Hint: You can copy a vendored yarn.lock file via postPatch."
+        echo
+
+        exit 1
+      fi
+
+      if ! [ -e "$cacheLockfile" ]; then
+        echo
+        echo "ERROR: Missing lockfile from cache. Expected to find it at: $cacheLockfile"
+        echo
+
+        exit 1
+      fi
+
+      echo
+      echo "ERROR: fetchYarnDeps hash is out of date"
+      echo
+      echo "The yarn.lock in src is not the same as the in $offlineCache."
+      echo
+      echo "To fix the issue:"
+      echo '1. Use `lib.fakeHash` as the fetchYarnDeps hash value'
+      echo "2. Build the derivation and wait for it to fail with a hash mismatch"
+      echo "3. Copy the 'got: sha256-' value back into the fetchYarnDeps hash field"
+      echo
+
+      exit 1
+    fi
+
     yarn config --offline set yarn-offline-mirror "$offlineCache"
     fixup-yarn-lock yarn.lock
     yarn install \

From db4f467976b4bfc2bed4679e2bbe88b8adbf2c72 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Wed, 5 Mar 2025 14:24:25 -0600
Subject: [PATCH 068/156] platformio: 6.1.16 -> 6.1.17

---
 pkgs/development/embedded/platformio/core.nix                 | 4 ++--
 .../embedded/platformio/use-local-spdx-license-list.patch     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix
index 1e5cdce702c1..a2ba8faf7f88 100644
--- a/pkgs/development/embedded/platformio/core.nix
+++ b/pkgs/development/embedded/platformio/core.nix
@@ -12,7 +12,7 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "platformio";
-  version = "6.1.16";
+  version = "6.1.17";
   pyproject = true;
 
   # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     owner = "platformio";
     repo = "platformio-core";
     tag = "v${version}";
-    hash = "sha256-hZgbLUk2Krynut5uD6GMxWA+95y8ONNUmv4kaAltumk=";
+    hash = "sha256-OQEbEAVLS4DdbdBf4S9KS1RVHCC91vFtX6lz2u6Xouc=";
   };
 
   outputs = [
diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
index 6bdc800f1ba1..6496699a799c 100644
--- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
+++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
@@ -6,7 +6,7 @@ index 47efae59..6c2cfaed 100644
      @staticmethod
      @memoized(expire="1h")
      def load_spdx_licenses():
--        version = "3.24.0"
+-        version = "3.26.0"
 -        spdx_data_url = (
 -            "https://raw.githubusercontent.com/spdx/license-list-data/"
 -            f"v{version}/json/licenses.json"

From d542aaf9c3ca3d29a4fc83a99f825929c13d43eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 20:35:54 +0000
Subject: [PATCH 069/156] protonmail-desktop: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 55f54c23c49a..d05c31a45e54 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -9,7 +9,7 @@
 }:
 let
   mainProgram = "proton-mail";
-  version = "1.7.0";
+  version = "1.7.1";
 
 in
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
-    sha256 = "sha256-hwaK8okaixTuVVXfEyb3+71V5dQl0NvCVOfg1a274f8=";
+    sha256 = "sha256-h5OQBZrG8whhsilS7qQU8txFKzjpl+Q27fcUOBYUzbQ=";
   };
 
   dontConfigure = true;

From f35c200215e202e1b63dedefe151efb37d7ace6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 21:26:16 +0000
Subject: [PATCH 070/156] vscode-extensions.ms-python.mypy-type-checker:
 2025.1.10451009 -> 2025.2.0

---
 .../vscode/extensions/ms-python.mypy-type-checker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
index 6bbd336d3b2f..31ba7b47435b 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "mypy-type-checker";
-    version = "2025.1.10451009";
-    hash = "sha256-Q6wfbm3FMNe0VB29QOf5ulTelGVmZVHUnmK17vbrqWc=";
+    version = "2025.2.0";
+    hash = "sha256-VJ/XSC4cbIjgxKLsXxUxwko+HR0U59c8OrhYnKPJu4g=";
   };
 
   meta = {

From 297427a398e9a949e745643fa42a3b49d1ec931c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 21:26:45 +0000
Subject: [PATCH 071/156] vscode-extensions.ms-python.flake8: 2025.1.10441012
 -> 2025.2.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix
index c667d8bd8fae..3b56e76b7b4b 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "flake8";
-    version = "2025.1.10441012";
-    hash = "sha256-Ed5cojxQzH0+j3oW7EnEk4ptsngYwTLz52Pcb3G6bNs=";
+    version = "2025.2.0";
+    hash = "sha256-DbPm/ekturW31jqZw0fvVOvzxAY286eJmgDcahDt0K0=";
   };
 
   meta = {

From 76a5bd7ba50d27c6e07479d61a5da7335a6fe2d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 21:33:46 +0000
Subject: [PATCH 072/156] vscode-extensions.ms-python.pylint: 2024.2.0 ->
 2025.2.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix
index e9c7d050c8ef..7fda5a1d09bc 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "pylint";
-    version = "2024.2.0";
-    hash = "sha256-z9bfV2JPFyDk+bgWFYua2462df36MZy3GSVKhrm2Q6Q=";
+    version = "2025.2.0";
+    hash = "sha256-3RqY/uugtJvT2lWxsA8NWFWel/CxMZzo7PnS9SaRdGg=";
   };
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/ms-python.pylint/changelog";

From 90ad157c1fb4c598ca5d80e679c8f729a6af6c6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 21:48:06 +0000
Subject: [PATCH 073/156] vscode-extensions.ms-python.black-formatter: 2024.6.0
 -> 2025.2.0

---
 .../vscode/extensions/ms-python.black-formatter/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix
index 01fc206f6217..867d56588186 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "black-formatter";
-    version = "2024.6.0";
-    hash = "sha256-Waw+WhazNqVoihC/K/tPFH4tCeYYVOFDBfg+AWvs3q4=";
+    version = "2025.2.0";
+    hash = "sha256-EPtxcp42KunVwVdT/xhVzuwvQ+5VswGNnOZpYXZOP04=";
   };
 
   meta = {

From 2e6af89cf689582c38e6c5553419398f40bb8e60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 21:50:23 +0000
Subject: [PATCH 074/156] vscode-extensions.ms-python.debugpy: 2025.0.1 ->
 2025.4.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
index b283e69b3d25..3064a4c8978a 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "debugpy";
     publisher = "ms-python";
-    version = "2025.0.1";
-    hash = "sha256-IPjQY8G1JvpcjZWRsk1+Z8yIZ1UG0jIxmNsNXcHr+bs=";
+    version = "2025.4.0";
+    hash = "sha256-WbnR949zHuoW+jR6vugvHussScBvgRIi8PYi9HbJxjc=";
   };
 
   meta = {

From 8033eebe36fc6a3fe507d6ea9145f8ab86d777e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Mar 2025 18:31:42 +0100
Subject: [PATCH 075/156] python313Packages.aiodiscover: 2.2.0 -> 2.6.1

Diff: Bluetooth-Devices/aiodiscover@refs/tags/v2.2.0...v2.6.1

Changelog: https://github.com/bdraco/aiodiscover/releases/tag/v2.6.1
---
 pkgs/development/python-modules/aiodiscover/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix
index 4c2e2d5f47eb..b3155fb04232 100644
--- a/pkgs/development/python-modules/aiodiscover/default.nix
+++ b/pkgs/development/python-modules/aiodiscover/default.nix
@@ -18,16 +18,16 @@
 
 buildPythonPackage rec {
   pname = "aiodiscover";
-  version = "2.2.0";
+  version = "2.6.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodiscover";
     tag = "v${version}";
-    hash = "sha256-A12YeNIm9Pv4zpzaejTk8VvLzKLHxZV2EzVpchLX1k8=";
+    hash = "sha256-dgmRgokHDw0ooxD8Ksxb8QKeAdUhYj/WO85EC57MeNg=";
   };
 
   build-system = [ poetry-core ];

From 25da483d0df373f6f8f079978b8615c73262ee30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Mar 2025 09:55:02 -0800
Subject: [PATCH 076/156] python313Packages.aioecowitt: 2024.2.2 -> 2025.3.1

Diff: https://github.com/home-assistant-libs/aioecowitt/compare/refs/tags/2024.2.2...2025.3.1

Changelog: https://github.com/home-assistant-libs/aioecowitt/releases/tag/2025.3.1
---
 pkgs/development/python-modules/aioecowitt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix
index c8e73355bc3c..15be3f422192 100644
--- a/pkgs/development/python-modules/aioecowitt/default.nix
+++ b/pkgs/development/python-modules/aioecowitt/default.nix
@@ -12,21 +12,21 @@
 
 buildPythonPackage rec {
   pname = "aioecowitt";
-  version = "2024.2.2";
+  version = "2025.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
-    repo = pname;
+    repo = "aioecowitt";
     tag = version;
-    hash = "sha256-QfUawUtkNl2molropV8NSU7Kfm/D5/xuaPCjgm2TVOs=";
+    hash = "sha256-BAiRonfu3tFf5ZERbWO+MuEsefrOIaGxUExYx5fXZIM=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     meteocalc
   ];

From 3d579b9c90e2f79b5c5c61239c983ea2c5570705 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 28 Feb 2025 00:51:42 +0100
Subject: [PATCH 077/156] python313Packages.aioesphomeapi: 29.2.0 -> 29.3.1

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

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 19226a93f7a6..2888e84c92ac 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 = "29.2.0";
+  version = "29.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-NK83VZBBMLBkQOb7Z4yVL6GImdNspgF9YIAy8HlktrA=";
+    hash = "sha256-Gv3uM3ZKxcU5BA8HfzHJqTEODM8sfcKbLGfk96yb8u4=";
   };
 
   build-system = [

From f015b82c5bb03e1b5494b449f372fc0be494dcbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 18:43:29 -0800
Subject: [PATCH 078/156] python313Packages.aiohomeconnect: 0.16.0 -> 0.16.2

Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/refs/tags/v0.16.0...v0.16.2

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

diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix
index bdc17b592c98..fbcbf4109c10 100644
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomeconnect";
-  version = "0.16.0";
+  version = "0.16.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
     tag = "v${version}";
-    hash = "sha256-xnihwHtU39OQDk/DgUXkUy6/4GrlFLgjK2via7ELedU=";
+    hash = "sha256-AlmlZoqQxd4RE667rBYFzyAhFN9GJ0Rmk1lniDZKRnM=";
   };
 
   build-system = [ setuptools ];

From 4888b63ff8f06d64b5c2820c473c50980151d802 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 25 Feb 2025 00:00:18 +0100
Subject: [PATCH 079/156] python313Packages.aiohue: 4.7.3 -> 4.7.4

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

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

diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index 0cf7dcaa5b65..80fb02ce03ad 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiohue";
-  version = "4.7.3";
+  version = "4.7.4";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aiohue";
     tag = version;
-    hash = "sha256-uS6pyJOntjbGa9UU1g53nuzgfP6AKAzN4meHrZY6Uic=";
+    hash = "sha256-+vvdv8/rAoMdtH6XN9tq4zOLboTuz3CqruN2KkEMv+c=";
   };
 
   postPatch = ''

From 35fadddcd452bd2c1cd89def4e2cefc8657188fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 10:21:56 -0800
Subject: [PATCH 080/156] python313Packages.aiowebdav2: init at 0.3.1

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

diff --git a/pkgs/development/python-modules/aiowebdav2/default.nix b/pkgs/development/python-modules/aiowebdav2/default.nix
new file mode 100644
index 000000000000..52a7bcd5a153
--- /dev/null
+++ b/pkgs/development/python-modules/aiowebdav2/default.nix
@@ -0,0 +1,55 @@
+{
+  aiofiles,
+  aiohttp,
+  aioresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  lxml,
+  poetry-core,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  python-dateutil,
+  yarl,
+}:
+
+buildPythonPackage rec {
+  pname = "aiowebdav2";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jpbede";
+    repo = "aiowebdav2";
+    tag = "v${version}";
+    hash = "sha256-421c/3UYq/xtv5Zm4j2dje1KH2HOvPrVlmfMA4NX4pA=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiofiles
+    aiohttp
+    lxml
+    python-dateutil
+    yarl
+  ];
+
+  pythonImportsCheck = [ "aiowebdav2" ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/jpbede/aiowebdav2/releases/tag/${src.tag}";
+    description = "Async Python 3 client for WebDAV";
+    homepage = "https://github.com/jpbede/aiowebdav2";
+    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 ebf54b29e2d1..de77d768c5ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -487,6 +487,8 @@ self: super: with self; {
 
   aioweenect = callPackage ../development/python-modules/aioweenect { };
 
+  aiowebdav2 = callPackage ../development/python-modules/aiowebdav2 { };
+
   aiowebostv = callPackage ../development/python-modules/aiowebostv { };
 
   aiowmi = callPackage ../development/python-modules/aiowmi { };

From cec4cda45a6a6392c332a5e7f06e02f165884d08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Feb 2025 07:15:40 +0000
Subject: [PATCH 081/156] python312Packages.aiowebostv: 0.6.2 -> 0.7.3

Diff: https://github.com/home-assistant-libs/aiowebostv/compare/refs/tags/v0.6.2...v0.7.3

Changelog: https://github.com/home-assistant-libs/aiowebostv/releases/tag/v0.7.0
           https://github.com/home-assistant-libs/aiowebostv/releases/tag/v0.7.1
           https://github.com/home-assistant-libs/aiowebostv/releases/tag/v0.7.2
           https://github.com/home-assistant-libs/aiowebostv/releases/tag/v0.7.3
---
 pkgs/development/python-modules/aiowebostv/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix
index 5720666d7865..8e1cd4c42d57 100644
--- a/pkgs/development/python-modules/aiowebostv/default.nix
+++ b/pkgs/development/python-modules/aiowebostv/default.nix
@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "aiowebostv";
-  version = "0.6.2";
+  version = "0.7.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aiowebostv";
     tag = "v${version}";
-    hash = "sha256-H5ZhG69F5w1fZBepxqWGo29XnK3Tn6dgota64k2GJbw=";
+    hash = "sha256-ssoWWLGP+0WGGtvOB0Pr1LMzAOh3qK1PHA99D16azeI=";
   };
 
   build-system = [ setuptools ];
@@ -33,8 +33,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to interact with LG webOS based TV devices";
     homepage = "https://github.com/home-assistant-libs/aiowebostv";
-    changelog = "https://github.com/home-assistant-libs/aiowebostv/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
+    changelog = "https://github.com/home-assistant-libs/aiowebostv/releases/tag/${src.tag}";
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

From 2be582a1f3deec6e98d66d7b9dbd728787708c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 18:45:05 -0800
Subject: [PATCH 082/156] python313Packages.aioshelly: 12.4.2 -> 13.1.0

Diff: https://github.com/home-assistant-libs/aioshelly/compare/refs/tags/12.4.2...13.1.0

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

diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index cf635121e312..4dc4e14023dd 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "12.4.2";
+  version = "13.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aioshelly";
     tag = version;
-    hash = "sha256-QwO1Vi69rj4tCSSkp/j3vtdV6zpgkgM33waDw7ZjApw=";
+    hash = "sha256-Wh4kwyNi0ql0plymkE6XM54SQug9BRvXcI0oEMI2ajA=";
   };
 
   build-system = [ setuptools ];

From 5a778846501d7fee618c489b258e9caf457f1322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 16:30:11 -0800
Subject: [PATCH 083/156] python313Packages.arcam-fmj: 1.8.0 -> 1.8.1

Diff: https://github.com/elupus/arcam_fmj/compare/refs/tags/1.8.0...1.8.1

Changelog: https://github.com/elupus/arcam_fmj/releases/tag/1.8.1
---
 pkgs/development/python-modules/arcam-fmj/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix
index e7d6d11e9708..b5c3690adb11 100644
--- a/pkgs/development/python-modules/arcam-fmj/default.nix
+++ b/pkgs/development/python-modules/arcam-fmj/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "arcam-fmj";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "elupus";
     repo = "arcam_fmj";
     tag = version;
-    hash = "sha256-G+TbZ95KiAunvzhpY6IRZy6xrBn4ceZwixZw37KB298=";
+    hash = "sha256-sNV2k3cbQe60Jpq1J2T6TQAz+NEyLXvS97//vXJ17TM=";
   };
 
   build-system = [ setuptools ];

From 63b6c596b1363afc528deaf29232887e8a496966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 11:06:40 -0800
Subject: [PATCH 084/156] python313Packages.async-interrupt: 1.2.0 -> 1.2.2

Diff: https://github.com/bdraco/async_interrupt/compare/refs/tags/v1.2.0...v1.2.2

Changelog: https://github.com/bdraco/async_interrupt/blob/1.2.2/CHANGELOG.md
---
 .../python-modules/async-interrupt/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/async-interrupt/default.nix b/pkgs/development/python-modules/async-interrupt/default.nix
index 1e29876f17b3..5bf276c12eb6 100644
--- a/pkgs/development/python-modules/async-interrupt/default.nix
+++ b/pkgs/development/python-modules/async-interrupt/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "async-interrupt";
-  version = "1.2.0";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,10 +20,10 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "async_interrupt";
     tag = "v${version}";
-    hash = "sha256-opV5h3aLDDpjlRZRZ9OnrPjUOf/i7g+B9T6msk8wtgI=";
+    hash = "sha256-M0ftyHstBP7+6M2b6yV33mSuO4B8QF3ixRvNJ/WeSEA=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Context manager to raise an exception when a future is done";
     homepage = "https://github.com/bdraco/async_interrupt";
-    changelog = "https://github.com/bdraco/async_interrupt/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/bdraco/async_interrupt/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From a52e0f507cd3016c400d5e6ff4bc97e6577518e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 12:56:34 -0800
Subject: [PATCH 085/156] python313Packages.bleak-retry-connector: 3.8.1 ->
 3.9.0

Diff: https://github.com/Bluetooth-Devices/bleak-retry-connector/compare/refs/tags/v3.8.1...v3.9.0

Changelog: https://github.com/bluetooth-devices/bleak-retry-connector/blob/v3.9.0/CHANGELOG.md
---
 .../bleak-retry-connector/default.nix            | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index aecce4c13171..9d18f221997c 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  async-timeout,
   bleak,
   bluetooth-adapters,
   dbus-fast,
@@ -8,29 +7,25 @@
   fetchFromGitHub,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   pytest-asyncio,
   pytest-cov-stub,
 }:
 
 buildPythonPackage rec {
   pname = "bleak-retry-connector";
-  version = "3.8.1";
+  version = "3.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bleak-retry-connector";
     tag = "v${version}";
-    hash = "sha256-Vkmn+CKQm+i+MRx12U6AmDGUyhtagoXbpeC/uou311o=";
+    hash = "sha256-weZ44YhbCoDRByzta/tkl1maEuxewS+53jxFRDHK6so=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
-    async-timeout
     bleak
     bluetooth-adapters
     dbus-fast
@@ -42,13 +37,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # broken mocking
-    "test_establish_connection_can_cache_services_services_missing"
-    "test_establish_connection_with_dangerous_use_cached_services"
-    "test_establish_connection_without_dangerous_use_cached_services"
-  ];
-
   pythonImportsCheck = [ "bleak_retry_connector" ];
 
   meta = with lib; {

From 3e2a9d575326da7c5858a35976814526d5a7d5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 13:03:10 -0800
Subject: [PATCH 086/156] python313Packages.bleak-esphome: 2.7.1 -> 2.9.0

Diff: https://github.com/bluetooth-devices/bleak-esphome/compare/refs/tags/v2.7.1...v2.9.0

Changelog: https://github.com/bluetooth-devices/bleak-esphome/blob/v2.9.0/CHANGELOG.md
---
 .../development/python-modules/bleak-esphome/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix
index 9971fa3d41b7..3bac922334ff 100644
--- a/pkgs/development/python-modules/bleak-esphome/default.nix
+++ b/pkgs/development/python-modules/bleak-esphome/default.nix
@@ -2,6 +2,7 @@
   lib,
   aioesphomeapi,
   bleak,
+  bleak-retry-connector,
   bluetooth-data-tools,
   buildPythonPackage,
   fetchFromGitHub,
@@ -12,21 +13,18 @@
   pytest-codspeed,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "bleak-esphome";
-  version = "2.7.1";
+  version = "2.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "bleak-esphome";
     tag = "v${version}";
-    hash = "sha256-AZkSWBMyTl2NgqmhVG4sE/N1AQGd6x4CZVYMgRKxlOQ=";
+    hash = "sha256-KuaaZXABR/jbC9ZNbVOyrezUZzb6w7Tn7s3VuVuAtfI=";
   };
 
   build-system = [ poetry-core ];
@@ -34,6 +32,7 @@ buildPythonPackage rec {
   dependencies = [
     aioesphomeapi
     bleak
+    bleak-retry-connector
     bluetooth-data-tools
     habluetooth
     lru-dict

From 52e010bf6b8717dc4f99aaa94bc348e41fc1bdc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 13:02:30 -0800
Subject: [PATCH 087/156] python313Packages.bluetooth-auto-recovery: run all
 tests

---
 .../bluetooth-auto-recovery/default.nix             | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
index f1f3ad0d8da8..ba7579711ee7 100644
--- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
+++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
@@ -7,6 +7,8 @@
   fetchFromGitHub,
   poetry-core,
   pyric,
+  pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   usb-devices,
@@ -26,11 +28,6 @@ buildPythonPackage rec {
     hash = "sha256-JaFazXjbHohj4+rPkQA/SaBP0irHrre3vaCqz7T2bwE=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" ""
-  '';
-
   build-system = [ poetry-core ];
 
   dependencies = [
@@ -41,7 +38,11 @@ buildPythonPackage rec {
     usb-devices
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "bluetooth_auto_recovery" ];
 

From ea1b27d7bf8ddcc2f57d0a29ff0de1183cdcd5e2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 20 Feb 2025 20:29:42 +0100
Subject: [PATCH 088/156] python312Packages.bluetooth-auto-recovery: 1.4.2 ->
 1.4.4

Diff: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/compare/refs/tags/v1.4.2...v1.4.4

Changelog: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v1.4.4/CHANGELOG.md
---
 .../python-modules/bluetooth-auto-recovery/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
index ba7579711ee7..068bcb17b089 100644
--- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
+++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "bluetooth-auto-recovery";
-  version = "1.4.2";
+  version = "1.4.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-auto-recovery";
     tag = "v${version}";
-    hash = "sha256-JaFazXjbHohj4+rPkQA/SaBP0irHrre3vaCqz7T2bwE=";
+    hash = "sha256-Sm3VLgWttMVXH+s1m1ab8kE6dHPit0GY4FVAld5Yg88=";
   };
 
   build-system = [ poetry-core ];

From 943f3a63de137c9987b6d067eaddd3af4ee3674d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 16:31:48 -0800
Subject: [PATCH 089/156] python313Packages.cached-ipaddress: 0.8.0 -> 0.9.2

Diff: https://github.com/bdraco/cached-ipaddress/compare/refs/tags/v0.8.0...v0.9.2

Changelog: https://github.com/bdraco/cached-ipaddress/blob/refs/tags/v0.9.2/CHANGELOG.md
---
 pkgs/development/python-modules/cached-ipaddress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix
index 7ee7b44c66e1..4ef791086c42 100644
--- a/pkgs/development/python-modules/cached-ipaddress/default.nix
+++ b/pkgs/development/python-modules/cached-ipaddress/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "cached-ipaddress";
-  version = "0.8.0";
+  version = "0.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "cached-ipaddress";
     tag = "v${version}";
-    hash = "sha256-VD5z9lKECglx77VYDUeI4iD6mbncSutSlavxY+f3OVo=";
+    hash = "sha256-ojPza3DeeAJgUO0OS1J5YXTtzNWqLUf6YiOG9hohc+A=";
   };
 
   build-system = [

From 6ce8685c8810dfba62d3c9738fd9c67bfa43180b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 18:47:04 -0800
Subject: [PATCH 090/156] python313Packages.deebot-client: 12.2.0 -> 12.3.1

Diff: https://github.com/DeebotUniverse/client.py/compare/refs/tags/12.2.0...12.3.1

Changelog: https://github.com/DeebotUniverse/client.py/releases/tag/12.3.1
---
 .../python-modules/deebot-client/default.nix    | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index 0eb3f5f8e8c6..7e16ff52bdab 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -7,8 +7,6 @@
   defusedxml,
   docker,
   fetchFromGitHub,
-  numpy,
-  pillow,
   pkg-config,
   pycountry,
   pytest-asyncio,
@@ -16,7 +14,6 @@
   pytestCheckHook,
   pythonOlder,
   rustPlatform,
-  svg-py,
   testfixtures,
   xz,
 }:
@@ -26,7 +23,7 @@ buildPythonPackage rec {
   version = "12.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
+  disabled = pythonOlder "3.13";
 
   src = fetchFromGitHub {
     owner = "DeebotUniverse";
@@ -45,13 +42,12 @@ buildPythonPackage rec {
     "defusedxml"
   ];
 
-  build-system = with rustPlatform; [
-    cargoSetupHook
-    maturinBuildHook
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
   ];
 
-  nativeBuildInputs = [ pkg-config ];
-
   buildInputs = [ xz ];
 
   dependencies = [
@@ -59,9 +55,6 @@ buildPythonPackage rec {
     aiomqtt
     cachetools
     defusedxml
-    numpy
-    pillow
-    svg-py
   ];
 
   nativeCheckInputs = [

From 7b15a656293f85bac8e47e894dcffa8a537a96a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 12:34:48 -0800
Subject: [PATCH 091/156] python313Packages.eq3btsmart: update dependencies

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

diff --git a/pkgs/development/python-modules/eq3btsmart/default.nix b/pkgs/development/python-modules/eq3btsmart/default.nix
index daba1c5a0322..bb1e3ec388fe 100644
--- a/pkgs/development/python-modules/eq3btsmart/default.nix
+++ b/pkgs/development/python-modules/eq3btsmart/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   setuptools,
   bleak,
-  construct,
   construct-typing,
   pytest-asyncio,
   pytestCheckHook,
@@ -26,7 +25,6 @@ buildPythonPackage rec {
 
   dependencies = [
     bleak
-    construct
     construct-typing
   ];
 

From 28fc88650324579f09a4ace6ddfbc23ee6e868ca Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 3 Mar 2025 03:26:50 +0100
Subject: [PATCH 092/156] python313Packages.fnv-hash-fast: 1.2.3 -> 1.2.6

https://github.com/bdraco/fnv-hash-fast/blob/v1.2.6/CHANGELOG.md
---
 pkgs/development/python-modules/fnv-hash-fast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fnv-hash-fast/default.nix b/pkgs/development/python-modules/fnv-hash-fast/default.nix
index 563d2f8978b3..32e11527ce19 100644
--- a/pkgs/development/python-modules/fnv-hash-fast/default.nix
+++ b/pkgs/development/python-modules/fnv-hash-fast/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "fnv-hash-fast";
-  version = "1.2.3";
+  version = "1.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "fnv-hash-fast";
     tag = "v${version}";
-    hash = "sha256-x1NiDHqXJb2tbsWBFS1xR+gM4LLpbCc6E8w1kTObSWA=";
+    hash = "sha256-u4DKOJcE/0bRZ+0kcdVoDx7e4HOA4VH8V0DzxQ/SZCo=";
   };
 
   build-system = [

From 8bc6f3203339a968363ae598f20b2cf771850209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 19:25:19 -0800
Subject: [PATCH 093/156] python313Packages.google-genai: init at 1.4.0

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

diff --git a/pkgs/development/python-modules/google-genai/default.nix b/pkgs/development/python-modules/google-genai/default.nix
new file mode 100644
index 000000000000..195db83d3cb9
--- /dev/null
+++ b/pkgs/development/python-modules/google-genai/default.nix
@@ -0,0 +1,54 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  google-auth,
+  httpx,
+  lib,
+  pydantic,
+  pytestCheckHook,
+  requests,
+  setuptools,
+  typing-extensions,
+  websockets,
+}:
+
+buildPythonPackage rec {
+  pname = "google-genai";
+  version = "1.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "googleapis";
+    repo = "python-genai";
+    tag = "v${version}";
+    hash = "sha256-aVn23g67PW3Qge6ZI0lFoozdoWVRrISy29k4uvBKTBQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    google-auth
+    httpx
+    pydantic
+    requests
+    typing-extensions
+    websockets
+  ];
+
+  pythonImportsCheck = [ "google.genai" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # ValueError: GOOGLE_GENAI_REPLAYS_DIRECTORY environment variable is not set
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/googleapis/python-genai/blob/${src.tag}/CHANGELOG.md";
+    description = "Google Generative AI Python SDK";
+    homepage = "https://github.com/googleapis/python-genai";
+    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 de77d768c5ce..6f1f0a2dc0fb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5579,6 +5579,8 @@ self: super: with self; {
     inherit (pkgs) crc32c;
   };
 
+  google-genai = callPackage ../development/python-modules/google-genai { };
+
   google-generativeai = callPackage ../development/python-modules/google-generativeai { };
 
   google-i18n-address = callPackage ../development/python-modules/google-i18n-address { };

From f902b3468d17c2d3c88fb5127c3bf44783c768b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 18:55:38 -0800
Subject: [PATCH 094/156] python313Packages.google-nest-sdm: 7.1.3 -> 7.1.4

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

Changelog: https://github.com/allenporter/python-google-nest-sdm/releases/tag/7.1.4
---
 .../python-modules/google-nest-sdm/default.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index e30c7b93bf22..cf9dec089924 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -12,22 +12,23 @@
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
+  pyyaml,
   requests-oauthlib,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-nest-sdm";
-  version = "7.1.3";
+  version = "7.1.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "python-google-nest-sdm";
     tag = version;
-    hash = "sha256-iVdFl90nP2U5KGqFPvS7qHgSUQjlKnbfZTLq42y/Mrc=";
+    hash = "sha256-wE28+GqZGIhg/+JOnyn2hXw5ia0yg3RLywb1PqgkXw0=";
   };
 
   build-system = [ setuptools ];
@@ -38,6 +39,7 @@ buildPythonPackage rec {
     google-auth-oauthlib
     google-cloud-pubsub
     mashumaro
+    pyyaml
     requests-oauthlib
   ];
 
@@ -55,8 +57,6 @@ buildPythonPackage rec {
   disabledTests = [
     "test_clip_preview_transcode"
     "test_event_manager_event_expiration_with_transcode"
-    # AssertionError: assert '12345' == 12345
-    "test_info_traits_type_error"
   ];
 
   meta = with lib; {

From 5e4871acfdbacb38905449068845f44f48580419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 12:54:19 -0800
Subject: [PATCH 095/156] python313Packages.habluetooth: 3.21.1 -> 3.24.1

Diff: https://github.com/Bluetooth-Devices/habluetooth/compare/refs/tags/v3.21.1...v3.24.1

Changelog: https://github.com/Bluetooth-Devices/habluetooth/blob/v3.24.1/CHANGELOG.md
---
 pkgs/development/python-modules/habluetooth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix
index 98d59951661a..3e0c613357f0 100644
--- a/pkgs/development/python-modules/habluetooth/default.nix
+++ b/pkgs/development/python-modules/habluetooth/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "habluetooth";
-  version = "3.21.1";
+  version = "3.24.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "habluetooth";
     tag = "v${version}";
-    hash = "sha256-r7pDQ0CoLXpiIMPi0SA/gHByKhFzkEhGCiS52bvhT4c=";
+    hash = "sha256-/aLldKbww60XRmTtGd7zTt1KCk7OZsHzJ74vhM215Vk=";
   };
 
   build-system = [

From 027739139b95dc1039024180bf222550ccd72266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 10:22:40 -0800
Subject: [PATCH 096/156] python313Packages.home-assistant-bluetooth: 1.13.0 ->
 1.13.1

Diff: https://github.com/home-assistant-libs/home-assistant-bluetooth/compare/refs/tags/v1.13.0...v1.13.1

Changelog: https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v1.13.1/CHANGELOG.md
---
 .../home-assistant-bluetooth/default.nix      | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
index 881ffeec97a6..4fe4e650fc12 100644
--- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
+++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix
@@ -5,7 +5,6 @@
   pythonOlder,
 
   # build-system
-  cython,
   poetry-core,
   setuptools,
 
@@ -14,12 +13,13 @@
 
   # tests
   bleak,
+  pytest-cov-stub,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "home-assistant-bluetooth";
-  version = "1.13.0";
+  version = "1.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,16 +28,10 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "home-assistant-bluetooth";
     tag = "v${version}";
-    hash = "sha256-+2bw4im09TyjJ5/7ct42ZCFwU7yKWQnbSo7b+44VtpE=";
+    hash = "sha256-piX812Uzd2F8A8+IF/17N+xy6ENpfRVJ1BxsAxL5aj0=";
   };
 
-  postPatch = ''
-    # drop pytest parametrization (coverage, etc.)
-    sed -i '/addopts/d' pyproject.toml
-  '';
-
   build-system = [
-    cython
     poetry-core
     setuptools
   ];
@@ -46,16 +40,17 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     bleak
+    pytest-cov-stub
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "home_assistant_bluetooth" ];
 
-  meta = with lib; {
+  meta = {
     description = "Basic bluetooth models used by Home Assistant";
-    changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/${src.tag}/CHANGELOG.md";
     homepage = "https://github.com/home-assistant-libs/home-assistant-bluetooth";
-    license = licenses.asl20;
-    maintainers = teams.home-assistant.members;
+    license = lib.licenses.asl20;
+    maintainers = lib.teams.home-assistant.members;
   };
 }

From e6f8c5dd96b1dab615b7df5113e02c991306ea8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 11:38:21 -0800
Subject: [PATCH 097/156] python313Packages.iometer: init at 0.1.0

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

diff --git a/pkgs/development/python-modules/iometer/default.nix b/pkgs/development/python-modules/iometer/default.nix
new file mode 100644
index 000000000000..270e11b35060
--- /dev/null
+++ b/pkgs/development/python-modules/iometer/default.nix
@@ -0,0 +1,51 @@
+{
+  aiohttp,
+  aioresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  pytest-asyncio,
+  pytestCheckHook,
+  yarl,
+}:
+
+buildPythonPackage rec {
+  pname = "iometer";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "iometer-gmbh";
+    repo = "iometer.py";
+    tag = "v${version}";
+    hash = "sha256-+Ox9FlS2mswCt2jaJfKuvt21byjUrnCYp3vcv1D83Rs=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+    yarl
+  ];
+
+  pythonImportsCheck = [ "iometer" ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "tests/test.py"
+  ];
+
+  meta = {
+    changelog = "https://github.com/iometer-gmbh/iometer.py/releases/tag/${src.tag}";
+    description = "Python client for interacting with IOmeter devices over HTTP";
+    homepage = "https://github.com/iometer-gmbh/iometer.py";
+    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 6f1f0a2dc0fb..c8e16579ca94 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6530,6 +6530,8 @@ self: super: with self; {
 
   ioctl-opt = callPackage ../development/python-modules/ioctl-opt { };
 
+  iometer = callPackage ../development/python-modules/iometer { };
+
   ionhash = callPackage ../development/python-modules/ionhash { };
 
   ionoscloud = callPackage ../development/python-modules/ionoscloud { };

From 8b0a7020e30b127c30152713bd77095e4cb7d46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 18:58:28 -0800
Subject: [PATCH 098/156] python313Packages.music-assistant-client: 1.0.8 ->
 1.1.1

Diff: https://github.com/music-assistant/client/compare/1.0.8...1.1.1

Changelog: https://github.com/music-assistant/client/blob/1.1.1/CHANGELOG.md
---
 .../python-modules/music-assistant-client/default.nix  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/music-assistant-client/default.nix b/pkgs/development/python-modules/music-assistant-client/default.nix
index a8bf7e2beb41..a2f25196d412 100644
--- a/pkgs/development/python-modules/music-assistant-client/default.nix
+++ b/pkgs/development/python-modules/music-assistant-client/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "music-assistant-client";
-  version = "1.0.8";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "client";
-    rev = version;
-    hash = "sha256-QE2PQeXCAq7+iMomCZK+UmrPUApJxwKi/pzCaLJVS/4=";
+    tag = version;
+    hash = "sha256-KAvNPG3gMJK/iWqen35UCmSccjOkvfrmMvx4YkrOPy8=";
   };
 
   postPatch = ''
@@ -32,8 +32,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  pythonRelaxDeps = [ "music-assistant-models" ];
-
   dependencies = [
     aiohttp
     music-assistant-models
@@ -49,7 +47,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python client to interact with the Music Assistant Server API";
     homepage = "https://github.com/music-assistant/client";
-    changelog = "https://github.com/music-assistant/client/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/music-assistant/client/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ];
   };

From d6d1356895ca077a1e1f48ac2d563b4c05a01640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 19:01:09 -0800
Subject: [PATCH 099/156] python313Packages.music-assistant-models: 1.1.3 ->
 1.1.30

Diff: https://github.com/music-assistant/models/compare/refs/tags/1.1.3...1.1.30

Changelog: https://github.com/music-assistant/models/blob/1.1.30/CHANGELOG.md
---
 .../python-modules/music-assistant-models/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix
index c1634a547b21..8ade60f250bd 100644
--- a/pkgs/development/python-modules/music-assistant-models/default.nix
+++ b/pkgs/development/python-modules/music-assistant-models/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "music-assistant-models";
-  version = "1.1.3"; # Must be compatible with music-assistant-client package
+  version = "1.1.30"; # Must be compatible with music-assistant-client package
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "models";
-    tag = "v${version}";
-    hash = "sha256-FbnwUfAwCwwBKqEUtb2ZBxHehFwJdr9YkuWKox018BY=";
+    tag = version;
+    hash = "sha256-ZLTRHarjVFAk+tYPkgLm192rE+C82vNzqs8PmJhGSeg=";
   };
 
   postPatch = ''

From 9226e4e2196cceb4f97a44b9b46717966ffa79c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 19:03:50 -0800
Subject: [PATCH 100/156] python313Packages.nexia: 2.1.0 -> 2.2.1

Diff: https://github.com/bdraco/nexia/compare/refs/tags/2.1.0...2.2.1

Changelog: https://github.com/bdraco/nexia/releases/tag/2.2.1
---
 pkgs/development/python-modules/nexia/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix
index de973027754f..c76c757fcd91 100644
--- a/pkgs/development/python-modules/nexia/default.nix
+++ b/pkgs/development/python-modules/nexia/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   orjson,
   fetchFromGitHub,
+  propcache,
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
@@ -13,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "nexia";
-  version = "2.1.0";
+  version = "2.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,19 +23,15 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "nexia";
     tag = version;
-    hash = "sha256-bW3eFPs7sX3Z5ZH87orIg0HICXQiFtLqyLKFgpSCzJ0=";
+    hash = "sha256-4UcyCyqK5sEoQNaAWnD+FIEjA+56NKez5wXCQMO8esM=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace '"setuptools>=75.8.0"' ""
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
-    orjson
     aiohttp
+    orjson
+    propcache
   ];
 
   nativeCheckInputs = [

From 8c031f54bcf69efe04c0fd226a65f5be2e184ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 16:27:44 -0800
Subject: [PATCH 101/156] python313Packages.nhc: 0.3.9 -> 0.4.10

Diff: https://github.com/vandeurenglenn/nhc/compare/refs/tags/v0.3.9...v0.4.10

Changelog: https://github.com/vandeurenglenn/nhc/blob/v0.4.10/CHANGELOG.md
---
 pkgs/development/python-modules/nhc/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/nhc/default.nix b/pkgs/development/python-modules/nhc/default.nix
index 6fa33ef431a2..b423f09080c2 100644
--- a/pkgs/development/python-modules/nhc/default.nix
+++ b/pkgs/development/python-modules/nhc/default.nix
@@ -2,28 +2,23 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
-  nclib,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "nhc";
-  version = "0.3.9";
+  version = "0.4.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vandeurenglenn";
     repo = "nhc";
     tag = "v${version}";
-    hash = "sha256-OoWRAELy6w+LVfhBJyKReQUYD/yr4POFH+ScOgp3xyU=";
+    hash = "sha256-oweR7SX8ltL49JJJK3yRNnXL952kEbcLVnmIYXRcLUA=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [
-    nclib
-  ];
-
   pythonImportsCheck = [ "nhc" ];
 
   # upstream has no test

From e0fb86930b2961920236699f726d03a30b3cd3ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Mar 2025 18:34:16 +0100
Subject: [PATCH 102/156] python313Packages.ohme: 1.2.9 -> 1.3.2

Diff: https://github.com/dan-r/ohmepy/compare/refs/tags/v1.2.9...v1.3.2

Changelog: https://github.com/dan-r/ohmepy/releases/tag/v1.3.2
---
 pkgs/development/python-modules/ohme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ohme/default.nix b/pkgs/development/python-modules/ohme/default.nix
index 8e66c9b1f6c9..c5acfd230ef5 100644
--- a/pkgs/development/python-modules/ohme/default.nix
+++ b/pkgs/development/python-modules/ohme/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ohme";
-  version = "1.2.9";
+  version = "1.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "dan-r";
     repo = "ohmepy";
     tag = "v${version}";
-    hash = "sha256-wsYANCe32LG2rAWhMt8x51pHVTZVcgR+0aBTjY56tnE=";
+    hash = "sha256-d4d/3/2c8ML/V06kT5iTHavTEDdobZdvNdynSvIFr14=";
   };
 
   build-system = [ setuptools ];

From efa69a186ca8540b91e664f22ff8a07df2cab61d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 12:55:51 -0800
Subject: [PATCH 103/156] python313Packages.onedrive-personal-sdk: 0.0.11 ->
 0.0.13

Diff: https://github.com/zweckj/onedrive-personal-sdk/compare/refs/tags/v0.0.11...v0.0.13

Changelog: https://github.com/zweckj/onedrive-personal-sdk/releases/tag/v0.0.12
           https://github.com/zweckj/onedrive-personal-sdk/releases/tag/v0.0.13
---
 .../python-modules/onedrive-personal-sdk/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
index 53bd78b822fa..635ec7a857aa 100644
--- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
+++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "onedrive-personal-sdk";
-  version = "0.0.11";
+  version = "0.0.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "onedrive-personal-sdk";
     tag = "v${version}";
-    hash = "sha256-4/v1kAgpg/D7HPTirS+HBs46Vs/OK81MzUW8ixhzU+Y=";
+    hash = "sha256-uR3uqMgRGY3KNWZtNO2OIM2/LcZKyeWvhnFuQvmgPrE=";
   };
 
   build-system = [ setuptools ];

From 4974c86dac1bc7036e8ce4e5e48813efd7f86bce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 22 Feb 2025 19:10:45 +0000
Subject: [PATCH 104/156] python312Packages.plugwise: 1.6.4 -> 1.7.2

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

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 9254d9e17962..f74c9758604d 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -17,16 +17,16 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.6.4";
+  version = "1.7.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "plugwise";
     repo = "python-plugwise";
     tag = "v${version}";
-    hash = "sha256-mzMa+i+DESgOo67SIUBofeY+KoEWdFCcNac7oqEZFgU=";
+    hash = "sha256-WuEVLpFQlPiCYNbAGy3IIOmcbm9MertEQ4tlbd/8OqQ=";
   };
 
   postPatch = ''
@@ -58,7 +58,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for Plugwise Smiles, Stretch and USB stick";
     homepage = "https://github.com/plugwise/python-plugwise";
-    changelog = "https://github.com/plugwise/python-plugwise/releases/tag/v${version}";
+    changelog = "https://github.com/plugwise/python-plugwise/releases/tag/${src.tag}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 0192f3d50ceb6c4c251855ce011f7d7118926019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 16:33:52 -0800
Subject: [PATCH 105/156] python313Packages.py-synologydsm-api: 2.6.3 -> 2.7.0

Diff: https://github.com/mib1185/py-synologydsm-api/compare/refs/tags/v2.6.3...v2.7.0

Changelog: https://github.com/mib1185/py-synologydsm-api/releases/tag/v2.7.0
---
 .../python-modules/py-synologydsm-api/default.nix           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index f269875ec423..b3b33cfc4bd6 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -2,6 +2,7 @@
   lib,
   aiofiles,
   aiohttp,
+  awesomeversion,
   buildPythonPackage,
   fetchFromGitHub,
   pytest-asyncio,
@@ -12,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "py-synologydsm-api";
-  version = "2.6.3";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner = "mib1185";
     repo = "py-synologydsm-api";
     tag = "v${version}";
-    hash = "sha256-BkkI2dhzf58vBoT6UhBsn6MyS7KvYo70C80ZLGOJG08=";
+    hash = "sha256-Zou0l/t9dWls2GKxcU3SDPxb0RaI2emyg07xLyengDo=";
   };
 
   build-system = [ setuptools ];
@@ -29,6 +30,7 @@ buildPythonPackage rec {
   dependencies = [
     aiofiles
     aiohttp
+    awesomeversion
   ];
 
   nativeCheckInputs = [

From 4455198015741b4757755daba5ee3fc446c90f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 11:44:50 -0800
Subject: [PATCH 106/156] python313Packages.pypglab: init at 0.0.3

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

diff --git a/pkgs/development/python-modules/pypglab/default.nix b/pkgs/development/python-modules/pypglab/default.nix
new file mode 100644
index 000000000000..12048ddc0a4d
--- /dev/null
+++ b/pkgs/development/python-modules/pypglab/default.nix
@@ -0,0 +1,40 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  paho-mqtt,
+  voluptuous,
+}:
+
+buildPythonPackage rec {
+  pname = "pypglab";
+  version = "0.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pglab-electronics";
+    repo = "pypglab";
+    tag = version;
+    hash = "sha256-b+o98DrTK1HBKvRfTjdJ1MkdUHEg/TaQZhoLR7URZ0c=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    voluptuous
+    paho-mqtt
+  ];
+
+  pythonImportsCheck = [ "pypglab" ];
+
+  # tests require physical hardware
+  doCheck = false;
+
+  meta = {
+    description = "Asynchronous Python library to communicate with PG LAB Electronics devices over MQTT";
+    homepage = "https://github.com/pglab-electronics/pypglab";
+    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 c8e16579ca94..154f09b9adca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10585,6 +10585,8 @@ self: super: with self; {
 
   pymeshlab = toPythonModule (pkgs.libsForQt5.callPackage ../applications/graphics/pymeshlab { });
 
+  pypglab = callPackage ../development/python-modules/pypglab { };
+
   pyprecice = callPackage ../development/python-modules/pyprecice { };
 
   pyprobables = callPackage ../development/python-modules/pyprobables { };

From 6e1f5fc925b299b850062c2c1e31562fbb7684b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 19:07:58 -0800
Subject: [PATCH 107/156] python313Packages.pyrisco: 0.6.6 -> 0.6.7

Diff: https://github.com/OnFreund/pyrisco/compare/refs/tags/v0.6.6...v0.6.7

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

diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix
index 885c5edb35c6..545260213653 100644
--- a/pkgs/development/python-modules/pyrisco/default.nix
+++ b/pkgs/development/python-modules/pyrisco/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyrisco";
-  version = "0.6.6";
+  version = "0.6.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "OnFreund";
     repo = "pyrisco";
     tag = "v${version}";
-    hash = "sha256-iPtrpxssDEZTlxGtZ0xa1pfzN7wQu1gcQUl4zXPBhm8=";
+    hash = "sha256-mZzTFISw2CzGu6AhXSt6LtbXuKqCTc6B6wNKnI3pA4o=";
   };
 
   build-system = [ setuptools ];

From 410d05c41aeed1feb63e5ff99210405d04a5ff1d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 12 Feb 2025 23:40:42 +0100
Subject: [PATCH 108/156] python313Packages.pysmartthings: 0.7.8 -> 2.5.0

https://github.com/andrewsayre/pysmartthings/releases/tag/v1.0.0
https://github.com/andrewsayre/pysmartthings/releases/tag/v1.1.0
https://github.com/andrewsayre/pysmartthings/releases/tag/v1.2.0
https://github.com/andrewsayre/pysmartthings/releases/tag/v2.0.0
https://github.com/andrewsayre/pysmartthings/releases/tag/v2.0.1
https://github.com/andrewsayre/pysmartthings/releases/tag/v2.1.0
https://github.com/andrewsayre/pysmartthings/releases/tag/v2.2.0
https://github.com/andrewsayre/pysmartthings/releases/tag/v2.3.0
https://github.com/andrewsayre/pysmartthings/releases/tag/v2.4.0
https://github.com/andrewsayre/pysmartthings/releases/tag/v2.4.1
https://github.com/andrewsayre/pysmartthings/releases/tag/v2.5.0
---
 .../python-modules/pysmartthings/default.nix  | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix
index dfcfeb1755c8..77dbce1895c9 100644
--- a/pkgs/development/python-modules/pysmartthings/default.nix
+++ b/pkgs/development/python-modules/pysmartthings/default.nix
@@ -1,40 +1,51 @@
 {
   lib,
   aiohttp,
+  aioresponses,
+  aiosseclient,
   buildPythonPackage,
   fetchFromGitHub,
+  mashumaro,
+  orjson,
+  poetry-core,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
+  syrupy,
+  yarl,
 }:
 
 buildPythonPackage rec {
   pname = "pysmartthings";
-  version = "0.7.8";
-  format = "setuptools";
+  version = "2.5.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "andrewsayre";
-    repo = pname;
-    rev = version;
-    hash = "sha256-r+f2+vEXJdQGDlbs/MhraFgEmsAf32PU282blLRLjzc=";
+    repo = "pysmartthings";
+    rev = "v${version}";
+    hash = "sha256-0D0si3VBGtnQ8+kUKiquPo/IJXeBgR7SFc/1nxhiPvw=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "aiohttp>=3.8.0,<4.0.0" "aiohttp<=4.0.0"
-  '';
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ aiohttp ];
-
-  # https://github.com/andrewsayre/pysmartthings/issues/80
-  doCheck = lib.versionOlder aiohttp.version "3.9.0";
+  dependencies = [
+    aiohttp
+    aiosseclient
+    mashumaro
+    orjson
+    yarl
+  ];
 
   nativeCheckInputs = [
+    aioresponses
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
+    syrupy
   ];
 
   pythonImportsCheck = [ "pysmartthings" ];
@@ -42,7 +53,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for interacting with the SmartThings cloud API";
     homepage = "https://github.com/andrewsayre/pysmartthings";
-    changelog = "https://github.com/andrewsayre/pysmartthings/releases/tag/${version}";
+    changelog = "https://github.com/andrewsayre/pysmartthings/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From 3d5131d8dca28bd25a910cef061fdf010c35d5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 19:11:34 -0800
Subject: [PATCH 109/156] python313Packages.pysmhi: init at 1.0.0

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

diff --git a/pkgs/development/python-modules/pysmhi/default.nix b/pkgs/development/python-modules/pysmhi/default.nix
new file mode 100644
index 000000000000..6e07d4b89cd2
--- /dev/null
+++ b/pkgs/development/python-modules/pysmhi/default.nix
@@ -0,0 +1,49 @@
+{
+  aiohttp,
+  aresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  freezegun,
+  lib,
+  poetry-core,
+  pytest-cov-stub,
+  pytestCheckHook,
+  syrupy,
+}:
+
+buildPythonPackage rec {
+  pname = "pysmhi";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "gjohansson-ST";
+    repo = "pysmhi";
+    tag = "v${version}";
+    hash = "sha256-QwL4WkKrp1CWvJQK/H0iua2Eupe3FvZ4WkYV8OtONhI=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "pysmhi" ];
+
+  nativeCheckInputs = [
+    aresponses
+    freezegun
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  meta = {
+    changelog = "https://github.com/gjohansson-ST/pysmhi/releases/tag/${src.tag}";
+    description = "Retrieve open data from SMHI api";
+    homepage = "https://github.com/gjohansson-ST/pysmhi";
+    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 154f09b9adca..e69028c5f95d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10972,6 +10972,8 @@ self: super: with self; {
 
   pyskyqremote = callPackage ../development/python-modules/pyskyqremote { };
 
+  pysmhi = callPackage ../development/python-modules/pysmhi { };
+
   pysolcast = callPackage ../development/python-modules/pysolcast { };
 
   pystac = callPackage ../development/python-modules/pystac { };

From 11b74221096053edf1fd23452f34bb13afce5e2c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Mar 2025 00:14:35 +0100
Subject: [PATCH 110/156] python313Packages.pysmlight: 0.1.7 -> 0.2.3

Diff: https://github.com/smlight-tech/pysmlight/compare/refs/tags/v0.1.7...v0.2.3

Changelog: https://github.com/smlight-tech/pysmlight/releases/tag/v0.2.3
---
 pkgs/development/python-modules/pysmlight/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index 343c02851979..cc8796ca4456 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -2,6 +2,7 @@
   aiohttp,
   aiohttp-sse-client2,
   aresponses,
+  awesomeversion,
   buildPythonPackage,
   fetchFromGitHub,
   lib,
@@ -13,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pysmlight";
-  version = "0.1.7";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
     tag = "v${version}";
-    hash = "sha256-gEqsCHe8U1p1uKarCzzppFAKC5OGNUJk/Hif5VXnojw=";
+    hash = "sha256-9aJ69t+zuWsmU9JIYgz12DRxFkhUCrrA0lBaUFbsEVM=";
   };
 
   build-system = [ poetry-core ];
@@ -28,6 +29,7 @@ buildPythonPackage rec {
   dependencies = [
     aiohttp
     aiohttp-sse-client2
+    awesomeversion
     mashumaro
   ];
 

From 6e517f395224a50c6875e8810d54bfa5f58be45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 09:56:44 -0800
Subject: [PATCH 111/156] python313Packages.python-picnic-api2: init at 1.2.2

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

diff --git a/pkgs/development/python-modules/python-picnic-api2/default.nix b/pkgs/development/python-modules/python-picnic-api2/default.nix
new file mode 100644
index 000000000000..aea6359f8abc
--- /dev/null
+++ b/pkgs/development/python-modules/python-picnic-api2/default.nix
@@ -0,0 +1,54 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  pytestCheckHook,
+  python-dotenv,
+  requests,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "python-picnic-api2";
+  version = "1.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "codesalatdev";
+    repo = "python-picnic-api";
+    tag = "v${version}";
+    hash = "sha256-pO0aIdMKSC8AT/Bu5axl1NZbbF8IM/cOygLRT8eRKlU=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    requests
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "python_picnic_api2" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # tests access the actual API
+    "integration_tests"
+  ];
+
+  disabledTests = [
+    # tests don't expect requests to come with the br transfer-encoding
+    "test_update_auth_token"
+  ];
+
+  meta = {
+    changelog = "https://github.com/codesalatdev/python-picnic-api/releases/tag/${src.tag}";
+    description = "Fork of the Unofficial Python wrapper for the Picnic API";
+    homepage = "https://github.com/codesalatdev/python-picnic-api";
+    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 e69028c5f95d..751f97f0c513 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13616,6 +13616,8 @@ self: super: with self; {
 
   python-picnic-api = callPackage ../development/python-modules/python-picnic-api { };
 
+  python-picnic-api2 = callPackage ../development/python-modules/python-picnic-api2 { };
+
   python-pidfile = callPackage ../development/python-modules/python-pidfile { };
 
   python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };

From 902208b355956504d26c3f700420fe06da09420d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 16:50:49 -0800
Subject: [PATCH 112/156] python313Packages.python-snoo: init at 0.6.0

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

diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix
new file mode 100644
index 000000000000..fbbafe0f65cb
--- /dev/null
+++ b/pkgs/development/python-modules/python-snoo/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  aiohttp,
+  freenub,
+  mashumaro,
+}:
+
+buildPythonPackage rec {
+  pname = "python-snoo";
+  version = "0.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Lash-L";
+    repo = "python-snoo";
+    tag = "v${version}";
+    hash = "sha256-d08aISGFAq5iUqH1AdPg4vkg+zNWpVtM0wmEN/xJD1w=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail poetry-core==1.8.0 poetry-core
+  '';
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+    freenub
+    mashumaro
+  ];
+
+  pythonImportsCheck = [ "python_snoo" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/Lash-L/python-snoo/blob/${src.tag}/CHANGELOG.md";
+    description = "Control Snoo devices via python and get auto updates";
+    homepage = "https://github.com/Lash-L/python-snoo";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 751f97f0c513..309b8755eb91 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11086,6 +11086,8 @@ self: super: with self; {
 
   python-pptx = callPackage ../development/python-modules/python-pptx { };
 
+  python-snoo = callPackage ../development/python-modules/python-snoo { };
+
   python-songpal = callPackage ../development/python-modules/python-songpal { };
 
   python-swiftclient = callPackage ../development/python-modules/python-swiftclient { };

From 7615a716b0b9cb3482aa068dd2d9a442d4290027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 18:37:46 -0800
Subject: [PATCH 113/156] python313Packages.python-technove: 1.3.1 -> 2.0.0

Diff: https://github.com/Moustachauve/pytechnove/compare/refs/tags/v1.3.1...v2.0.0

Changelog: https://github.com/Moustachauve/pytechnove/releases/tag/v2.0.0
---
 .../python-modules/python-technove/default.nix  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix
index 8addb71d5b8d..e3e716f0223e 100644
--- a/pkgs/development/python-modules/python-technove/default.nix
+++ b/pkgs/development/python-modules/python-technove/default.nix
@@ -9,6 +9,7 @@
   fetchFromGitHub,
   poetry-core,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   yarl,
@@ -16,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "python-technove";
-  version = "1.3.1";
+  version = "2.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,17 +26,12 @@ buildPythonPackage rec {
     owner = "Moustachauve";
     repo = "pytechnove";
     tag = "v${version}";
-    hash = "sha256-umtM2fIyEiimt/X2SvgqjaTYGutvJHkSJ3pRfwSbOfQ=";
+    hash = "sha256-LgrydBgx68HP8yaywkMMeS71VqhilYGODppBZbdkssQ=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "--cov" ""
-  '';
+  build-system = [ poetry-core ];
 
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     awesomeversion
     backoff
@@ -46,6 +42,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aresponses
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
   ];
 
@@ -54,7 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library to interact with TechnoVE local device API";
     homepage = "https://github.com/Moustachauve/pytechnove";
-    changelog = "https://github.com/Moustachauve/pytechnove/releases/tag/v${version}";
+    changelog = "https://github.com/Moustachauve/pytechnove/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From 5d94c4cbe6c070b4790623fd9fdbf14d1e311f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 16:46:16 -0800
Subject: [PATCH 114/156] python313Packages.pytouchline-extended: init at 0.4.5

---
 .../pytouchline-extended/default.nix          | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytouchline-extended/default.nix

diff --git a/pkgs/development/python-modules/pytouchline-extended/default.nix b/pkgs/development/python-modules/pytouchline-extended/default.nix
new file mode 100644
index 000000000000..d1acd2d5735e
--- /dev/null
+++ b/pkgs/development/python-modules/pytouchline-extended/default.nix
@@ -0,0 +1,48 @@
+{
+  buildPythonPackage,
+  faust-cchardet,
+  fetchFromGitHub,
+  httplib2,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pytouchline-extended";
+  version = "0.4.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "brondum";
+    repo = "pytouchline";
+    tag = version;
+    hash = "sha256-fcqm5fRuxB4YQkP48UclGgo4KohXu2OU7w1Nr6i9c6s=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail '$GITHUB_REF_NAME' '${version}'
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    faust-cchardet
+    httplib2
+  ];
+
+  pythonImportsCheck = [ "pytouchline_extended" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/brondum/pytouchline/releases/tag/${src.tag}";
+    description = "Roth Touchline interface library";
+    homepage = "https://github.com/brondum/pytouchline";
+    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 309b8755eb91..4a80989958fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11111,6 +11111,8 @@ self: super: with self; {
 
   pytorch3d = callPackage ../development/python-modules/pytorch3d { };
 
+  pytouchline-extended = callPackage ../development/python-modules/pytouchline-extended { };
+
   pytouchlinesl = callPackage ../development/python-modules/pytouchlinesl { };
 
   pyuca = callPackage ../development/python-modules/pyuca { };

From 44c787a4ec6b272b2a7a5bf1eb810c4a9b68e0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Mar 2025 09:15:48 -0800
Subject: [PATCH 115/156] python313Packages.securetar: 2025.1.4 -> 2025.2.1

Diff: https://github.com/pvizeli/securetar/compare/refs/tags/2025.1.4...2025.2.1

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

diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix
index 215e89a15ca5..7c38302a6e81 100644
--- a/pkgs/development/python-modules/securetar/default.nix
+++ b/pkgs/development/python-modules/securetar/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "securetar";
-  version = "2025.1.4";
+  version = "2025.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "pvizeli";
     repo = "securetar";
     tag = version;
-    hash = "sha256-vI9u8CUf9rdJwx+Q3ypO9XS/jfRxZV5EOjvKSmQSNa0=";
+    hash = "sha256-uVzyVgS8bWxS7jhwVyv7wTNF8REW+dJIhkRaS/8/FmY=";
   };
 
   build-system = [ setuptools ];

From d8bed5f0c290047e4d0aa2375a3fcd3ff62fbd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 16:45:32 -0800
Subject: [PATCH 116/156] python313Packages.sensorpush-api init at 2.1.1

---
 .../python-modules/sensorpush-api/default.nix | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/python-modules/sensorpush-api/default.nix

diff --git a/pkgs/development/python-modules/sensorpush-api/default.nix b/pkgs/development/python-modules/sensorpush-api/default.nix
new file mode 100644
index 000000000000..ec0a254577ba
--- /dev/null
+++ b/pkgs/development/python-modules/sensorpush-api/default.nix
@@ -0,0 +1,55 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pydantic,
+  pytestCheckHook,
+  python-dateutil,
+  setuptools,
+  urllib3,
+}:
+
+buildPythonPackage rec {
+  pname = "sensorpush-api";
+  version = "2.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sstallion";
+    repo = "sensorpush-api";
+    tag = "v${version}";
+    hash = "sha256-Gkvd0MbySk4jdl+hJd0wFGqj2/qOkq/jThe+5b4n0XM=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonRelaxDeps = [
+    "urllib3"
+  ];
+
+  pythonRemoveDeps = [
+    "aenum" # https://github.com/sstallion/sensorpush-api/pull/3
+  ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+    python-dateutil
+    urllib3
+  ];
+
+  pythonImportsCheck = [ "sensorpush_api" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/sstallion/sensorpush-api/blob/${src.tag}/CHANGELOG.md";
+    description = "SensorPush Public API for Python";
+    homepage = "https://github.com/sstallion/sensorpush-api";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a80989958fc..8d7a8c9d6889 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14964,6 +14964,8 @@ self: super: with self; {
 
   sensorpro-ble = callPackage ../development/python-modules/sensorpro-ble { };
 
+  sensorpush-api = callPackage ../development/python-modules/sensorpush-api { };
+
   sensorpush-ble = callPackage ../development/python-modules/sensorpush-ble { };
 
   sensoterra = callPackage ../development/python-modules/sensoterra { };

From f67ec8b4b4c8e34b047edde154e7d00f55078f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 16:49:09 -0800
Subject: [PATCH 117/156] python313Packages.sensorpush-ha init at 1.3.2

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

diff --git a/pkgs/development/python-modules/sensorpush-ha/default.nix b/pkgs/development/python-modules/sensorpush-ha/default.nix
new file mode 100644
index 000000000000..647104ee4aea
--- /dev/null
+++ b/pkgs/development/python-modules/sensorpush-ha/default.nix
@@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pydantic,
+  sensorpush-api,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "sensorpush-ha";
+  version = "1.3.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sstallion";
+    repo = "sensorpush-ha";
+    tag = "v${version}";
+    hash = "sha256-Gs6WprGscr9fiu78S0OY6624LA87Of7OWkNNnaWIxJk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pydantic
+    sensorpush-api
+  ];
+
+  pythonImportsCheck = [ "sensorpush_ha" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/sstallion/sensorpush-ha/blob/${src.tag}/CHANGELOG.md";
+    description = "SensorPush Cloud Home Assistant Library";
+    homepage = "https://github.com/sstallion/sensorpush-ha";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d7a8c9d6889..e2245891d3c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14968,6 +14968,8 @@ self: super: with self; {
 
   sensorpush-ble = callPackage ../development/python-modules/sensorpush-ble { };
 
+  sensorpush-ha = callPackage ../development/python-modules/sensorpush-ha { };
+
   sensoterra = callPackage ../development/python-modules/sensoterra { };
 
   sentencepiece = callPackage ../development/python-modules/sentencepiece {

From 07065a9d847ee7be85189150117d21a4640735f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2025 10:50:46 +0000
Subject: [PATCH 118/156] python312Packages.soco: 0.30.8 -> 0.30.9

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

diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index f9fb5365f156..940a50839852 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "soco";
-  version = "0.30.8";
+  version = "0.30.9";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "SoCo";
     repo = "SoCo";
     tag = "v${version}";
-    hash = "sha256-RuPWxa4FC+5knkC9tlUHvk5jtE5jso+6L7JDGXIimKA=";
+    hash = "sha256-nyzrBvl6VnNA8cMYtKIvB7k95g5AUixz93Ptc8rQ2pM=";
   };
 
   build-system = [ setuptools ];

From b116c2a68e08248fb2a6ad788a467218d0b9833f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Mar 2025 09:13:15 -0800
Subject: [PATCH 119/156] python313Packages.stookwijzer: 1.5.4 -> 1.6.1

Diff: https://github.com/fwestenberg/stookwijzer/compare/refs/tags/v1.5.4...v1.6.1
---
 pkgs/development/python-modules/stookwijzer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix
index 5a7b618e7000..dd395f7ca1cc 100644
--- a/pkgs/development/python-modules/stookwijzer/default.nix
+++ b/pkgs/development/python-modules/stookwijzer/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "stookwijzer";
-  version = "1.5.4";
+  version = "1.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fwestenberg";
     repo = "stookwijzer";
     tag = "v${version}";
-    hash = "sha256-ZbXXpmyu4sczYlM0rFn1xIUYmQtxLv4SiQrk8qox8Dk=";
+    hash = "sha256-T4u3KuKWAXRkHbjPt4qkiisnLjx9JMD0DW6enOlu69g=";
   };
 
   build-system = [ setuptools ];

From a7e88a4aa5e24ae87dc3bc0de8c52adc99c55476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Mar 2025 09:18:10 -0800
Subject: [PATCH 120/156] python313Packages.tesla-fleet-api: 0.9.10 -> 0.9.12

Diff: https://github.com/Teslemetry/python-tesla-fleet-api/compare/refs/tags/v0.9.10...0.9.12
---
 pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index 843b4d73d511..69c85b072cfe 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "0.9.10";
+  version = "0.9.12";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     tag = "v${version}";
-    hash = "sha256-JKXGQJwFmcG2+suHpd8LuEgtlpNV6YzxrGBIa8A7InI=";
+    hash = "sha256-1ir1x/uvcVoad82KaGAMm/S52MT7E5SkiTnUH2cWV34=";
   };
 
   build-system = [ setuptools ];

From 20023d0c06b00b41802d8a5303a4e1029ce67cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Mar 2025 09:20:56 -0800
Subject: [PATCH 121/156] python313Packages.upb-lib: 0.5.9 -> 0.6.0

Diff: https://github.com/gwww/upb-lib/compare/refs/tags/0.5.9...0.6.0

Changelog: https://github.com/gwww/upb-lib/releases/tag/0.6.0
---
 .../python-modules/upb-lib/default.nix        | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix
index 6bcdb0953fb6..88ccbc6d90d2 100644
--- a/pkgs/development/python-modules/upb-lib/default.nix
+++ b/pkgs/development/python-modules/upb-lib/default.nix
@@ -2,16 +2,16 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   pyserial-asyncio-fast,
   pytestCheckHook,
   pythonOlder,
   pytz,
-  poetry-core,
 }:
 
 buildPythonPackage rec {
   pname = "upb-lib";
-  version = "0.5.9";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,10 +20,10 @@ buildPythonPackage rec {
     owner = "gwww";
     repo = "upb-lib";
     tag = version;
-    hash = "sha256-GnNzKU4mqBu2pUOju+4+HMLsTupd8s+nAAieixkBCDk=";
+    hash = "sha256-4RDatZXEwjNVbz1/ZNA6HY2fDHMq2dE/Huf4Ui3wU3c=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     pyserial-asyncio-fast
@@ -34,16 +34,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "upb_lib" ];
 
-  disabledTests = [
-    # AssertionError
-    "test_create_control_word_all"
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Library for interacting with UPB PIM";
     homepage = "https://github.com/gwww/upb-lib";
-    changelog = "https://github.com/gwww/upb-lib/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    changelog = "https://github.com/gwww/upb-lib/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From 3435b8e4286defa21efb076a4142d1a2bded70a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Mar 2025 09:24:02 -0800
Subject: [PATCH 122/156] python313Packages.weheat: 2025.2.13 -> 2025.2.27

Diff: https://github.com/wefabricate/wh-python/compare/refs/tags/2025.2.13...2025.2.27
---
 pkgs/development/python-modules/weheat/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/weheat/default.nix b/pkgs/development/python-modules/weheat/default.nix
index c99ebbb8a758..445920702abc 100644
--- a/pkgs/development/python-modules/weheat/default.nix
+++ b/pkgs/development/python-modules/weheat/default.nix
@@ -7,28 +7,24 @@
   fetchFromGitHub,
   pydantic,
   python-dateutil,
-  pythonOlder,
   setuptools,
   urllib3,
 }:
 
 buildPythonPackage rec {
   pname = "weheat";
-  version = "2025.2.13";
+  version = "2025.2.27";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "wefabricate";
     repo = "wh-python";
     tag = version;
-    hash = "sha256-YXo+pwgCjw2CWUCS9DY9jaLjhj+q+ZqfW3uh1aSXnM0=";
+    hash = "sha256-DrBOx++Rp/5s8sU07+/cuy2Je27i84WCY3/mljLfawk=";
   };
 
   pythonRelaxDeps = [
     "urllib3"
-    "pydantic"
   ];
 
   build-system = [ setuptools ];

From 30662649369a34d058c9fe9d2721b8cc4da3701a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 19 Feb 2025 11:47:27 +0100
Subject: [PATCH 123/156] python312Packages.zeroconf: 0.144.1 -> 0.145.1

Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.144.1...0.145.1

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

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 54da13320331..282b2c368b91 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.144.1";
+  version = "0.145.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "jstasiak";
     repo = "python-zeroconf";
     tag = version;
-    hash = "sha256-OpylhsMjM7Xc1/vVv2kNuxeO7XknjQjJ8jFVS2+3188=";
+    hash = "sha256-tQjQ34746aeRz4gead3LcyfCF0L0iaJeQcDdqDW4gD8=";
   };
 
   build-system = [

From 23b334e33ae0ba8504cc50cae22732c6ae651f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 09:46:02 -0800
Subject: [PATCH 124/156] python313Packages.zha: 0.0.49 -> 0.0.51

Diff: https://github.com/zigpy/zha/compare/refs/tags/0.0.49...0.0.51

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

diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index ecae00d4942b..a00e3e4b1e3b 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "zha";
-  version = "0.0.49";
+  version = "0.0.51";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha";
     tag = version;
-    hash = "sha256-QW/FrmZIRr2xt+a6Se9nEp4ttfhNJx79/qV9A+hmNSU=";
+    hash = "sha256-zcLhmUNjPgZNDcG1Nq2LrcW0hsvPvoFdZ6L9ejGPgaQ=";
   };
 
   postPatch = ''

From d8de3c8bcc12fe622bd2f508944dde31b63abc72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Mar 2025 01:51:34 +0000
Subject: [PATCH 125/156] python312Packages.zha-quirks: 0.0.133 -> 0.0.134

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

diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index af1b3ccd7599..b43705f3b185 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.133";
+  version = "0.0.134";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha-device-handlers";
     tag = version;
-    hash = "sha256-9nw9eEUzIIp679LSMRmO5kW5Qvz3vcL3AEXHdhNFtG8=";
+    hash = "sha256-9h9Fsn15/1fZIiZEyGPIzuyxmGs7L4PyEwH/K2cRSgU=";
   };
 
   postPatch = ''
@@ -54,7 +54,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
     homepage = "https://github.com/dmulcahey/zha-device-handlers";
-    changelog = "https://github.com/zigpy/zha-device-handlers/releases/tag/${version}";
+    changelog = "https://github.com/zigpy/zha-device-handlers/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     platforms = platforms.linux;

From bab88cc0c7559190eac76756d473c62715e6744a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 09:48:11 -0800
Subject: [PATCH 126/156] python313Packages.zigpy: 0.76.1 -> 0.76.2

Diff: https://github.com/zigpy/zigpy/compare/refs/tags/0.76.1...0.76.2

Changelog: https://github.com/zigpy/zigpy/releases/tag/0.76.2
---
 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 abb8f03f3dd9..af77dc067b3b 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.76.1";
+  version = "0.76.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy";
     tag = version;
-    hash = "sha256-ZPNMlaktdSElOfKf3SmI08RGRSpI5hK2khWoJybtJh4=";
+    hash = "sha256-FJ1mEo/+U0wqLRnmro34UVDwzVJXhI4aJtcvfDboPlc=";
   };
 
   postPatch = ''

From 54250e5db6fd251d64b3e7fdf909dbeec8e1ae61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Mar 2025 11:38:16 -0800
Subject: [PATCH 127/156] python313Packages.thinqconnect: 1.0.3 -> 1.0.4

Diff: https://github.com/thinq-connect/pythinqconnect/compare/refs/tags/1.0.3...1.0.4

Changelog: https://github.com/thinq-connect/pythinqconnect/blob/1.0.4/RELEASE_NOTES.md
---
 pkgs/development/python-modules/thinqconnect/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix
index cf908a78d7c0..a28c6ebb560c 100644
--- a/pkgs/development/python-modules/thinqconnect/default.nix
+++ b/pkgs/development/python-modules/thinqconnect/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "thinqconnect";
-  version = "1.0.3";
+  version = "1.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "thinq-connect";
     repo = "pythinqconnect";
     tag = version;
-    hash = "sha256-p2EY1DeLxmXcfohN4e4I7I+SNkabEr37ZC2ka1CT7/s=";
+    hash = "sha256-LVmvJvGbiPPg+WlrTOYueNCNZNjldWJVC+OqFl9CcK0=";
   };
 
   build-system = [ setuptools ];
@@ -37,6 +37,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "thinqconnect" ];
 
   meta = {
+    changelog = "https://github.com/thinq-connect/pythinqconnect/blob/${src.tag}/RELEASE_NOTES.md";
     description = "Module to interacting with the LG ThinQ Connect Open API";
     homepage = "https://github.com/thinq-connect/pythinqconnect";
     license = lib.licenses.asl20;

From 4a754ccf50bbd09b70e2ae46e0439a09c6230b8b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Mar 2025 18:26:29 +0100
Subject: [PATCH 128/156] python312Packages.evohome-async: 0.4.21 -> 1.0.2

Changelog: https://github.com/zxdavb/evohome-async/releases/tag/1.0.2
---
 .../python-modules/evohome-async/default.nix  | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix
index 5abef0b5a32c..b60be7391dca 100644
--- a/pkgs/development/python-modules/evohome-async/default.nix
+++ b/pkgs/development/python-modules/evohome-async/default.nix
@@ -1,45 +1,69 @@
 {
   lib,
+  aiofiles,
   aiohttp,
+  aioresponses,
+  aiozoneinfo,
+  asyncclick,
   buildPythonPackage,
-  click,
+  debugpy,
   fetchFromGitHub,
   hatchling,
+  pytest-asyncio,
+  pytest-freezer,
+  pytestCheckHook,
   pythonOlder,
+  pyyaml,
+  syrupy,
   voluptuous,
 }:
 
 buildPythonPackage rec {
   pname = "evohome-async";
-  version = "0.4.21";
+  version = "1.0.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "zxdavb";
     repo = "evohome-async";
     tag = version;
-    hash = "sha256-+tBqyg7E9wRC6oHq6Fv2vzIGtrHqZp8w/3x/xbacqWI=";
+    hash = "sha256-CpN0QAlUqCDy6hNkuNvbjQUee40BA0UqAleR+Omm9bA=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
-    click
+    aiozoneinfo
     voluptuous
   ];
 
-  # Project has no tests
-  doCheck = false;
+  optional-dependencies = {
+    cli = [
+      aiofiles
+      asyncclick
+      debugpy
+    ];
+  };
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-freezer
+    pytestCheckHook
+    pyyaml
+    syrupy
+  ] ++ optional-dependencies.cli;
 
   pythonImportsCheck = [ "evohomeasync2" ];
 
   meta = with lib; {
     description = "Python client for connecting to Honeywell's TCC RESTful API";
     homepage = "https://github.com/zxdavb/evohome-async";
-    license = with licenses; [ asl20 ];
+    changelog = "https://github.com/zxdavb/evohome-async/releases/tag/${version}";
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "evo-client";
   };

From 84cbf1bcf478b7b43e9132eff5c6793de83856ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Mar 2025 11:55:25 -0800
Subject: [PATCH 129/156] python313Packages.pybalboa: 1.0.2 -> 1.1.3

---
 .../python-modules/pybalboa/default.nix       | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pybalboa/default.nix b/pkgs/development/python-modules/pybalboa/default.nix
index ce28b27dc7c5..e00186809690 100644
--- a/pkgs/development/python-modules/pybalboa/default.nix
+++ b/pkgs/development/python-modules/pybalboa/default.nix
@@ -2,33 +2,39 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   poetry-core,
+  poetry-dynamic-versioning,
+  pytest-asyncio,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pybalboa";
-  version = "1.0.2";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.8";
+  version = "1.1.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "garbled1";
-    repo = pname;
-    tag = version;
-    hash = "sha256-rSY6kU7F9ybpPXcmTM2WBazjb9tI2+8dG56pjrRXcKg=";
+    repo = "pybalboa";
+    # missing tag: https://github.com/garbled1/pybalboa/issues/100
+    rev = "6aa7e3c401ab03b93c083acdf430afb708e20e9b";
+    hash = "sha256-xOMbMmTTDDbd0WL0LFJ6lztsQMdI/r9MLhV9DmB6m3I=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
 
-  # Project has no tests
-  doCheck = false;
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "pybalboa" ];
 
   meta = with lib; {
-    description = " Python module to interface with a Balboa Spa";
+    description = "Module to communicate with a Balboa spa wifi adapter";
     homepage = "https://github.com/garbled1/pybalboa";
     changelog = "https://github.com/garbled1/pybalboa/releases/tag/${version}";
     license = licenses.asl20;

From b983ba6b1970d3cfa91690ccacbfd47b6c54bd16 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 5 Mar 2025 23:00:14 +0100
Subject: [PATCH 130/156] python313Packages.pyfronius: 0.7.5 -> 0.7.6

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

diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix
index 01d22fb7be14..bd19730b8078 100644
--- a/pkgs/development/python-modules/pyfronius/default.nix
+++ b/pkgs/development/python-modules/pyfronius/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyfronius";
-  version = "0.7.5";
+  version = "0.7.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "nielstron";
     repo = "pyfronius";
     tag = version;
-    hash = "sha256-dwqFT6UuXYTTaJxDTe5sH8FJxANw6pJakOadHplBFog=";
+    hash = "sha256-zyRcMueKZbk2QWhF3d500NUpvljikO8fsDnePy6Tq90=";
   };
 
   build-system = [ setuptools ];

From bcf137c149c497e59db8751c65319e860a831a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 11:52:15 -0800
Subject: [PATCH 131/156] home-assistant.python.pkgs.home-assistant-frontend:
 20250221.0 -> 20250305.0

Changelog: https://github.com/home-assistant/frontend/releases/tag/20250226.0
           https://github.com/home-assistant/frontend/releases/tag/20250227.0
           https://github.com/home-assistant/frontend/releases/tag/20250228.0
           https://github.com/home-assistant/frontend/releases/tag/20250305.0
---
 pkgs/servers/home-assistant/frontend.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index cf10e2a7c499..8ff4f51f2a4a 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,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 = "20250221.0";
+  version = "20250305.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-SgNtsXtg/i9AO+xu5O0loDbAifO4rn1GRFE1LmeJLfU=";
+    hash = "sha256-tzyJp1aKOXnmANR7p6C3rtC90VkGntURiaRgIjL8dDM=";
   };
 
   # there is nothing to strip in this package

From ea1a70df8124f4239c5aec6d94eabc0d27824876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 11:51:18 -0800
Subject: [PATCH 132/156] home-assistant.python.pkgs.home-assistant-intents:
 2025.2.5 -> 2025.3.5

Diff: https://github.com/home-assistant/intents-package/compare/refs/tags/2025.2.5...2025.3.5

Changelog: https://github.com/home-assistant/intents/releases/tag/2025.2.26
           https://github.com/home-assistant/intents/releases/tag/2025.3.5
---
 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 61e8d722e969..88d705f8b9a6 100644
--- a/pkgs/servers/home-assistant/intents.nix
+++ b/pkgs/servers/home-assistant/intents.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-intents";
-  version = "2025.2.5";
+  version = "2025.3.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     repo = "intents-package";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    hash = "sha256-x6B7UF6l9vMFscD8aPZ05N0HXo5d8XSONrrr6u+Ol3g=";
+    hash = "sha256-4FYmj6EqcNxPzXJVM0svyJIoeMSBnINNfvOda4B9Jic=";
   };
 
   build-system = [

From 04598d1b3f2608ad54e2bd7cc0ab89913e445f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Mar 2025 10:13:04 -0800
Subject: [PATCH 133/156] home-assistant: 2025.2.5 -> 2025.3.0

https://www.home-assistant.io/blog/2025/03/05/release-20253/
---
 .../home-assistant/component-packages.nix     | 119 ++++++++++--------
 pkgs/servers/home-assistant/default.nix       |  53 ++++----
 2 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 5e3b41d089cc..0203c86671f9 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 = "2025.2.5";
+  version = "2025.3.0";
   components = {
     "3_day_blinds" =
       ps: with ps; [
@@ -280,6 +280,9 @@
     "api" =
       ps: with ps; [
       ];
+    "apollo_automation" =
+      ps: with ps; [
+      ];
     "appalachianpower" =
       ps: with ps; [
       ];
@@ -493,6 +496,10 @@
       ps: with ps; [
         azure-servicebus
       ];
+    "azure_storage" =
+      ps: with ps; [
+        azure-storage-blob
+      ];
     "backup" =
       ps: with ps; [
         aiohasupervisor
@@ -770,6 +777,9 @@
       ps: with ps; [
         buienradar
       ];
+    "burbank_water_and_power" =
+      ps: with ps; [
+      ];
     "button" =
       ps: with ps; [
       ];
@@ -1286,13 +1296,10 @@
       ]; # missing inputs: dweepy
     "dynalite" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         dynalite-devices
         dynalite-panel
         home-assistant-frontend
         pillow
-        securetar
       ];
     "eafm" =
       ps: with ps; [
@@ -1780,8 +1787,9 @@
       ];
     "forked_daapd" =
       ps: with ps; [
+        pylibrespot-java
         spotifyaio
-      ]; # missing inputs: pyforked-daapd pylibrespot-java
+      ]; # missing inputs: pyforked-daapd
     "fortios" =
       ps: with ps; [
         fortiosapi
@@ -1834,11 +1842,8 @@
       ];
     "frontend" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         home-assistant-frontend
         pillow
-        securetar
       ];
     "frontier_silicon" =
       ps: with ps; [
@@ -2020,7 +2025,7 @@
       ];
     "google_generative_ai_conversation" =
       ps: with ps; [
-        google-generativeai
+        google-genai
         ha-ffmpeg
         hassil
         home-assistant-intents
@@ -2179,6 +2184,9 @@
       ps: with ps; [
         heatmiserv3
       ];
+    "heicko" =
+      ps: with ps; [
+      ];
     "heiwa" =
       ps: with ps; [
       ];
@@ -2241,7 +2249,7 @@
       ];
     "home_connect" =
       ps: with ps; [
-        homeconnect
+        aiohomeconnect
       ];
     "home_plus_control" =
       ps: with ps; [
@@ -2623,15 +2631,12 @@
       ];
     "insteon" =
       ps: with ps; [
-        aiohasupervisor
         aiousbwatcher
-        cronsim
         home-assistant-frontend
         insteon-frontend-home-assistant
         pillow
         pyinsteon
         pyserial
-        securetar
       ];
     "integration" =
       ps: with ps; [
@@ -2650,6 +2655,10 @@
       ps: with ps; [
         pyintesishome
       ];
+    "iometer" =
+      ps: with ps; [
+        iometer
+      ];
     "ios" =
       ps: with ps; [
         ifaddr
@@ -2887,12 +2896,9 @@
       ];
     "knx" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         home-assistant-frontend
         knx-frontend
         pillow
-        securetar
         xknx
         xknxproject
       ];
@@ -2987,13 +2993,10 @@
       ];
     "lcn" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         home-assistant-frontend
         lcn-frontend
         pillow
         pypck
-        securetar
       ];
     "ld2410_ble" =
       ps: with ps; [
@@ -3125,6 +3128,9 @@
       ps: with ps; [
         limitlessled
       ];
+    "linak" =
+      ps: with ps; [
+      ];
     "linear_garage_door" =
       ps: with ps; [
         linear-garage-door
@@ -3144,6 +3150,9 @@
       ps: with ps; [
         batinfo
       ];
+    "linx" =
+      ps: with ps; [
+      ];
     "lirc" =
       ps: with ps; [
       ]; # missing inputs: python-lirc
@@ -3185,13 +3194,10 @@
       ];
     "logbook" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         fnv-hash-fast
         home-assistant-frontend
         pillow
         psutil-home-assistant
-        securetar
         sqlalchemy
       ];
     "logentries" =
@@ -3228,10 +3234,7 @@
       ];
     "lovelace" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         pillow
-        securetar
       ];
     "luci" =
       ps: with ps; [
@@ -3686,11 +3689,8 @@
       ];
     "my" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         home-assistant-frontend
         pillow
-        securetar
       ];
     "myq" =
       ps: with ps; [
@@ -3968,10 +3968,7 @@
       ];
     "onboarding" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         pillow
-        securetar
       ];
     "oncue" =
       ps: with ps; [
@@ -4120,14 +4117,12 @@
       ps: with ps; [
         aiohasupervisor
         aiousbwatcher
-        cronsim
         ifaddr
         pillow
         psutil-home-assistant
         pyroute2
         pyserial
         python-otbr-api
-        securetar
         universal-silabs-flasher
         zeroconf
         zha
@@ -4203,11 +4198,8 @@
       ];
     "panel_custom" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
         home-assistant-frontend
         pillow
-        securetar
       ];
     "pcs_lighting" =
       ps: with ps; [
@@ -4248,6 +4240,12 @@
     "pge" =
       ps: with ps; [
       ];
+    "pglab" =
+      ps: with ps; [
+        aiohasupervisor
+        paho-mqtt
+        pypglab
+      ];
     "philips_js" =
       ps: with ps; [
         ha-philipsjs
@@ -4258,7 +4256,7 @@
       ];
     "picnic" =
       ps: with ps; [
-        python-picnic-api
+        python-picnic-api2
       ];
     "picotts" =
       ps: with ps; [
@@ -5023,6 +5021,11 @@
         sensorpush-ble
         zeroconf
       ];
+    "sensorpush_cloud" =
+      ps: with ps; [
+        sensorpush-api
+        sensorpush-ha
+      ];
     "sensoterra" =
       ps: with ps; [
         sensoterra
@@ -5188,25 +5191,15 @@
       ps: with ps; [
         smart-meter-texas
       ];
+    "smart_rollos" =
+      ps: with ps; [
+      ];
     "smarther" =
       ps: with ps; [
       ];
     "smartthings" =
       ps: with ps; [
-        aiohasupervisor
-        cronsim
-        ha-ffmpeg
-        hass-nabucasa
-        hassil
-        home-assistant-intents
-        mutagen
-        pymicro-vad
-        pysmartapp
         pysmartthings
-        pyspeex-noise
-        python-matter-server
-        pyturbojpeg
-        securetar
       ];
     "smarttub" =
       ps: with ps; [
@@ -5217,7 +5210,7 @@
       ]; # missing inputs: pysmarty2
     "smhi" =
       ps: with ps; [
-        smhi-pkg
+        pysmhi
       ];
     "smlight" =
       ps: with ps; [
@@ -5246,6 +5239,10 @@
       ps: with ps; [
         pysnmp
       ];
+    "snoo" =
+      ps: with ps; [
+        python-snoo
+      ];
     "snooz" =
       ps: with ps; [
         aioesphomeapi
@@ -5351,6 +5348,8 @@
       ];
     "sql" =
       ps: with ps; [
+        fnv-hash-fast
+        psutil-home-assistant
         sqlalchemy
         sqlparse
       ];
@@ -5839,7 +5838,8 @@
       ];
     "touchline" =
       ps: with ps; [
-      ]; # missing inputs: pytouchline
+        pytouchline-extended
+      ];
     "touchline_sl" =
       ps: with ps; [
         pytouchlinesl
@@ -5964,6 +5964,9 @@
     "ubiwizz" =
       ps: with ps; [
       ];
+    "ublockout" =
+      ps: with ps; [
+      ];
     "ubus" =
       ps: with ps; [
         openwrt-ubus-rpc
@@ -6221,6 +6224,10 @@
       ps: with ps; [
         apple-weatherkit
       ];
+    "webdav" =
+      ps: with ps; [
+        aiowebdav2
+      ];
     "webhook" =
       ps: with ps; [
       ];
@@ -6520,10 +6527,8 @@
       ps: with ps; [
         aiohasupervisor
         aiousbwatcher
-        cronsim
         pillow
         pyserial
-        securetar
         universal-silabs-flasher
         zha
       ];
@@ -6634,6 +6639,7 @@
     "azure_data_explorer"
     "azure_devops"
     "azure_event_hub"
+    "azure_storage"
     "backup"
     "baf"
     "balboa"
@@ -6933,6 +6939,7 @@
     "intellifire"
     "intent"
     "intent_script"
+    "iometer"
     "ios"
     "iotty"
     "ipma"
@@ -7151,6 +7158,7 @@
     "permobil"
     "persistent_notification"
     "person"
+    "pglab"
     "philips_js"
     "pi_hole"
     "picnic"
@@ -7250,6 +7258,7 @@
     "sensor"
     "sensorpro"
     "sensorpush"
+    "sensorpush_cloud"
     "sensoterra"
     "sentry"
     "senz"
@@ -7285,6 +7294,7 @@
     "snapcast"
     "snips"
     "snmp"
+    "snoo"
     "snooz"
     "solaredge"
     "solarlog"
@@ -7440,6 +7450,7 @@
     "weatherflow"
     "weatherflow_cloud"
     "weatherkit"
+    "webdav"
     "webhook"
     "webmin"
     "webostv"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index a67e2beaa087..38604c3516be 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -45,17 +45,6 @@ let
         ];
       });
 
-      aiomqtt = super.aiomqtt.overridePythonAttrs (rec {
-        version = "2.0.1";
-        src = fetchFromGitHub {
-          owner = "sbtinstruments";
-          repo = "aiomqtt";
-          tag = "v${version}";
-          hash = "sha256-bV1elEO1518LVLwNDN5pzjxRgcG34K1XUsK7fTw8h+8=";
-        };
-        meta.broken = false;
-      });
-
       aioskybell = super.aioskybell.overridePythonAttrs (oldAttrs: rec {
         version = "22.7.0";
         src = fetchFromGitHub {
@@ -129,13 +118,13 @@ let
         build-system = with self; [ poetry-core ];
       });
 
-      govee-local-api = super.govee-local-api.overridePythonAttrs (oldAttrs: rec {
-        version = "1.5.3";
+      google-genai = super.google-genai.overridePythonAttrs (old: rec {
+        version = "1.1.0";
         src = fetchFromGitHub {
-          owner = "Galorhallen";
-          repo = "govee-local-api";
+          owner = "googleapis";
+          repo = "python-genai";
           tag = "v${version}";
-          hash = "sha256-qBT0Xub+eL7rfF+lQWlheBJSahEKWjREGJQD6sHjTPk=";
+          hash = "sha256-CszKr2dvo0dLMAD/FZHSosCczeAFDD0xxKysGNv4RxM=";
         };
       });
 
@@ -168,16 +157,6 @@ let
         ];
       });
 
-      letpot = super.letpot.overridePythonAttrs (rec {
-        version = "0.3.0";
-        src = fetchFromGitHub {
-          owner = "jpelgrom";
-          repo = "python-letpot";
-          tag = "v${version}";
-          hash = "sha256-OFLQ0DV7roqUlm6zJWAzMRpcmAi/oco8lEHbmfqNaVs=";
-        };
-      });
-
       openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec {
         version = "2.2";
         src = fetchFromGitHub {
@@ -187,8 +166,6 @@ let
         };
       });
 
-      paho-mqtt = super.paho-mqtt_1;
-
       pymelcloud = super.pymelcloud.overridePythonAttrs (oldAttrs: {
         version = "2.5.9";
         src = fetchFromGitHub {
@@ -284,6 +261,16 @@ let
         };
       });
 
+      pyopenweathermap = super.pyopenweathermap.overridePythonAttrs (old: rec {
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "freekode";
+          repo = "pyopenweathermap";
+          tag = "v${version}";
+          hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w=";
+        };
+      });
+
       pyrail = super.pyrail.overridePythonAttrs (rec {
         version = "0.0.3";
         src = fetchPypi {
@@ -395,7 +382,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.2.5";
+  hassVersion = "2025.3.0";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -415,14 +402,14 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "home-assistant";
     repo = "core";
-    rev = "refs/tags/${version}";
-    hash = "sha256-8adHpOiuWddgqQjInc92FjEwVyg2Rvgx7wNOj3+Kxsk=";
+    tag = version;
+    hash = "sha256-zMsJ/YAwMIdLDF256rxj63QsZD26p71SgYpf4zwzD1A=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-JD2xus356qNzT5jqZOHr5gn4WGeC189rM83D81xVtWo=";
+    hash = "sha256-jsRIStPIbWXj24qjh9ZxH0QPN+zUOZeP6efRGYovUms=";
   };
 
   build-system = with python.pkgs; [
@@ -442,6 +429,7 @@ python.pkgs.buildPythonApplication rec {
     "jinja2"
     "orjson"
     "pillow"
+    "propcache"
     "pyjwt"
     "pyopenssl"
     "pyyaml"
@@ -642,6 +630,7 @@ python.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     homepage = "https://home-assistant.io/";
+    changelog = "https://github.com/home-assistant/core/releases/tag/${src.tag}";
     description = "Open source home automation that puts local control and privacy first";
     license = licenses.asl20;
     maintainers = teams.home-assistant.members;

From 9d43dae293e8e3ca998af2043d29679d6941b301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 15:28:56 -0800
Subject: [PATCH 134/156] python313Packages.paho-mqtt_1: drop

---
 .../python-modules/paho-mqtt/1.nix            | 42 -------------------
 pkgs/top-level/python-aliases.nix             |  2 +
 pkgs/top-level/python-packages.nix            |  4 +-
 3 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/development/python-modules/paho-mqtt/1.nix

diff --git a/pkgs/development/python-modules/paho-mqtt/1.nix b/pkgs/development/python-modules/paho-mqtt/1.nix
deleted file mode 100644
index 437f7899fad0..000000000000
--- a/pkgs/development/python-modules/paho-mqtt/1.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  isPy3k,
-  pytestCheckHook,
-  mock,
-  six,
-}:
-
-buildPythonPackage rec {
-  pname = "paho-mqtt";
-  version = "1.6.1";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "eclipse";
-    repo = "paho.mqtt.python";
-    rev = "v${version}";
-    hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg=";
-  };
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    six
-  ] ++ lib.optionals (!isPy3k) [ mock ];
-
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  pythonImportsCheck = [ "paho.mqtt" ];
-
-  meta = with lib; {
-    description = "MQTT version 3.1.1 client class";
-    homepage = "https://eclipse.org/paho";
-    license = licenses.epl10;
-    maintainers = with maintainers; [
-      mog
-      dotlambda
-    ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 23ae502df25c..1ddc78232539 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -433,6 +433,8 @@ mapAliases ({
   opentracing = throw "The opentracing Python module was removed due to being unmaintained upstream. Use OpenTelemetry instead."; # Added 2024-12-09
   ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28
   pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
+  paho-mqtt_1 = throw "paho-mqtt_1 was removed because no package depends on it anymore"; # added 2025-03-05
+  paho-mqtt_2 = paho-mqtt; # added 2025-03-05
   pam = python-pam; # added 2020-09-07.
   PasteDeploy = pastedeploy; # added 2021-10-07
   pathlib = throw "pathlib was removed as it has been integrated in python standard library in version 3.4"; # added 2024-05-13
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2245891d3c6..347b47bd98e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10164,9 +10164,7 @@ self: super: with self; {
 
   paginate = callPackage ../development/python-modules/paginate { };
 
-  paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { };
-  paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { };
-  paho-mqtt = paho-mqtt_2;
+  paho-mqtt = callPackage ../development/python-modules/paho-mqtt/default.nix { };
 
   paintcompiler = callPackage ../development/python-modules/paintcompiler { };
 

From b00d8d5812a9634ee4927156b868a93f2d6d572c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Mar 2025 09:57:56 -0800
Subject: [PATCH 135/156] python313Packages.python-picnic-api: drop

---
 .../python-picnic-api/default.nix             | 32 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 pkgs/development/python-modules/python-picnic-api/default.nix

diff --git a/pkgs/development/python-modules/python-picnic-api/default.nix b/pkgs/development/python-modules/python-picnic-api/default.nix
deleted file mode 100644
index 5267f99587c0..000000000000
--- a/pkgs/development/python-modules/python-picnic-api/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  requests,
-}:
-
-buildPythonPackage rec {
-  pname = "python-picnic-api";
-  version = "1.1.0";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1axqw4bs3wa9mdac35h7r25v3i5g7v55cvyy48c4sg31dxnr4wcp";
-  };
-
-  propagatedBuildInputs = [ requests ];
-
-  # Project doesn't ship tests
-  # https://github.com/MikeBrink/python-picnic-api/issues/13
-  doCheck = false;
-
-  pythonImportsCheck = [ "python_picnic_api" ];
-
-  meta = with lib; {
-    description = "Python wrapper for the Picnic API";
-    homepage = "https://github.com/MikeBrink/python-picnic-api";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 1ddc78232539..5c9dc87970b7 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -519,6 +519,7 @@ mapAliases ({
   pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT.";
   python-ethtool = ethtool; # added 2024-07-23
   python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07
+  python-picnic-api = throw "python-picnic-api was removed because Home Assistant switched to python-picnic-api2"; # added 2025-03-05
   pytrends = throw "pytrends has been removed, as it no longer works and is abandoned upstream"; # added 2025-02-02
   pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09
   pyqt5_sip = pyqt5-sip; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 347b47bd98e3..1033c0c9b275 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13616,8 +13616,6 @@ self: super: with self; {
 
   python-periphery = callPackage ../development/python-modules/python-periphery { };
 
-  python-picnic-api = callPackage ../development/python-modules/python-picnic-api { };
-
   python-picnic-api2 = callPackage ../development/python-modules/python-picnic-api2 { };
 
   python-pidfile = callPackage ../development/python-modules/python-pidfile { };

From d8409e84dade703d7bd20b9923a18591113118cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Mar 2025 22:29:24 +0000
Subject: [PATCH 136/156] rosa: 1.2.50 -> 1.2.51

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

diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix
index e89dbc8ba434..5ccc41a3c45a 100644
--- a/pkgs/by-name/ro/rosa/package.nix
+++ b/pkgs/by-name/ro/rosa/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "rosa";
-  version = "1.2.50";
+  version = "1.2.51";
 
   src = fetchFromGitHub {
     owner = "openshift";
     repo = "rosa";
     rev = "v${version}";
-    hash = "sha256-+jJbfU1DAgFNrYVA2Q1khUQKA64WOg/3H4zmX8KCg7w=";
+    hash = "sha256-tZwIySYY/0QBi2Vv1omV3ZcK3DD5SRUNaQKClX2QeUw=";
   };
   vendorHash = null;
 

From c84d678e7dbb42dcb04bd834c88a7b69914c37b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 5 Mar 2025 23:49:19 +0100
Subject: [PATCH 137/156] imagemagick: format

---
 .../graphics/ImageMagick/default.nix          | 223 +++++++++++-------
 1 file changed, 139 insertions(+), 84 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 75c8ca574bff..9ad25b457819 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,51 +1,85 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkg-config
-, libtool
-, bzip2Support ? true, bzip2
-, zlibSupport ? true, zlib
-, libX11Support ? !stdenv.hostPlatform.isMinGW, libX11
-, libXtSupport ? !stdenv.hostPlatform.isMinGW, libXt
-, fontconfigSupport ? true, fontconfig
-, freetypeSupport ? true, freetype
-, ghostscriptSupport ? false, ghostscript
-, libjpegSupport ? true, libjpeg
-, djvulibreSupport ? true, djvulibre
-, lcms2Support ? true, lcms2
-, openexrSupport ? !stdenv.hostPlatform.isMinGW, openexr
-, libjxlSupport ? true, libjxl
-, libpngSupport ? true, libpng
-, liblqr1Support ? true, liblqr1
-, librawSupport ? true, libraw
-, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg, pango
-, libtiffSupport ? true, libtiff
-, libxml2Support ? true, libxml2
-, openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg
-, libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp
-, libheifSupport ? true, libheif
-, fftwSupport ? true, fftw
-, potrace
-, coreutils
-, curl
-, ApplicationServices
-, Foundation
-, testers
-, nixos-icons
-, perlPackages
-, python3
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  libtool,
+  bzip2Support ? true,
+  bzip2,
+  zlibSupport ? true,
+  zlib,
+  libX11Support ? !stdenv.hostPlatform.isMinGW,
+  libX11,
+  libXtSupport ? !stdenv.hostPlatform.isMinGW,
+  libXt,
+  fontconfigSupport ? true,
+  fontconfig,
+  freetypeSupport ? true,
+  freetype,
+  ghostscriptSupport ? false,
+  ghostscript,
+  libjpegSupport ? true,
+  libjpeg,
+  djvulibreSupport ? true,
+  djvulibre,
+  lcms2Support ? true,
+  lcms2,
+  openexrSupport ? !stdenv.hostPlatform.isMinGW,
+  openexr,
+  libjxlSupport ? true,
+  libjxl,
+  libpngSupport ? true,
+  libpng,
+  liblqr1Support ? true,
+  liblqr1,
+  librawSupport ? true,
+  libraw,
+  librsvgSupport ? !stdenv.hostPlatform.isMinGW,
+  librsvg,
+  pango,
+  libtiffSupport ? true,
+  libtiff,
+  libxml2Support ? true,
+  libxml2,
+  openjpegSupport ? !stdenv.hostPlatform.isMinGW,
+  openjpeg,
+  libwebpSupport ? !stdenv.hostPlatform.isMinGW,
+  libwebp,
+  libheifSupport ? true,
+  libheif,
+  fftwSupport ? true,
+  fftw,
+  potrace,
+  coreutils,
+  curl,
+  ApplicationServices,
+  Foundation,
+  testers,
+  nixos-icons,
+  perlPackages,
+  python3,
 }:
 
 assert libXtSupport -> libX11Support;
 
 let
   arch =
-    if stdenv.hostPlatform.system == "i686-linux" then "i686"
-    else if stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" then "x86-64"
-    else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l"
-    else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64"
-    else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le"
-    else null;
+    if stdenv.hostPlatform.system == "i686-linux" then
+      "i686"
+    else if
+      stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin"
+    then
+      "x86-64"
+    else if stdenv.hostPlatform.system == "armv7l-linux" then
+      "armv7l"
+    else if
+      stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin"
+    then
+      "aarch64"
+    else if stdenv.hostPlatform.system == "powerpc64le-linux" then
+      "ppc64le"
+    else
+      null;
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -59,33 +93,44 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-DsJRTLMyjU2mMEGq/2qEJvjdYa698TEZZqkxuWtd/A4=";
   };
 
-  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ]; # bin/ isn't really big
   outputMan = "out"; # it's tiny
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    # specify delegates explicitly otherwise `convert` will invoke the build
-    # coreutils for filetypes it doesn't natively support.
-    "MVDelegate=${lib.getExe' coreutils "mv"}"
-    "RMDelegate=${lib.getExe' coreutils "rm"}"
-    "--with-frozenpaths"
-    (lib.withFeatureAs (arch != null) "gcc-arch" arch)
-    (lib.withFeature librsvgSupport "rsvg")
-    (lib.withFeature librsvgSupport "pango")
-    (lib.withFeature liblqr1Support "lqr")
-    (lib.withFeature libjxlSupport "jxl")
-    (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
-    (lib.withFeature ghostscriptSupport "gslib")
-    (lib.withFeature fftwSupport "fftw")
-  ] ++ lib.optionals stdenv.hostPlatform.isMinGW [
-    # due to libxml2 being without DLLs ATM
-    "--enable-static" "--disable-shared"
+  configureFlags =
+    [
+      # specify delegates explicitly otherwise `convert` will invoke the build
+      # coreutils for filetypes it doesn't natively support.
+      "MVDelegate=${lib.getExe' coreutils "mv"}"
+      "RMDelegate=${lib.getExe' coreutils "rm"}"
+      "--with-frozenpaths"
+      (lib.withFeatureAs (arch != null) "gcc-arch" arch)
+      (lib.withFeature librsvgSupport "rsvg")
+      (lib.withFeature librsvgSupport "pango")
+      (lib.withFeature liblqr1Support "lqr")
+      (lib.withFeature libjxlSupport "jxl")
+      (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
+      (lib.withFeature ghostscriptSupport "gslib")
+      (lib.withFeature fftwSupport "fftw")
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isMinGW [
+      # due to libxml2 being without DLLs ATM
+      "--enable-static"
+      "--disable-shared"
+    ];
+
+  nativeBuildInputs = [
+    pkg-config
+    libtool
   ];
 
-  nativeBuildInputs = [ pkg-config libtool ];
-
-  buildInputs = [ potrace ]
+  buildInputs =
+    [ potrace ]
     ++ lib.optional zlibSupport zlib
     ++ lib.optional fontconfigSupport fontconfig
     ++ lib.optional ghostscriptSupport ghostscript
@@ -108,7 +153,8 @@ stdenv.mkDerivation (finalAttrs: {
       Foundation
     ];
 
-  propagatedBuildInputs = [ curl ]
+  propagatedBuildInputs =
+    [ curl ]
     ++ lib.optional bzip2Support bzip2
     ++ lib.optional freetypeSupport freetype
     ++ lib.optional libjpegSupport libjpeg
@@ -118,24 +164,26 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional libwebpSupport libwebp
     ++ lib.optional fftwSupport fftw;
 
-  postInstall = ''
-    (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
-    # Q16HDRI = 16 bit quantum depth with HDRI support, and is the default ImageMagick configuration
-    # If the default is changed, or the derivation is modified to use a different configuration
-    # this will need to be changed below.
-    moveToOutput "bin/*-config" "$dev"
-    moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
-    configDestination=($out/share/ImageMagick-*)
-    grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml
-    for file in "$dev"/bin/*-config; do
-      substituteInPlace "$file" --replace pkg-config \
-        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'"
-    done
-  '' + lib.optionalString ghostscriptSupport ''
-    for la in $out/lib/*.la; do
-      sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
-    done
-  '';
+  postInstall =
+    ''
+      (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
+      # Q16HDRI = 16 bit quantum depth with HDRI support, and is the default ImageMagick configuration
+      # If the default is changed, or the derivation is modified to use a different configuration
+      # this will need to be changed below.
+      moveToOutput "bin/*-config" "$dev"
+      moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
+      configDestination=($out/share/ImageMagick-*)
+      grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml
+      for file in "$dev"/bin/*-config; do
+        substituteInPlace "$file" --replace pkg-config \
+          "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'"
+      done
+    ''
+    + lib.optionalString ghostscriptSupport ''
+      for la in $out/lib/*.la; do
+        sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
+      done
+    '';
 
   passthru.tests = {
     version = testers.testVersion { package = finalAttrs.finalPackage; };
@@ -152,9 +200,16 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.imagemagick.org/";
     changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md";
     description = "Software suite to create, edit, compose, or convert bitmap images";
-    pkgConfigModules = [ "ImageMagick" "MagickWand" ];
+    pkgConfigModules = [
+      "ImageMagick"
+      "MagickWand"
+    ];
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ dotlambda rhendric bloxx12 ];
+    maintainers = with maintainers; [
+      dotlambda
+      rhendric
+      bloxx12
+    ];
     license = licenses.asl20;
     mainProgram = "magick";
   };

From f84d86e9141b08385688d36fffd98febf1e780f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 5 Mar 2025 23:49:35 +0100
Subject: [PATCH 138/156] ffmpeg: format

---
 pkgs/development/libraries/ffmpeg/generic.nix | 1819 +++++++++--------
 1 file changed, 952 insertions(+), 867 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 94e86bfa09ad..fa60d9c6dc5b 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,934 +1,1019 @@
-{ lib, config, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, texinfo6, yasm
+{
+  lib,
+  config,
+  stdenv,
+  buildPackages,
+  removeReferencesTo,
+  addDriverRunpath,
+  pkg-config,
+  perl,
+  texinfo,
+  texinfo6,
+  yasm,
 
   # You can fetch any upstream version using this derivation by specifying version and hash
   # NOTICE: Always use this argument to override the version. Do not use overrideAttrs.
-, version # ffmpeg ABI version. Also declare this if you're overriding the source.
-, hash ? "" # hash of the upstream source for the given ABI version
-, source ? fetchgit {
+  version, # ffmpeg ABI version. Also declare this if you're overriding the source.
+  hash ? "", # hash of the upstream source for the given ABI version
+  source ? fetchgit {
     url = "https://git.ffmpeg.org/ffmpeg.git";
     rev = "n${version}";
     inherit hash;
-  }
+  },
 
-, ffmpegVariant ? "small" # Decides which dependencies are enabled by default
+  ffmpegVariant ? "small", # Decides which dependencies are enabled by default
 
   # Build with headless deps; excludes dependencies that are only necessary for
   # GUI applications. To be used for purposes that don't generally need such
   # components and i.e. only depend on libav
-, withHeadlessDeps ? ffmpegVariant == "headless" || withSmallDeps
+  withHeadlessDeps ? ffmpegVariant == "headless" || withSmallDeps,
 
   # Dependencies a user might customarily expect from a regular ffmpeg build.
   # /All/ packages that depend on ffmpeg and some of its feaures should depend
   # on the small variant. Small means the minimal set of features that satisfies
   # all dependants in Nixpkgs
-, withSmallDeps ? ffmpegVariant == "small" || withFullDeps
+  withSmallDeps ? ffmpegVariant == "small" || withFullDeps,
 
   # Everything enabled; only guarded behind platform exclusivity or brokeness.
   # If you need to depend on ffmpeg-full because ffmpeg is missing some feature
   # your package needs, you should enable that feature in regular ffmpeg
   # instead.
-, withFullDeps ? ffmpegVariant == "full"
+  withFullDeps ? ffmpegVariant == "full",
 
-, fetchgit
-, fetchpatch2
+  fetchgit,
+  fetchpatch2,
 
   # Feature flags
-, withAlsa ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Alsa in/output supporT
-, withAmf ? withHeadlessDeps && lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding
-, withAom ? withHeadlessDeps # AV1 reference encoder
-, withAribb24 ? withFullDeps # ARIB text and caption decoding
-, withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer
-, withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering
-, withAvisynth ? withFullDeps # AviSynth script files reading
-, withBluray ? withHeadlessDeps # BluRay reading
-, withBs2b ? withFullDeps # bs2b DSP library
-, withBzlib ? withHeadlessDeps
-, withCaca ? withFullDeps # Textual display (ASCII art)
-, withCdio ? withFullDeps && withGPL # Audio CD grabbing
-, withCelt ? withHeadlessDeps # CELT decoder
-, withChromaprint ? withFullDeps # Audio fingerprinting
-, withCodec2 ? withFullDeps # codec2 en/decoding
-, withCuda ? withFullDeps && withNvcodec
-, withCudaLLVM ? withHeadlessDeps
-, withCudaNVCC ? withFullDeps && withUnfree && config.cudaSupport
-, withCuvid ? withHeadlessDeps && withNvcodec
-, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness)
-, withDc1394 ? withFullDeps && !stdenv.hostPlatform.isDarwin # IIDC-1394 grabbing (ieee 1394)
-, withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support
-, withDvdnav ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing
-, withDvdread ? withFullDeps && withGPL && lib.versionAtLeast version "7" # needed for DVD demuxing
-, withFdkAac ? withFullDeps && (!withGPL || withUnfree) # Fraunhofer FDK AAC de/encoder
-, withNvcodec ? withHeadlessDeps && (with stdenv; !isDarwin && !isAarch32 && !hostPlatform.isRiscV && hostPlatform == buildPlatform) # dynamically linked Nvidia code
-, withFlite ? withFullDeps # Voice Synthesis
-, withFontconfig ? withHeadlessDeps # Needed for drawtext filter
-, withFreetype ? withHeadlessDeps # Needed for drawtext filter
-, withFrei0r ? withFullDeps && withGPL # frei0r video filtering
-, withFribidi ? withHeadlessDeps # Needed for drawtext filter
-, withGme ? withFullDeps # Game Music Emulator
-, withGnutls ? withHeadlessDeps
-, withGsm ? withFullDeps # GSM de/encoder
-, withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter
-, withIconv ? withHeadlessDeps
-, withIlbc ? withFullDeps # iLBC de/encoding
-, withJack ? withFullDeps && !stdenv.hostPlatform.isDarwin # Jack audio
-, withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding
-, withKvazaar ? withFullDeps # HEVC encoding
-, withLadspa ? withFullDeps # LADSPA audio filtering
-, withLc3 ? withFullDeps && lib.versionAtLeast version "7.1" # LC3 de/encoding
-, withLcevcdec ? false && lib.versionAtLeast version "7.1" # LCEVC decoding # FIXME currently makes ffmpeg crash in any operation on non-AVX CPUs
-, withLcms2 ? withFullDeps # ICC profile support via lcms2
-, withLzma ? withHeadlessDeps # xz-utils
-, withMetal ? false # Unfree and requires manual downloading of files
-, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
-, withModplug ? withFullDeps && !stdenv.hostPlatform.isDarwin # ModPlug support
-, withMp3lame ? withHeadlessDeps # LAME MP3 encoder
-, withMysofa ? withFullDeps # HRTF support via SOFAlizer
-, withNpp ? withFullDeps && withUnfree && config.cudaSupport # Nvidia Performance Primitives-based code
-, withNvdec ? withHeadlessDeps && withNvcodec
-, withNvenc ? withHeadlessDeps && withNvcodec
-, withOpenal ? withFullDeps # OpenAL 1.1 capture support
-, withOpencl ? withHeadlessDeps
-, withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder
-, withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder
-, withOpengl ? withFullDeps && !stdenv.hostPlatform.isDarwin # OpenGL rendering
-, withOpenh264 ? withFullDeps # H.264/AVC encoder
-, withOpenjpeg ? withHeadlessDeps # JPEG 2000 de/encoder
-, withOpenmpt ? withHeadlessDeps # Tracked music files decoder
-, withOpus ? withHeadlessDeps # Opus de/encoder
-, withPlacebo ? withFullDeps && !stdenv.hostPlatform.isDarwin # libplacebo video processing library
-, withPulse ? withSmallDeps && stdenv.hostPlatform.isLinux # Pulseaudio input support
-, withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation
-, withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding
-, withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety)
-, withRist ? withHeadlessDeps # Reliable Internet Stream Transport (RIST) protocol
-, withRtmp ? withFullDeps # RTMP[E] support
-, withRubberband ? withFullDeps && withGPL # Rubberband filter
-, withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3 # Samba protocol
-, withSdl2 ? withSmallDeps
-, withShaderc ? withFullDeps && !stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "5.0"
-, withShine ? withFullDeps # Fixed-point MP3 encoding
-, withSnappy ? withFullDeps # Snappy compression, needed for hap encoding
-, withSoxr ? withHeadlessDeps # Resampling via soxr
-, withSpeex ? withHeadlessDeps # Speex de/encoder
-, withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol
-, withSsh ? withHeadlessDeps # SFTP protocol
-, withSvg ? withFullDeps # SVG protocol
-, withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness)
-, withTensorflow ? false # Tensorflow dnn backend support (Increases closure size by ~390 MiB)
-, withTheora ? withHeadlessDeps # Theora encoder
-, withTwolame ? withFullDeps # MP2 encoding
-, withV4l2 ? withHeadlessDeps && stdenv.hostPlatform.isLinux  # Video 4 Linux support
-, withV4l2M2m ? withV4l2
-, withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration
-, withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration
-, withVidStab ? withHeadlessDeps && withGPL # Video stabilization
-, withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion)
-, withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder
-, withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists
-, withVpl ? false # Hardware acceleration via intel libvpl
-, withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding
-, withVulkan ? withHeadlessDeps && !stdenv.hostPlatform.isDarwin
-, withVvenc ? withFullDeps && lib.versionAtLeast version "7.1" # H.266/VVC encoding
-, withWebp ? withHeadlessDeps # WebP encoder
-, withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder
-, withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder
-, withXavs ? withFullDeps && withGPL # AVS encoder
-, withXcb ? withXcbShm || withXcbxfixes || withXcbShape # X11 grabbing using XCB
-, withXcbShape ? withFullDeps # X11 grabbing shape rendering
-, withXcbShm ? withFullDeps # X11 grabbing shm communication
-, withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering
-, withXevd ? withFullDeps && lib.versionAtLeast version "7.1" && !xevd.meta.broken # MPEG-5 EVC decoding
-, withXeve ? withFullDeps && lib.versionAtLeast version "7.1" && !xeve.meta.broken # MPEG-5 EVC encoding
-, withXlib ? withFullDeps # Xlib support
-, withXml2 ? withHeadlessDeps # libxml2 support, for IMF and DASH demuxers
-, withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists
-, withZimg ? withHeadlessDeps
-, withZlib ? withHeadlessDeps
-, withZmq ? withFullDeps # Message passing
-, withZvbi ? withHeadlessDeps # Teletext support
+  withAlsa ? withHeadlessDeps && stdenv.hostPlatform.isLinux, # Alsa in/output supporT
+  withAmf ? withHeadlessDeps && lib.meta.availableOn stdenv.hostPlatform amf, # AMD Media Framework video encoding
+  withAom ? withHeadlessDeps, # AV1 reference encoder
+  withAribb24 ? withFullDeps, # ARIB text and caption decoding
+  withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1", # ARIB STD-B24 Caption Decoder/Renderer
+  withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform, # (Advanced) SubStation Alpha subtitle rendering
+  withAvisynth ? withFullDeps, # AviSynth script files reading
+  withBluray ? withHeadlessDeps, # BluRay reading
+  withBs2b ? withFullDeps, # bs2b DSP library
+  withBzlib ? withHeadlessDeps,
+  withCaca ? withFullDeps, # Textual display (ASCII art)
+  withCdio ? withFullDeps && withGPL, # Audio CD grabbing
+  withCelt ? withHeadlessDeps, # CELT decoder
+  withChromaprint ? withFullDeps, # Audio fingerprinting
+  withCodec2 ? withFullDeps, # codec2 en/decoding
+  withCuda ? withFullDeps && withNvcodec,
+  withCudaLLVM ? withHeadlessDeps,
+  withCudaNVCC ? withFullDeps && withUnfree && config.cudaSupport,
+  withCuvid ? withHeadlessDeps && withNvcodec,
+  withDav1d ? withHeadlessDeps, # AV1 decoder (focused on speed and correctness)
+  withDc1394 ? withFullDeps && !stdenv.hostPlatform.isDarwin, # IIDC-1394 grabbing (ieee 1394)
+  withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD), # libdrm support
+  withDvdnav ? withFullDeps && withGPL && lib.versionAtLeast version "7", # needed for DVD demuxing
+  withDvdread ? withFullDeps && withGPL && lib.versionAtLeast version "7", # needed for DVD demuxing
+  withFdkAac ? withFullDeps && (!withGPL || withUnfree), # Fraunhofer FDK AAC de/encoder
+  withNvcodec ?
+    withHeadlessDeps
+    && (
+      with stdenv; !isDarwin && !isAarch32 && !hostPlatform.isRiscV && hostPlatform == buildPlatform
+    ), # dynamically linked Nvidia code
+  withFlite ? withFullDeps, # Voice Synthesis
+  withFontconfig ? withHeadlessDeps, # Needed for drawtext filter
+  withFreetype ? withHeadlessDeps, # Needed for drawtext filter
+  withFrei0r ? withFullDeps && withGPL, # frei0r video filtering
+  withFribidi ? withHeadlessDeps, # Needed for drawtext filter
+  withGme ? withFullDeps, # Game Music Emulator
+  withGnutls ? withHeadlessDeps,
+  withGsm ? withFullDeps, # GSM de/encoder
+  withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1", # Needed for drawtext filter
+  withIconv ? withHeadlessDeps,
+  withIlbc ? withFullDeps, # iLBC de/encoding
+  withJack ? withFullDeps && !stdenv.hostPlatform.isDarwin, # Jack audio
+  withJxl ? withFullDeps && lib.versionAtLeast version "5", # JPEG XL de/encoding
+  withKvazaar ? withFullDeps, # HEVC encoding
+  withLadspa ? withFullDeps, # LADSPA audio filtering
+  withLc3 ? withFullDeps && lib.versionAtLeast version "7.1", # LC3 de/encoding
+  withLcevcdec ? false && lib.versionAtLeast version "7.1", # LCEVC decoding # FIXME currently makes ffmpeg crash in any operation on non-AVX CPUs
+  withLcms2 ? withFullDeps, # ICC profile support via lcms2
+  withLzma ? withHeadlessDeps, # xz-utils
+  withMetal ? false, # Unfree and requires manual downloading of files
+  withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch), # Hardware acceleration via intel-media-sdk/libmfx
+  withModplug ? withFullDeps && !stdenv.hostPlatform.isDarwin, # ModPlug support
+  withMp3lame ? withHeadlessDeps, # LAME MP3 encoder
+  withMysofa ? withFullDeps, # HRTF support via SOFAlizer
+  withNpp ? withFullDeps && withUnfree && config.cudaSupport, # Nvidia Performance Primitives-based code
+  withNvdec ? withHeadlessDeps && withNvcodec,
+  withNvenc ? withHeadlessDeps && withNvcodec,
+  withOpenal ? withFullDeps, # OpenAL 1.1 capture support
+  withOpencl ? withHeadlessDeps,
+  withOpencoreAmrnb ? withFullDeps && withVersion3, # AMR-NB de/encoder
+  withOpencoreAmrwb ? withFullDeps && withVersion3, # AMR-WB decoder
+  withOpengl ? withFullDeps && !stdenv.hostPlatform.isDarwin, # OpenGL rendering
+  withOpenh264 ? withFullDeps, # H.264/AVC encoder
+  withOpenjpeg ? withHeadlessDeps, # JPEG 2000 de/encoder
+  withOpenmpt ? withHeadlessDeps, # Tracked music files decoder
+  withOpus ? withHeadlessDeps, # Opus de/encoder
+  withPlacebo ? withFullDeps && !stdenv.hostPlatform.isDarwin, # libplacebo video processing library
+  withPulse ? withSmallDeps && stdenv.hostPlatform.isLinux, # Pulseaudio input support
+  withQrencode ? withFullDeps && lib.versionAtLeast version "7", # QR encode generation
+  withQuirc ? withFullDeps && lib.versionAtLeast version "7", # QR decoding
+  withRav1e ? withFullDeps, # AV1 encoder (focused on speed and safety)
+  withRist ? withHeadlessDeps, # Reliable Internet Stream Transport (RIST) protocol
+  withRtmp ? withFullDeps, # RTMP[E] support
+  withRubberband ? withFullDeps && withGPL, # Rubberband filter
+  withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3, # Samba protocol
+  withSdl2 ? withSmallDeps,
+  withShaderc ? withFullDeps && !stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "5.0",
+  withShine ? withFullDeps, # Fixed-point MP3 encoding
+  withSnappy ? withFullDeps, # Snappy compression, needed for hap encoding
+  withSoxr ? withHeadlessDeps, # Resampling via soxr
+  withSpeex ? withHeadlessDeps, # Speex de/encoder
+  withSrt ? withHeadlessDeps, # Secure Reliable Transport (SRT) protocol
+  withSsh ? withHeadlessDeps, # SFTP protocol
+  withSvg ? withFullDeps, # SVG protocol
+  withSvtav1 ? withHeadlessDeps && !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isMinGW, # AV1 encoder/decoder (focused on speed and correctness)
+  withTensorflow ? false, # Tensorflow dnn backend support (Increases closure size by ~390 MiB)
+  withTheora ? withHeadlessDeps, # Theora encoder
+  withTwolame ? withFullDeps, # MP2 encoding
+  withV4l2 ? withHeadlessDeps && stdenv.hostPlatform.isLinux, # Video 4 Linux support
+  withV4l2M2m ? withV4l2,
+  withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD), # Vaapi hardware acceleration
+  withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW, # Vdpau hardware acceleration
+  withVidStab ? withHeadlessDeps && withGPL, # Video stabilization
+  withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5", # Netflix's VMAF (Video Multi-Method Assessment Fusion)
+  withVoAmrwbenc ? withFullDeps && withVersion3, # AMR-WB encoder
+  withVorbis ? withHeadlessDeps, # Vorbis de/encoding, native encoder exists
+  withVpl ? false, # Hardware acceleration via intel libvpl
+  withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform, # VP8 & VP9 de/encoding
+  withVulkan ? withHeadlessDeps && !stdenv.hostPlatform.isDarwin,
+  withVvenc ? withFullDeps && lib.versionAtLeast version "7.1", # H.266/VVC encoding
+  withWebp ? withHeadlessDeps, # WebP encoder
+  withX264 ? withHeadlessDeps && withGPL, # H.264/AVC encoder
+  withX265 ? withHeadlessDeps && withGPL, # H.265/HEVC encoder
+  withXavs ? withFullDeps && withGPL, # AVS encoder
+  withXcb ? withXcbShm || withXcbxfixes || withXcbShape, # X11 grabbing using XCB
+  withXcbShape ? withFullDeps, # X11 grabbing shape rendering
+  withXcbShm ? withFullDeps, # X11 grabbing shm communication
+  withXcbxfixes ? withFullDeps, # X11 grabbing mouse rendering
+  withXevd ? withFullDeps && lib.versionAtLeast version "7.1" && !xevd.meta.broken, # MPEG-5 EVC decoding
+  withXeve ? withFullDeps && lib.versionAtLeast version "7.1" && !xeve.meta.broken, # MPEG-5 EVC encoding
+  withXlib ? withFullDeps, # Xlib support
+  withXml2 ? withHeadlessDeps, # libxml2 support, for IMF and DASH demuxers
+  withXvid ? withHeadlessDeps && withGPL, # Xvid encoder, native encoder exists
+  withZimg ? withHeadlessDeps,
+  withZlib ? withHeadlessDeps,
+  withZmq ? withFullDeps, # Message passing
+  withZvbi ? withHeadlessDeps, # Teletext support
 
-/*
- *  Licensing options (yes some are listed twice, filters and such are not listed)
- */
-, withGPL ? true
-, withVersion3 ? true # When withGPL is set this implies GPLv3 otherwise it is LGPLv3
-, withGPLv3 ? withGPL && withVersion3
-, withUnfree ? false
+  # Licensing options (yes some are listed twice, filters and such are not listed)
+  withGPL ? true,
+  withVersion3 ? true, # When withGPL is set this implies GPLv3 otherwise it is LGPLv3
+  withGPLv3 ? withGPL && withVersion3,
+  withUnfree ? false,
 
-/*
- *  Build options
- */
-, withSmallBuild ? false # Optimize for size instead of speed
-, withRuntimeCPUDetection ? true # Detect CPU capabilities at runtime (disable to compile natively)
-, withGrayscale ? withFullDeps # Full grayscale support
-, withSwscaleAlpha ? buildSwscale # Alpha channel support in swscale. You probably want this when buildSwscale.
-, withHardcodedTables ? withHeadlessDeps # Hardcode decode tables instead of runtime generation
-, withSafeBitstreamReader ? withHeadlessDeps # Buffer boundary checking in bitreaders
-, withMultithread ? true # Multithreading via pthreads/win32 threads
-, withNetwork ? withHeadlessDeps # Network support
-, withPixelutils ? withHeadlessDeps # Pixel utils in libavutil
-, withStatic ? stdenv.hostPlatform.isStatic
-, withShared ? !stdenv.hostPlatform.isStatic
-, withPic ? true
-, withThumb ? false # On some ARM platforms
+  # Build options
+  withSmallBuild ? false, # Optimize for size instead of speed
+  withRuntimeCPUDetection ? true, # Detect CPU capabilities at runtime (disable to compile natively)
+  withGrayscale ? withFullDeps, # Full grayscale support
+  withSwscaleAlpha ? buildSwscale, # Alpha channel support in swscale. You probably want this when buildSwscale.
+  withHardcodedTables ? withHeadlessDeps, # Hardcode decode tables instead of runtime generation
+  withSafeBitstreamReader ? withHeadlessDeps, # Buffer boundary checking in bitreaders
+  withMultithread ? true, # Multithreading via pthreads/win32 threads
+  withNetwork ? withHeadlessDeps, # Network support
+  withPixelutils ? withHeadlessDeps, # Pixel utils in libavutil
+  withStatic ? stdenv.hostPlatform.isStatic,
+  withShared ? !stdenv.hostPlatform.isStatic,
+  withPic ? true,
+  withThumb ? false, # On some ARM platforms
 
-/*
- *  Program options
- */
-, buildFfmpeg ? withHeadlessDeps # Build ffmpeg executable
-, buildFfplay ? withSmallDeps # Build ffplay executable
-, buildFfprobe ? withHeadlessDeps # Build ffprobe executable
-, buildQtFaststart ? withFullDeps # Build qt-faststart executable
-, withBin ? buildFfmpeg || buildFfplay || buildFfprobe || buildQtFaststart
-/*
- *  Library options
- */
-, buildAvcodec ? withHeadlessDeps # Build avcodec library
-, buildAvdevice ? withHeadlessDeps # Build avdevice library
-, buildAvfilter ? withHeadlessDeps # Build avfilter library
-, buildAvformat ? withHeadlessDeps # Build avformat library
-# Deprecated but depended upon by some packages.
-# https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991)
-, buildAvresample ? withHeadlessDeps && lib.versionOlder version "5" # Build avresample library
-, buildAvutil ? withHeadlessDeps # Build avutil library
-, buildPostproc ? withHeadlessDeps # Build postproc library
-, buildSwresample ? withHeadlessDeps # Build swresample library
-, buildSwscale ? withHeadlessDeps # Build swscale library
-, withLib ? buildAvcodec
-  || buildAvdevice
-  || buildAvfilter
-  || buildAvformat
-  || buildAvutil
-  || buildPostproc
-  || buildSwresample
-  || buildSwscale
-/*
- *  Documentation options
- */
-, withDocumentation ? withHtmlDoc || withManPages || withPodDoc || withTxtDoc
-, withHtmlDoc ? withHeadlessDeps # HTML documentation pages
-, withManPages ? withHeadlessDeps # Man documentation pages
-, withPodDoc ? withHeadlessDeps # POD documentation pages
-, withTxtDoc ? withHeadlessDeps # Text documentation pages
-# Whether a "doc" output will be produced. Note that withManPages does not produce
-# a "doc" output because its files go to "man".
-, withDoc ? withDocumentation && (withHtmlDoc || withPodDoc || withTxtDoc)
+  # Program options
+  buildFfmpeg ? withHeadlessDeps, # Build ffmpeg executable
+  buildFfplay ? withSmallDeps, # Build ffplay executable
+  buildFfprobe ? withHeadlessDeps, # Build ffprobe executable
+  buildQtFaststart ? withFullDeps, # Build qt-faststart executable
+  withBin ? buildFfmpeg || buildFfplay || buildFfprobe || buildQtFaststart,
+  # Library options
+  buildAvcodec ? withHeadlessDeps, # Build avcodec library
+  buildAvdevice ? withHeadlessDeps, # Build avdevice library
+  buildAvfilter ? withHeadlessDeps, # Build avfilter library
+  buildAvformat ? withHeadlessDeps, # Build avformat library
+  # Deprecated but depended upon by some packages.
+  # https://github.com/NixOS/nixpkgs/pull/211834#issuecomment-1417435991)
+  buildAvresample ? withHeadlessDeps && lib.versionOlder version "5", # Build avresample library
+  buildAvutil ? withHeadlessDeps, # Build avutil library
+  buildPostproc ? withHeadlessDeps, # Build postproc library
+  buildSwresample ? withHeadlessDeps, # Build swresample library
+  buildSwscale ? withHeadlessDeps, # Build swscale library
+  withLib ?
+    buildAvcodec
+    || buildAvdevice
+    || buildAvfilter
+    || buildAvformat
+    || buildAvutil
+    || buildPostproc
+    || buildSwresample
+    || buildSwscale,
+  # Documentation options
+  withDocumentation ? withHtmlDoc || withManPages || withPodDoc || withTxtDoc,
+  withHtmlDoc ? withHeadlessDeps, # HTML documentation pages
+  withManPages ? withHeadlessDeps, # Man documentation pages
+  withPodDoc ? withHeadlessDeps, # POD documentation pages
+  withTxtDoc ? withHeadlessDeps, # Text documentation pages
+  # Whether a "doc" output will be produced. Note that withManPages does not produce
+  # a "doc" output because its files go to "man".
+  withDoc ? withDocumentation && (withHtmlDoc || withPodDoc || withTxtDoc),
 
-/*
- *  Developer options
- */
-, withDebug ? false
-, withOptimisations ? true
-, withExtraWarnings ? false
-, withStripping ? false
+  # Developer options
+  withDebug ? false,
+  withOptimisations ? true,
+  withExtraWarnings ? false,
+  withStripping ? false,
 
-/*
- *  External libraries options
- */
-, alsa-lib
-, amf
-, amf-headers
-, aribb24
-, avisynthplus
-, bzip2
-, celt
-, chromaprint
-, codec2
-, clang
-, dav1d
-, fdk_aac
-, flite
-, fontconfig
-, freetype
-, frei0r
-, fribidi
-, game-music-emu
-, gnutls
-, gsm
-, harfbuzz
-, intel-media-sdk
-, kvazaar
-, ladspaH
-, lame
-, lcevcdec
-, lcms2
-, libaom
-, libaribcaption
-, libass
-, libbluray
-, libbs2b
-, libcaca
-, libcdio
-, libcdio-paranoia
-, libdc1394
-, libdrm
-, libdvdnav
-, libdvdread
-, libGL
-, libGLU
-, libiconv
-, libilbc
-, libjack2
-, libjxl
-, liblc3
-, libmodplug
-, libmysofa
-, libopenmpt
-, libopus
-, libplacebo
-, libplacebo_5
-, libpulseaudio
-, libraw1394
-, librist
-, librsvg
-, libssh
-, libtensorflow
-, libtheora
-, libv4l
-, libva
-, libva-minimal
-, libvdpau
-, libvmaf
-, libvorbis
-, libvpl
-, libvpx
-, libwebp
-, libX11
-, libxcb
-, libXext
-, libxml2
-, libXv
-, nv-codec-headers
-, nv-codec-headers-12
-, ocl-icd # OpenCL ICD
-, openal
-, opencl-headers  # OpenCL headers
-, opencore-amr
-, openh264
-, openjpeg
-, qrencode
-, quirc
-, rav1e
-, rtmpdump
-, rubberband
-, twolame
-, samba
-, SDL2
-, shaderc
-, shine
-, snappy
-, soxr
-, speex
-, srt
-, svt-av1
-, vid-stab
-, vo-amrwbenc
-, vulkan-headers
-, vulkan-loader
-, vvenc
-, x264
-, x265
-, xavs
-, xevd
-, xeve
-, xvidcore
-, xz
-, zeromq
-, zimg
-, zlib
-, zvbi
-/*
- *  Darwin
- */
-, apple-sdk_15
-, xcode # unfree contains metalcc and metallib
-/*
- *  Cuda Packages
- */
-, cuda_cudart
-, cuda_nvcc
-, libnpp
-/*
- *  Testing
- */
-, testers
+  # External libraries options
+  alsa-lib,
+  amf,
+  amf-headers,
+  aribb24,
+  avisynthplus,
+  bzip2,
+  celt,
+  chromaprint,
+  codec2,
+  clang,
+  dav1d,
+  fdk_aac,
+  flite,
+  fontconfig,
+  freetype,
+  frei0r,
+  fribidi,
+  game-music-emu,
+  gnutls,
+  gsm,
+  harfbuzz,
+  intel-media-sdk,
+  kvazaar,
+  ladspaH,
+  lame,
+  lcevcdec,
+  lcms2,
+  libaom,
+  libaribcaption,
+  libass,
+  libbluray,
+  libbs2b,
+  libcaca,
+  libcdio,
+  libcdio-paranoia,
+  libdc1394,
+  libdrm,
+  libdvdnav,
+  libdvdread,
+  libGL,
+  libGLU,
+  libiconv,
+  libilbc,
+  libjack2,
+  libjxl,
+  liblc3,
+  libmodplug,
+  libmysofa,
+  libopenmpt,
+  libopus,
+  libplacebo,
+  libplacebo_5,
+  libpulseaudio,
+  libraw1394,
+  librist,
+  librsvg,
+  libssh,
+  libtensorflow,
+  libtheora,
+  libv4l,
+  libva,
+  libva-minimal,
+  libvdpau,
+  libvmaf,
+  libvorbis,
+  libvpl,
+  libvpx,
+  libwebp,
+  libX11,
+  libxcb,
+  libXext,
+  libxml2,
+  libXv,
+  nv-codec-headers,
+  nv-codec-headers-12,
+  ocl-icd, # OpenCL ICD
+  openal,
+  opencl-headers, # OpenCL headers
+  opencore-amr,
+  openh264,
+  openjpeg,
+  qrencode,
+  quirc,
+  rav1e,
+  rtmpdump,
+  rubberband,
+  twolame,
+  samba,
+  SDL2,
+  shaderc,
+  shine,
+  snappy,
+  soxr,
+  speex,
+  srt,
+  svt-av1,
+  vid-stab,
+  vo-amrwbenc,
+  vulkan-headers,
+  vulkan-loader,
+  vvenc,
+  x264,
+  x265,
+  xavs,
+  xevd,
+  xeve,
+  xvidcore,
+  xz,
+  zeromq,
+  zimg,
+  zlib,
+  zvbi,
+  # Darwin
+  apple-sdk_15,
+  xcode, # unfree contains metalcc and metallib
+  # Cuda Packages
+  cuda_cudart,
+  cuda_nvcc,
+  libnpp,
+  # Testing
+  testers,
 }:
 
-/* Maintainer notes:
- *
- * Version bumps:
- * It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release)
- * If adding a new branch, note any configure flags that were added, changed, or deprecated/removed
- *   and make the necessary changes.
- *
- * Known issues:
- * Cross-compiling will disable features not present on host OS
- *   (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin)
- *
- */
+/*
+  Maintainer notes:
+
+  Version bumps:
+  It should always be safe to bump patch releases (e.g. 2.1.x, x being a patch release)
+  If adding a new branch, note any configure flags that were added, changed, or deprecated/removed
+    and make the necessary changes.
+
+  Known issues:
+  Cross-compiling will disable features not present on host OS
+    (e.g. dxva2 support [DirectX] will not be enabled unless natively compiled on Cygwin)
+*/
 
 let
-  inherit (lib) optional optionals optionalString enableFeature versionOlder versionAtLeast;
+  inherit (lib)
+    optional
+    optionals
+    optionalString
+    enableFeature
+    versionOlder
+    versionAtLeast
+    ;
 in
 
+assert lib.elem ffmpegVariant [
+  "headless"
+  "small"
+  "full"
+];
 
-assert lib.elem ffmpegVariant [ "headless" "small" "full" ];
-
-/*
- *  Licensing dependencies
- */
+# Licensing dependencies
 assert withGPLv3 -> withGPL && withVersion3;
 
-/*
- *  Build dependencies
- */
+# Build dependencies
 assert withPixelutils -> buildAvutil;
 assert !(withMfx && withVpl); # incompatible features
-/*
- *  Program dependencies
- */
-assert buildFfmpeg -> buildAvcodec
-                     && buildAvfilter
-                     && buildAvformat
-                     && (buildSwresample || buildAvresample);
-assert buildFfplay -> buildAvcodec
-                     && buildAvformat
-                     && buildSwscale
-                     && (buildSwresample || buildAvresample);
+# Program dependencies
+assert
+  buildFfmpeg
+  -> buildAvcodec && buildAvfilter && buildAvformat && (buildSwresample || buildAvresample);
+assert
+  buildFfplay
+  -> buildAvcodec && buildAvformat && buildSwscale && (buildSwresample || buildAvresample);
 assert buildFfprobe -> buildAvcodec && buildAvformat;
-/*
- *  Library dependencies
- */
+# Library dependencies
 assert buildAvcodec -> buildAvutil; # configure flag since 0.6
-assert buildAvdevice -> buildAvformat
-                       && buildAvcodec
-                       && buildAvutil; # configure flag since 0.6
+assert buildAvdevice -> buildAvformat && buildAvcodec && buildAvutil; # configure flag since 0.6
 assert buildAvformat -> buildAvcodec && buildAvutil; # configure flag since 0.6
 assert buildPostproc -> buildAvutil;
 assert buildSwscale -> buildAvutil;
 
-/*
- *  External Library dependencies
- */
-assert (withCuda || withCuvid || withNvdec  || withNvenc) -> withNvcodec;
+# External Library dependencies
+assert (withCuda || withCuvid || withNvdec || withNvenc) -> withNvcodec;
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "ffmpeg" + (optionalString (ffmpegVariant != "small") "-${ffmpegVariant}");
-  inherit version;
-  src = source;
+stdenv.mkDerivation (
+  finalAttrs:
+  {
+    pname = "ffmpeg" + (optionalString (ffmpegVariant != "small") "-${ffmpegVariant}");
+    inherit version;
+    src = source;
 
-  postPatch = ''
-    patchShebangs .
-  '' + lib.optionalString withFrei0r ''
-    substituteInPlace libavfilter/vf_frei0r.c \
-      --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
-    substituteInPlace doc/filters.texi \
-      --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
-  '';
+    postPatch =
+      ''
+        patchShebangs .
+      ''
+      + lib.optionalString withFrei0r ''
+        substituteInPlace libavfilter/vf_frei0r.c \
+          --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
+        substituteInPlace doc/filters.texi \
+          --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
+      '';
 
-  patches = []
-    ++ 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";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475";
-        hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2024-31582.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2";
-        hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2024-31578.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7";
-        hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-49501.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4adb93dff05dd947878c67784d98c9a4e13b57a7";
-        hash = "sha256-7cwktto3fPMDGvCZCVtB01X8Q9S/4V4bDLUICSNfGgw=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-49502.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/737ede405b11a37fdd61d19cf25df296a0cb0b75";
-        hash = "sha256-mpSJwR9TX5ENjjCKvzuM/9e1Aj/AOiQW0+72oOMl9v8=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-50007.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/b1942734c7cbcdc9034034373abcc9ecb9644c47";
-        hash = "sha256-v0hNcqBtm8GCGAU9UbRUCE0slodOjZCHrkS8e4TrVcQ=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-50008.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b";
-        hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
-      })
-    ]
-    ++ optionals (lib.versionAtLeast version "7.1") [
-      ./fix-fate-ffmpeg-spec-disposition-7.1.patch
+    patches =
+      [ ]
+      ++ 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";
+          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475";
+          hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c=";
+        })
+        (fetchpatch2 {
+          name = "CVE-2024-31582.patch";
+          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2";
+          hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA=";
+        })
+        (fetchpatch2 {
+          name = "CVE-2024-31578.patch";
+          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7";
+          hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q=";
+        })
+        (fetchpatch2 {
+          name = "CVE-2023-49501.patch";
+          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4adb93dff05dd947878c67784d98c9a4e13b57a7";
+          hash = "sha256-7cwktto3fPMDGvCZCVtB01X8Q9S/4V4bDLUICSNfGgw=";
+        })
+        (fetchpatch2 {
+          name = "CVE-2023-49502.patch";
+          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/737ede405b11a37fdd61d19cf25df296a0cb0b75";
+          hash = "sha256-mpSJwR9TX5ENjjCKvzuM/9e1Aj/AOiQW0+72oOMl9v8=";
+        })
+        (fetchpatch2 {
+          name = "CVE-2023-50007.patch";
+          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/b1942734c7cbcdc9034034373abcc9ecb9644c47";
+          hash = "sha256-v0hNcqBtm8GCGAU9UbRUCE0slodOjZCHrkS8e4TrVcQ=";
+        })
+        (fetchpatch2 {
+          name = "CVE-2023-50008.patch";
+          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b";
+          hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
+        })
+      ]
+      ++ optionals (lib.versionAtLeast version "7.1") [
+        ./fix-fate-ffmpeg-spec-disposition-7.1.patch
 
-      # Expose a private API for Chromium / Qt WebEngine.
-      (fetchpatch2 {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/raw/a02c1a15706ea832c0d52a4d66be8fb29499801a/add-av_stream_get_first_dts-for-chromium.patch";
-        hash = "sha256-DbH6ieJwDwTjKOdQ04xvRcSLeeLP2Z2qEmqeo8HsPr4=";
-      })
-    ];
+        # Expose a private API for Chromium / Qt WebEngine.
+        (fetchpatch2 {
+          url = "https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/raw/a02c1a15706ea832c0d52a4d66be8fb29499801a/add-av_stream_get_first_dts-for-chromium.patch";
+          hash = "sha256-DbH6ieJwDwTjKOdQ04xvRcSLeeLP2Z2qEmqeo8HsPr4=";
+        })
+      ];
 
-  configurePlatforms = [];
-  setOutputFlags = false; # Only accepts some of them
-  configureFlags = [
-    #mingw64 is internally treated as mingw32, so 32 and 64 make no difference here
-    "--target_os=${if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name}"
-    "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
-    "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config"
-    /*
-     *  Licensing flags
-     */
-    (enableFeature withGPL "gpl")
-    (enableFeature withVersion3 "version3")
-    (enableFeature withUnfree "nonfree")
-    /*
-     *  Build flags
-     */
-    (enableFeature withStatic "static")
-    (enableFeature withShared "shared")
-    (enableFeature withPic "pic")
-    (enableFeature withThumb "thumb")
+    configurePlatforms = [ ];
+    setOutputFlags = false; # Only accepts some of them
+    configureFlags =
+      [
+        #mingw64 is internally treated as mingw32, so 32 and 64 make no difference here
+        "--target_os=${
+          if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name
+        }"
+        "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
+        "--pkg-config=${buildPackages.pkg-config.targetPrefix}pkg-config"
+        # Licensing flags
+        (enableFeature withGPL "gpl")
+        (enableFeature withVersion3 "version3")
+        (enableFeature withUnfree "nonfree")
+        # Build flags
+        (enableFeature withStatic "static")
+        (enableFeature withShared "shared")
+        (enableFeature withPic "pic")
+        (enableFeature withThumb "thumb")
 
-    (enableFeature withSmallBuild "small")
-    (enableFeature withRuntimeCPUDetection "runtime-cpudetect")
-    (enableFeature withGrayscale "gray")
-    (enableFeature withSwscaleAlpha "swscale-alpha")
-    (enableFeature withHardcodedTables "hardcoded-tables")
-    (enableFeature withSafeBitstreamReader "safe-bitstream-reader")
+        (enableFeature withSmallBuild "small")
+        (enableFeature withRuntimeCPUDetection "runtime-cpudetect")
+        (enableFeature withGrayscale "gray")
+        (enableFeature withSwscaleAlpha "swscale-alpha")
+        (enableFeature withHardcodedTables "hardcoded-tables")
+        (enableFeature withSafeBitstreamReader "safe-bitstream-reader")
 
-    (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads")
-    (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads")
-    "--disable-os2threads" # We don't support OS/2
+        (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads")
+        (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads")
+        "--disable-os2threads" # We don't support OS/2
 
-    (enableFeature withNetwork "network")
-    (enableFeature withPixelutils "pixelutils")
+        (enableFeature withNetwork "network")
+        (enableFeature withPixelutils "pixelutils")
 
-    "--datadir=${placeholder "data"}/share/ffmpeg"
+        "--datadir=${placeholder "data"}/share/ffmpeg"
 
-    /*
-     *  Program flags
-     */
-    (enableFeature buildFfmpeg "ffmpeg")
-    (enableFeature buildFfplay "ffplay")
-    (enableFeature buildFfprobe "ffprobe")
-  ] ++ optionals withBin [
-    "--bindir=${placeholder "bin"}/bin"
-  ] ++ [
-    /*
-     *  Library flags
-     */
-    (enableFeature buildAvcodec "avcodec")
-    (enableFeature buildAvdevice "avdevice")
-    (enableFeature buildAvfilter "avfilter")
-    (enableFeature buildAvformat "avformat")
-  ] ++ optionals (lib.versionOlder version "5") [
-    # Ffmpeg > 4 doesn't know about the flag anymore
-    (enableFeature buildAvresample "avresample")
-  ] ++ [
-    (enableFeature buildAvutil "avutil")
-    (enableFeature (buildPostproc && withGPL) "postproc")
-    (enableFeature buildSwresample "swresample")
-    (enableFeature buildSwscale "swscale")
-  ] ++ optionals withLib [
-    "--libdir=${placeholder "lib"}/lib"
-    "--incdir=${placeholder "dev"}/include"
-  ] ++ [
-    /*
-     *  Documentation flags
-     */
-    (enableFeature withDocumentation "doc")
-    (enableFeature withHtmlDoc "htmlpages")
-    (enableFeature withManPages "manpages")
-  ] ++ optionals withManPages [
-    "--mandir=${placeholder "man"}/share/man"
-  ] ++ [
-    (enableFeature withPodDoc "podpages")
-    (enableFeature withTxtDoc "txtpages")
-  ] ++ optionals withDoc [
-    "--docdir=${placeholder "doc"}/share/doc/ffmpeg"
-  ] ++ [
-    /*
-     *  External libraries
-     */
-    (enableFeature withAlsa "alsa")
-    (enableFeature withAmf "amf")
-    (enableFeature withAom "libaom")
-    (enableFeature withAribb24 "libaribb24")
-  ] ++ optionals (versionAtLeast version "6.1") [
-    (enableFeature withAribcaption "libaribcaption")
-  ] ++ [
-    (enableFeature withAss "libass")
-    (enableFeature withAvisynth "avisynth")
-    (enableFeature withBluray "libbluray")
-    (enableFeature withBs2b "libbs2b")
-    (enableFeature withBzlib "bzlib")
-    (enableFeature withCaca "libcaca")
-    (enableFeature withCdio "libcdio")
-    (enableFeature withCelt "libcelt")
-    (enableFeature withChromaprint "chromaprint")
-    (enableFeature withCodec2 "libcodec2")
-    (enableFeature withCuda "cuda")
-    (enableFeature withCudaLLVM "cuda-llvm")
-    (enableFeature withCudaNVCC "cuda-nvcc")
-    (enableFeature withCuvid "cuvid")
-    (enableFeature withDav1d "libdav1d")
-    (enableFeature withDc1394 "libdc1394")
-    (enableFeature withDrm "libdrm")
-  ] ++ optionals (versionAtLeast version "7") [
-    (enableFeature withDvdnav "libdvdnav")
-    (enableFeature withDvdread "libdvdread")
-  ] ++ [
-    (enableFeature withFdkAac "libfdk-aac")
-    (enableFeature withNvcodec "ffnvcodec")
-    (enableFeature withFlite "libflite")
-    (enableFeature withFontconfig "fontconfig")
-    (enableFeature withFontconfig "libfontconfig")
-    (enableFeature withFreetype "libfreetype")
-    (enableFeature withFrei0r "frei0r")
-    (enableFeature withFribidi "libfribidi")
-    (enableFeature withGme "libgme")
-    (enableFeature withGnutls "gnutls")
-    (enableFeature withGsm "libgsm")
-  ] ++ optionals (versionAtLeast version "6.1") [
-    (enableFeature withHarfbuzz "libharfbuzz")
-  ] ++ [
-    (enableFeature withIconv "iconv")
-    (enableFeature withIlbc "libilbc")
-    (enableFeature withJack "libjack")
-  ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [
-    (enableFeature withJxl "libjxl")
-  ] ++ [
-    (enableFeature withKvazaar "libkvazaar")
-    (enableFeature withLadspa "ladspa")
-  ] ++ optionals (versionAtLeast version "7.1") [
-    (enableFeature withLc3 "liblc3")
-    (enableFeature withLcevcdec "liblcevc-dec")
-  ] ++ optionals (versionAtLeast version "5.1") [
-    (enableFeature withLcms2 "lcms2")
-  ] ++ [
-    (enableFeature withLzma "lzma")
-  ] ++ optionals (versionAtLeast version "5.0") [
-    (enableFeature withMetal "metal")
-  ] ++ [
-    (enableFeature withMfx "libmfx")
-    (enableFeature withModplug "libmodplug")
-    (enableFeature withMp3lame "libmp3lame")
-    (enableFeature withMysofa "libmysofa")
-    (enableFeature withNpp "libnpp")
-    (enableFeature withNvdec "nvdec")
-    (enableFeature withNvenc "nvenc")
-    (enableFeature withOpenal "openal")
-    (enableFeature withOpencl "opencl")
-    (enableFeature withOpencoreAmrnb "libopencore-amrnb")
-    (enableFeature withOpencoreAmrwb "libopencore-amrwb")
-    (enableFeature withOpengl "opengl")
-    (enableFeature withOpenh264 "libopenh264")
-    (enableFeature withOpenjpeg "libopenjpeg")
-    (enableFeature withOpenmpt "libopenmpt")
-    (enableFeature withOpus "libopus")
-  ] ++ optionals (versionAtLeast version "5.0") [
-    (enableFeature withPlacebo "libplacebo")
-  ] ++ [
-    (enableFeature withPulse "libpulse")
-  ] ++ optionals (versionAtLeast version "7") [
-    (enableFeature withQrencode "libqrencode")
-    (enableFeature withQuirc "libquirc")
-  ] ++ [
-    (enableFeature withRav1e "librav1e")
-    (enableFeature withRist "librist")
-    (enableFeature withRtmp "librtmp")
-    (enableFeature withRubberband "librubberband")
-    (enableFeature withSamba "libsmbclient")
-    (enableFeature withSdl2 "sdl2")
-  ] ++ optionals (versionAtLeast version "5.0") [
-    (enableFeature withShaderc "libshaderc")
-  ] ++ [
-    (enableFeature withShine "libshine")
-    (enableFeature withSnappy "libsnappy")
-    (enableFeature withSoxr "libsoxr")
-    (enableFeature withSpeex "libspeex")
-    (enableFeature withSrt "libsrt")
-    (enableFeature withSsh "libssh")
-    (enableFeature withSvg "librsvg")
-    (enableFeature withSvtav1 "libsvtav1")
-    (enableFeature withTensorflow "libtensorflow")
-    (enableFeature withTheora "libtheora")
-    (enableFeature withTwolame "libtwolame")
-    (enableFeature withV4l2 "libv4l2")
-    (enableFeature withV4l2M2m "v4l2-m2m")
-    (enableFeature withVaapi "vaapi")
-    (enableFeature withVdpau "vdpau")
-  ] ++ optionals (versionAtLeast version "6.0")  [
-    (enableFeature withVpl "libvpl")
-  ] ++ [
-    (enableFeature withVidStab "libvidstab") # Actual min. version 2.0
-    (enableFeature withVmaf "libvmaf")
-    (enableFeature withVoAmrwbenc "libvo-amrwbenc")
-    (enableFeature withVorbis "libvorbis")
-    (enableFeature withVpx "libvpx")
-    (enableFeature withVulkan "vulkan")
-  ] ++ optionals (versionAtLeast version "7.1")  [
-    (enableFeature withVvenc "libvvenc")
-  ] ++ [
-    (enableFeature withWebp "libwebp")
-    (enableFeature withX264 "libx264")
-    (enableFeature withX265 "libx265")
-    (enableFeature withXavs "libxavs")
-    (enableFeature withXcb "libxcb")
-    (enableFeature withXcbShape "libxcb-shape")
-    (enableFeature withXcbShm "libxcb-shm")
-    (enableFeature withXcbxfixes "libxcb-xfixes")
-  ] ++ optionals (versionAtLeast version "7")  [
-    (enableFeature withXevd "libxevd")
-    (enableFeature withXeve "libxeve")
-  ] ++ [
-    (enableFeature withXlib "xlib")
-    (enableFeature withXml2 "libxml2")
-    (enableFeature withXvid "libxvid")
-    (enableFeature withZimg "libzimg")
-    (enableFeature withZlib "zlib")
-    (enableFeature withZmq "libzmq")
-    (enableFeature withZvbi "libzvbi")
-    /*
-     * Developer flags
-     */
-    (enableFeature withDebug "debug")
-    (enableFeature withOptimisations "optimizations")
-    (enableFeature withExtraWarnings "extra-warnings")
-    (enableFeature withStripping "stripping")
-  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "--cross-prefix=${stdenv.cc.targetPrefix}"
-    "--enable-cross-compile"
-    "--host-cc=${buildPackages.stdenv.cc}/bin/cc"
-  ] ++ optionals stdenv.cc.isClang [
-    "--cc=${stdenv.cc.targetPrefix}clang"
-    "--cxx=${stdenv.cc.targetPrefix}clang++"
-  ] ++ optionals withMetal [
-    "--metalcc=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal"
-    "--metallib=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib"
-  ];
+        # Program flags
+        (enableFeature buildFfmpeg "ffmpeg")
+        (enableFeature buildFfplay "ffplay")
+        (enableFeature buildFfprobe "ffprobe")
+      ]
+      ++ optionals withBin [
+        "--bindir=${placeholder "bin"}/bin"
+      ]
+      ++ [
+        # Library flags
+        (enableFeature buildAvcodec "avcodec")
+        (enableFeature buildAvdevice "avdevice")
+        (enableFeature buildAvfilter "avfilter")
+        (enableFeature buildAvformat "avformat")
+      ]
+      ++ optionals (lib.versionOlder version "5") [
+        # Ffmpeg > 4 doesn't know about the flag anymore
+        (enableFeature buildAvresample "avresample")
+      ]
+      ++ [
+        (enableFeature buildAvutil "avutil")
+        (enableFeature (buildPostproc && withGPL) "postproc")
+        (enableFeature buildSwresample "swresample")
+        (enableFeature buildSwscale "swscale")
+      ]
+      ++ optionals withLib [
+        "--libdir=${placeholder "lib"}/lib"
+        "--incdir=${placeholder "dev"}/include"
+      ]
+      ++ [
+        # Documentation flags
+        (enableFeature withDocumentation "doc")
+        (enableFeature withHtmlDoc "htmlpages")
+        (enableFeature withManPages "manpages")
+      ]
+      ++ optionals withManPages [
+        "--mandir=${placeholder "man"}/share/man"
+      ]
+      ++ [
+        (enableFeature withPodDoc "podpages")
+        (enableFeature withTxtDoc "txtpages")
+      ]
+      ++ optionals withDoc [
+        "--docdir=${placeholder "doc"}/share/doc/ffmpeg"
+      ]
+      ++ [
+        # External libraries
+        (enableFeature withAlsa "alsa")
+        (enableFeature withAmf "amf")
+        (enableFeature withAom "libaom")
+        (enableFeature withAribb24 "libaribb24")
+      ]
+      ++ optionals (versionAtLeast version "6.1") [
+        (enableFeature withAribcaption "libaribcaption")
+      ]
+      ++ [
+        (enableFeature withAss "libass")
+        (enableFeature withAvisynth "avisynth")
+        (enableFeature withBluray "libbluray")
+        (enableFeature withBs2b "libbs2b")
+        (enableFeature withBzlib "bzlib")
+        (enableFeature withCaca "libcaca")
+        (enableFeature withCdio "libcdio")
+        (enableFeature withCelt "libcelt")
+        (enableFeature withChromaprint "chromaprint")
+        (enableFeature withCodec2 "libcodec2")
+        (enableFeature withCuda "cuda")
+        (enableFeature withCudaLLVM "cuda-llvm")
+        (enableFeature withCudaNVCC "cuda-nvcc")
+        (enableFeature withCuvid "cuvid")
+        (enableFeature withDav1d "libdav1d")
+        (enableFeature withDc1394 "libdc1394")
+        (enableFeature withDrm "libdrm")
+      ]
+      ++ optionals (versionAtLeast version "7") [
+        (enableFeature withDvdnav "libdvdnav")
+        (enableFeature withDvdread "libdvdread")
+      ]
+      ++ [
+        (enableFeature withFdkAac "libfdk-aac")
+        (enableFeature withNvcodec "ffnvcodec")
+        (enableFeature withFlite "libflite")
+        (enableFeature withFontconfig "fontconfig")
+        (enableFeature withFontconfig "libfontconfig")
+        (enableFeature withFreetype "libfreetype")
+        (enableFeature withFrei0r "frei0r")
+        (enableFeature withFribidi "libfribidi")
+        (enableFeature withGme "libgme")
+        (enableFeature withGnutls "gnutls")
+        (enableFeature withGsm "libgsm")
+      ]
+      ++ optionals (versionAtLeast version "6.1") [
+        (enableFeature withHarfbuzz "libharfbuzz")
+      ]
+      ++ [
+        (enableFeature withIconv "iconv")
+        (enableFeature withIlbc "libilbc")
+        (enableFeature withJack "libjack")
+      ]
+      ++ optionals (versionAtLeast finalAttrs.version "5.0") [
+        (enableFeature withJxl "libjxl")
+      ]
+      ++ [
+        (enableFeature withKvazaar "libkvazaar")
+        (enableFeature withLadspa "ladspa")
+      ]
+      ++ optionals (versionAtLeast version "7.1") [
+        (enableFeature withLc3 "liblc3")
+        (enableFeature withLcevcdec "liblcevc-dec")
+      ]
+      ++ optionals (versionAtLeast version "5.1") [
+        (enableFeature withLcms2 "lcms2")
+      ]
+      ++ [
+        (enableFeature withLzma "lzma")
+      ]
+      ++ optionals (versionAtLeast version "5.0") [
+        (enableFeature withMetal "metal")
+      ]
+      ++ [
+        (enableFeature withMfx "libmfx")
+        (enableFeature withModplug "libmodplug")
+        (enableFeature withMp3lame "libmp3lame")
+        (enableFeature withMysofa "libmysofa")
+        (enableFeature withNpp "libnpp")
+        (enableFeature withNvdec "nvdec")
+        (enableFeature withNvenc "nvenc")
+        (enableFeature withOpenal "openal")
+        (enableFeature withOpencl "opencl")
+        (enableFeature withOpencoreAmrnb "libopencore-amrnb")
+        (enableFeature withOpencoreAmrwb "libopencore-amrwb")
+        (enableFeature withOpengl "opengl")
+        (enableFeature withOpenh264 "libopenh264")
+        (enableFeature withOpenjpeg "libopenjpeg")
+        (enableFeature withOpenmpt "libopenmpt")
+        (enableFeature withOpus "libopus")
+      ]
+      ++ optionals (versionAtLeast version "5.0") [
+        (enableFeature withPlacebo "libplacebo")
+      ]
+      ++ [
+        (enableFeature withPulse "libpulse")
+      ]
+      ++ optionals (versionAtLeast version "7") [
+        (enableFeature withQrencode "libqrencode")
+        (enableFeature withQuirc "libquirc")
+      ]
+      ++ [
+        (enableFeature withRav1e "librav1e")
+        (enableFeature withRist "librist")
+        (enableFeature withRtmp "librtmp")
+        (enableFeature withRubberband "librubberband")
+        (enableFeature withSamba "libsmbclient")
+        (enableFeature withSdl2 "sdl2")
+      ]
+      ++ optionals (versionAtLeast version "5.0") [
+        (enableFeature withShaderc "libshaderc")
+      ]
+      ++ [
+        (enableFeature withShine "libshine")
+        (enableFeature withSnappy "libsnappy")
+        (enableFeature withSoxr "libsoxr")
+        (enableFeature withSpeex "libspeex")
+        (enableFeature withSrt "libsrt")
+        (enableFeature withSsh "libssh")
+        (enableFeature withSvg "librsvg")
+        (enableFeature withSvtav1 "libsvtav1")
+        (enableFeature withTensorflow "libtensorflow")
+        (enableFeature withTheora "libtheora")
+        (enableFeature withTwolame "libtwolame")
+        (enableFeature withV4l2 "libv4l2")
+        (enableFeature withV4l2M2m "v4l2-m2m")
+        (enableFeature withVaapi "vaapi")
+        (enableFeature withVdpau "vdpau")
+      ]
+      ++ optionals (versionAtLeast version "6.0") [
+        (enableFeature withVpl "libvpl")
+      ]
+      ++ [
+        (enableFeature withVidStab "libvidstab") # Actual min. version 2.0
+        (enableFeature withVmaf "libvmaf")
+        (enableFeature withVoAmrwbenc "libvo-amrwbenc")
+        (enableFeature withVorbis "libvorbis")
+        (enableFeature withVpx "libvpx")
+        (enableFeature withVulkan "vulkan")
+      ]
+      ++ optionals (versionAtLeast version "7.1") [
+        (enableFeature withVvenc "libvvenc")
+      ]
+      ++ [
+        (enableFeature withWebp "libwebp")
+        (enableFeature withX264 "libx264")
+        (enableFeature withX265 "libx265")
+        (enableFeature withXavs "libxavs")
+        (enableFeature withXcb "libxcb")
+        (enableFeature withXcbShape "libxcb-shape")
+        (enableFeature withXcbShm "libxcb-shm")
+        (enableFeature withXcbxfixes "libxcb-xfixes")
+      ]
+      ++ optionals (versionAtLeast version "7") [
+        (enableFeature withXevd "libxevd")
+        (enableFeature withXeve "libxeve")
+      ]
+      ++ [
+        (enableFeature withXlib "xlib")
+        (enableFeature withXml2 "libxml2")
+        (enableFeature withXvid "libxvid")
+        (enableFeature withZimg "libzimg")
+        (enableFeature withZlib "zlib")
+        (enableFeature withZmq "libzmq")
+        (enableFeature withZvbi "libzvbi")
+        # Developer flags
+        (enableFeature withDebug "debug")
+        (enableFeature withOptimisations "optimizations")
+        (enableFeature withExtraWarnings "extra-warnings")
+        (enableFeature withStripping "stripping")
+      ]
+      ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+        "--cross-prefix=${stdenv.cc.targetPrefix}"
+        "--enable-cross-compile"
+        "--host-cc=${buildPackages.stdenv.cc}/bin/cc"
+      ]
+      ++ optionals stdenv.cc.isClang [
+        "--cc=${stdenv.cc.targetPrefix}clang"
+        "--cxx=${stdenv.cc.targetPrefix}clang++"
+      ]
+      ++ optionals withMetal [
+        "--metalcc=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal"
+        "--metallib=${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib"
+      ];
 
-  # ffmpeg embeds the configureFlags verbatim in its binaries and because we
-  # configure binary, include, library dir etc., this causes references in
-  # outputs where we don't want them. Patch the generated config.h to remove all
-  # such references except for data.
-  postConfigure = let
-    toStrip = map placeholder (lib.remove "data" finalAttrs.outputs) # We want to keep references to the data dir.
-      ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc
-      ++ lib.optional withMetal xcode;
-  in
-    "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h";
+    # ffmpeg embeds the configureFlags verbatim in its binaries and because we
+    # configure binary, include, library dir etc., this causes references in
+    # outputs where we don't want them. Patch the generated config.h to remove all
+    # such references except for data.
+    postConfigure =
+      let
+        toStrip =
+          map placeholder (lib.remove "data" finalAttrs.outputs) # We want to keep references to the data dir.
+          ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc
+          ++ lib.optional withMetal xcode;
+      in
+      "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h";
 
-  strictDeps = true;
+    strictDeps = true;
 
-  nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config yasm ]
-  # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
-  ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
-  ++ optionals withCudaLLVM [ clang ]
-  ++ optionals withCudaNVCC [ cuda_nvcc ];
+    nativeBuildInputs =
+      [
+        removeReferencesTo
+        addDriverRunpath
+        perl
+        pkg-config
+        yasm
+      ]
+      # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
+      ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
+      ++ optionals withCudaLLVM [ clang ]
+      ++ optionals withCudaNVCC [ cuda_nvcc ];
 
-  buildInputs = []
-  ++ optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]
-  ++ optionals withAlsa [ alsa-lib ]
-  ++ optionals withAmf [ amf-headers ]
-  ++ optionals withAom [ libaom ]
-  ++ optionals withAribb24 [ aribb24 ]
-  ++ optionals withAribcaption [ libaribcaption ]
-  ++ optionals withAss [ libass ]
-  ++ optionals withAvisynth [ avisynthplus ]
-  ++ optionals withBluray [ libbluray ]
-  ++ optionals withBs2b [ libbs2b ]
-  ++ optionals withBzlib [ bzip2 ]
-  ++ optionals withCaca [ libcaca ]
-  ++ optionals withCdio [ libcdio libcdio-paranoia ]
-  ++ optionals withCelt [ celt ]
-  ++ optionals withChromaprint [ chromaprint ]
-  ++ optionals withCodec2 [ codec2 ]
-  ++ optionals withCudaNVCC [ cuda_cudart cuda_nvcc ]
-  ++ optionals withDav1d [ dav1d ]
-  ++ optionals withDc1394 [ libdc1394 libraw1394 ]
-  ++ optionals withDrm [ libdrm ]
-  ++ optionals withDvdnav [ libdvdnav ]
-  ++ optionals withDvdread [ libdvdread ]
-  ++ optionals withFdkAac [ fdk_aac ]
-  ++ optionals withNvcodec [ (if (lib.versionAtLeast version "6") then nv-codec-headers-12 else nv-codec-headers) ]
-  ++ optionals withFlite [ flite ]
-  ++ optionals withFontconfig [ fontconfig ]
-  ++ optionals withFreetype [ freetype ]
-  ++ optionals withFrei0r [ frei0r ]
-  ++ optionals withFribidi [ fribidi ]
-  ++ optionals withGme [ game-music-emu ]
-  ++ optionals withGnutls [ gnutls ]
-  ++ optionals withGsm [ gsm ]
-  ++ optionals withHarfbuzz [ harfbuzz ]
-  ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it?
-  ++ optionals withIlbc [ libilbc ]
-  ++ optionals withJack [ libjack2 ]
-  ++ optionals withJxl [ libjxl ]
-  ++ optionals withKvazaar [ kvazaar ]
-  ++ optionals withLadspa [ ladspaH ]
-  ++ optionals withLc3 [ liblc3 ]
-  ++ optionals withLcevcdec [ lcevcdec ]
-  ++ optionals withLcms2 [ lcms2 ]
-  ++ optionals withLzma [ xz ]
-  ++ optionals withMfx [ intel-media-sdk ]
-  ++ optionals withModplug [ libmodplug ]
-  ++ optionals withMp3lame [ lame ]
-  ++ optionals withMysofa [ libmysofa ]
-  ++ optionals withNpp [ libnpp cuda_cudart cuda_nvcc ]
-  ++ optionals withOpenal [ openal ]
-  ++ optionals withOpencl [ ocl-icd opencl-headers ]
-  ++ optionals (withOpencoreAmrnb || withOpencoreAmrwb) [ opencore-amr ]
-  ++ optionals withOpengl [ libGL libGLU ]
-  ++ optionals withOpenh264 [ openh264 ]
-  ++ optionals withOpenjpeg [ openjpeg ]
-  ++ optionals withOpenmpt [ libopenmpt ]
-  ++ optionals withOpus [ libopus ]
-  ++ optionals withPlacebo [ (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5) vulkan-headers ]
-  ++ optionals withPulse [ libpulseaudio ]
-  ++ optionals withQrencode [ qrencode ]
-  ++ optionals withQuirc [ quirc ]
-  ++ optionals withRav1e [ rav1e ]
-  ++ optionals withRist [ librist ]
-  ++ optionals withRtmp [ rtmpdump ]
-  ++ optionals withRubberband [ rubberband ]
-  ++ optionals withSamba [ samba ]
-  ++ optionals withSdl2 [ SDL2 ]
-  ++ optionals withShaderc [ shaderc ]
-  ++ optionals withShine [ shine ]
-  ++ optionals withSnappy [ snappy ]
-  ++ optionals withSoxr [ soxr ]
-  ++ optionals withSpeex [ speex ]
-  ++ optionals withSrt [ srt ]
-  ++ optionals withSsh [ libssh ]
-  ++ optionals withSvg [ librsvg ]
-  ++ optionals withSvtav1 [ svt-av1 ]
-  ++ optionals withTensorflow [ libtensorflow ]
-  ++ optionals withTheora [ libtheora ]
-  ++ optionals withTwolame [ twolame ]
-  ++ optionals withV4l2 [ libv4l ]
-  ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ]
-  ++ optionals withVdpau [ libvdpau ]
-  ++ optionals withVidStab [ vid-stab ]
-  ++ optionals withVmaf [ libvmaf ]
-  ++ optionals withVoAmrwbenc [ vo-amrwbenc ]
-  ++ optionals withVorbis [ libvorbis ]
-  ++ optionals withVpl [ libvpl ]
-  ++ optionals withVpx [ libvpx ]
-  ++ optionals withVulkan [ vulkan-headers vulkan-loader ]
-  ++ optionals withVvenc [ vvenc ]
-  ++ optionals withWebp [ libwebp ]
-  ++ optionals withX264 [ x264 ]
-  ++ optionals withX265 [ x265 ]
-  ++ optionals withXavs [ xavs ]
-  ++ optionals withXcb [ libxcb ]
-  ++ optionals withXevd [ xevd ]
-  ++ optionals withXeve [ xeve ]
-  ++ optionals withXlib [ libX11 libXv libXext ]
-  ++ optionals withXml2 [ libxml2 ]
-  ++ optionals withXvid [ xvidcore ]
-  ++ optionals withZimg [ zimg ]
-  ++ optionals withZlib [ zlib ]
-  ++ optionals withZmq [ zeromq ]
-  ++ optionals withZvbi [ zvbi ]
-  ;
+    buildInputs =
+      [ ]
+      ++ optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]
+      ++ optionals withAlsa [ alsa-lib ]
+      ++ optionals withAmf [ amf-headers ]
+      ++ optionals withAom [ libaom ]
+      ++ optionals withAribb24 [ aribb24 ]
+      ++ optionals withAribcaption [ libaribcaption ]
+      ++ optionals withAss [ libass ]
+      ++ optionals withAvisynth [ avisynthplus ]
+      ++ optionals withBluray [ libbluray ]
+      ++ optionals withBs2b [ libbs2b ]
+      ++ optionals withBzlib [ bzip2 ]
+      ++ optionals withCaca [ libcaca ]
+      ++ optionals withCdio [
+        libcdio
+        libcdio-paranoia
+      ]
+      ++ optionals withCelt [ celt ]
+      ++ optionals withChromaprint [ chromaprint ]
+      ++ optionals withCodec2 [ codec2 ]
+      ++ optionals withCudaNVCC [
+        cuda_cudart
+        cuda_nvcc
+      ]
+      ++ optionals withDav1d [ dav1d ]
+      ++ optionals withDc1394 [
+        libdc1394
+        libraw1394
+      ]
+      ++ optionals withDrm [ libdrm ]
+      ++ optionals withDvdnav [ libdvdnav ]
+      ++ optionals withDvdread [ libdvdread ]
+      ++ optionals withFdkAac [ fdk_aac ]
+      ++ optionals withNvcodec [
+        (if (lib.versionAtLeast version "6") then nv-codec-headers-12 else nv-codec-headers)
+      ]
+      ++ optionals withFlite [ flite ]
+      ++ optionals withFontconfig [ fontconfig ]
+      ++ optionals withFreetype [ freetype ]
+      ++ optionals withFrei0r [ frei0r ]
+      ++ optionals withFribidi [ fribidi ]
+      ++ optionals withGme [ game-music-emu ]
+      ++ optionals withGnutls [ gnutls ]
+      ++ optionals withGsm [ gsm ]
+      ++ optionals withHarfbuzz [ harfbuzz ]
+      ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it?
+      ++ optionals withIlbc [ libilbc ]
+      ++ optionals withJack [ libjack2 ]
+      ++ optionals withJxl [ libjxl ]
+      ++ optionals withKvazaar [ kvazaar ]
+      ++ optionals withLadspa [ ladspaH ]
+      ++ optionals withLc3 [ liblc3 ]
+      ++ optionals withLcevcdec [ lcevcdec ]
+      ++ optionals withLcms2 [ lcms2 ]
+      ++ optionals withLzma [ xz ]
+      ++ optionals withMfx [ intel-media-sdk ]
+      ++ optionals withModplug [ libmodplug ]
+      ++ optionals withMp3lame [ lame ]
+      ++ optionals withMysofa [ libmysofa ]
+      ++ optionals withNpp [
+        libnpp
+        cuda_cudart
+        cuda_nvcc
+      ]
+      ++ optionals withOpenal [ openal ]
+      ++ optionals withOpencl [
+        ocl-icd
+        opencl-headers
+      ]
+      ++ optionals (withOpencoreAmrnb || withOpencoreAmrwb) [ opencore-amr ]
+      ++ optionals withOpengl [
+        libGL
+        libGLU
+      ]
+      ++ optionals withOpenh264 [ openh264 ]
+      ++ optionals withOpenjpeg [ openjpeg ]
+      ++ optionals withOpenmpt [ libopenmpt ]
+      ++ optionals withOpus [ libopus ]
+      ++ optionals withPlacebo [
+        (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5)
+        vulkan-headers
+      ]
+      ++ optionals withPulse [ libpulseaudio ]
+      ++ optionals withQrencode [ qrencode ]
+      ++ optionals withQuirc [ quirc ]
+      ++ optionals withRav1e [ rav1e ]
+      ++ optionals withRist [ librist ]
+      ++ optionals withRtmp [ rtmpdump ]
+      ++ optionals withRubberband [ rubberband ]
+      ++ optionals withSamba [ samba ]
+      ++ optionals withSdl2 [ SDL2 ]
+      ++ optionals withShaderc [ shaderc ]
+      ++ optionals withShine [ shine ]
+      ++ optionals withSnappy [ snappy ]
+      ++ optionals withSoxr [ soxr ]
+      ++ optionals withSpeex [ speex ]
+      ++ optionals withSrt [ srt ]
+      ++ optionals withSsh [ libssh ]
+      ++ optionals withSvg [ librsvg ]
+      ++ optionals withSvtav1 [ svt-av1 ]
+      ++ optionals withTensorflow [ libtensorflow ]
+      ++ optionals withTheora [ libtheora ]
+      ++ optionals withTwolame [ twolame ]
+      ++ optionals withV4l2 [ libv4l ]
+      ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ]
+      ++ optionals withVdpau [ libvdpau ]
+      ++ optionals withVidStab [ vid-stab ]
+      ++ optionals withVmaf [ libvmaf ]
+      ++ optionals withVoAmrwbenc [ vo-amrwbenc ]
+      ++ optionals withVorbis [ libvorbis ]
+      ++ optionals withVpl [ libvpl ]
+      ++ optionals withVpx [ libvpx ]
+      ++ optionals withVulkan [
+        vulkan-headers
+        vulkan-loader
+      ]
+      ++ optionals withVvenc [ vvenc ]
+      ++ optionals withWebp [ libwebp ]
+      ++ optionals withX264 [ x264 ]
+      ++ optionals withX265 [ x265 ]
+      ++ optionals withXavs [ xavs ]
+      ++ optionals withXcb [ libxcb ]
+      ++ optionals withXevd [ xevd ]
+      ++ optionals withXeve [ xeve ]
+      ++ optionals withXlib [
+        libX11
+        libXv
+        libXext
+      ]
+      ++ optionals withXml2 [ libxml2 ]
+      ++ optionals withXvid [ xvidcore ]
+      ++ optionals withZimg [ zimg ]
+      ++ optionals withZlib [ zlib ]
+      ++ optionals withZmq [ zeromq ]
+      ++ optionals withZvbi [ zvbi ];
 
-  buildFlags = [ "all" ]
-    ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable
+    buildFlags = [ "all" ] ++ optional buildQtFaststart "tools/qt-faststart"; # Build qt-faststart executable
 
-  env = lib.optionalAttrs stdenv.cc.isGNU {
-    NIX_CFLAGS_COMPILE = toString [
-      "-Wno-error=incompatible-pointer-types"
-      "-Wno-error=int-conversion"
-    ];
-  };
+    env = lib.optionalAttrs stdenv.cc.isGNU {
+      NIX_CFLAGS_COMPILE = toString [
+        "-Wno-error=incompatible-pointer-types"
+        "-Wno-error=int-conversion"
+      ];
+    };
 
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
-  # Fails with SIGABRT otherwise FIXME: Why?
-  checkPhase = let
-    ldLibraryPathEnv = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
-    libsToLink = [ ]
-      ++ optional buildAvcodec "libavcodec"
-      ++ optional buildAvdevice "libavdevice"
-      ++ optional buildAvfilter "libavfilter"
-      ++ optional buildAvformat "libavformat"
-      ++ optional buildAvresample "libavresample"
-      ++ optional buildAvutil "libavutil"
-      ++ optional buildPostproc "libpostproc"
-      ++ optional buildSwresample "libswresample"
-      ++ optional buildSwscale "libswscale"
+    # Fails with SIGABRT otherwise FIXME: Why?
+    checkPhase =
+      let
+        ldLibraryPathEnv = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
+        libsToLink =
+          [ ]
+          ++ optional buildAvcodec "libavcodec"
+          ++ optional buildAvdevice "libavdevice"
+          ++ optional buildAvfilter "libavfilter"
+          ++ optional buildAvformat "libavformat"
+          ++ optional buildAvresample "libavresample"
+          ++ optional buildAvutil "libavutil"
+          ++ optional buildPostproc "libpostproc"
+          ++ optional buildSwresample "libswresample"
+          ++ optional buildSwscale "libswscale";
+      in
+      ''
+        ${ldLibraryPathEnv}="${lib.concatStringsSep ":" libsToLink}" make check -j$NIX_BUILD_CORES
+      '';
+
+    outputs =
+      optionals withBin [ "bin" ] # The first output is the one that gets symlinked by default!
+      ++ optionals withLib [
+        "lib"
+        "dev"
+      ]
+      ++ optionals withDoc [ "doc" ]
+      ++ optionals withManPages [ "man" ]
+      ++ [
+        "data"
+        "out"
+      ] # We need an "out" output because we get an error otherwise. It's just an empty dir.
     ;
-  in ''
-    ${ldLibraryPathEnv}="${lib.concatStringsSep ":" libsToLink}" make check -j$NIX_BUILD_CORES
-  '';
 
-  outputs = optionals withBin [ "bin" ] # The first output is the one that gets symlinked by default!
-    ++ optionals withLib [ "lib" "dev" ]
-    ++ optionals withDoc [ "doc" ]
-    ++ optionals withManPages [ "man" ]
-    ++ [ "data" "out" ] # We need an "out" output because we get an error otherwise. It's just an empty dir.
-  ;
-
-  postInstall = optionalString buildQtFaststart ''
-    install -D tools/qt-faststart -t $bin/bin
-  '';
-
-  # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found.
-  # See the explanation in addDriverRunpath.
-  postFixup = optionalString (stdenv.hostPlatform.isLinux && withLib) ''
-    addDriverRunpath ${placeholder "lib"}/lib/libavcodec.so
-    addDriverRunpath ${placeholder "lib"}/lib/libavutil.so
-  ''
-  # https://trac.ffmpeg.org/ticket/10809
-  + optionalString (versionAtLeast version "5.0" && withVulkan && !stdenv.hostPlatform.isMinGW) ''
-    patchelf $lib/lib/libavcodec.so --add-needed libvulkan.so --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
-  '';
-
-  enableParallelBuilding = true;
-
-  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-
-  meta = with lib; {
-    description = "Complete, cross-platform solution to record, convert and stream audio and video";
-    homepage = "https://www.ffmpeg.org/";
-    changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog";
-    longDescription = ''
-      FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
-      mux, demux, stream, filter and play pretty much anything that humans and machines
-      have created. It supports the most obscure ancient formats up to the cutting edge.
-      No matter if they were designed by some standards committee, the community or
-      a corporation.
+    postInstall = optionalString buildQtFaststart ''
+      install -D tools/qt-faststart -t $bin/bin
     '';
-    license = with licenses; [ lgpl21Plus ]
-      ++ optional withGPL gpl2Plus
-      ++ optional withVersion3 lgpl3Plus
-      ++ optional withGPLv3 gpl3Plus
-      ++ optional withUnfree unfreeRedistributable
-      ++ optional (withGPL && withUnfree) unfree;
-    pkgConfigModules = [ ]
-      ++ optional buildAvcodec "libavcodec"
-      ++ optional buildAvdevice "libavdevice"
-      ++ optional buildAvfilter "libavfilter"
-      ++ optional buildAvformat "libavformat"
-      ++ optional buildAvresample "libavresample"
-      ++ optional buildAvutil "libavutil"
-      ++ optional buildPostproc "libpostproc"
-      ++ optional buildSwresample "libswresample"
-      ++ optional buildSwscale "libswscale";
-    platforms = platforms.all;
-    # See https://github.com/NixOS/nixpkgs/pull/295344#issuecomment-1992263658
-    broken = stdenv.hostPlatform.isMinGW && stdenv.hostPlatform.is64bit;
-    maintainers = with maintainers; [ atemu jopejoe1 emily ];
-    mainProgram = "ffmpeg";
-  };
-} // lib.optionalAttrs withCudaLLVM {
-  # remove once https://github.com/NixOS/nixpkgs/issues/318674 is addressed properly
-  hardeningDisable = [ "zerocallusedregs" ];
-})
+
+    # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found.
+    # See the explanation in addDriverRunpath.
+    postFixup =
+      optionalString (stdenv.hostPlatform.isLinux && withLib) ''
+        addDriverRunpath ${placeholder "lib"}/lib/libavcodec.so
+        addDriverRunpath ${placeholder "lib"}/lib/libavutil.so
+      ''
+      # https://trac.ffmpeg.org/ticket/10809
+      + optionalString (versionAtLeast version "5.0" && withVulkan && !stdenv.hostPlatform.isMinGW) ''
+        patchelf $lib/lib/libavcodec.so --add-needed libvulkan.so --add-rpath ${
+          lib.makeLibraryPath [ vulkan-loader ]
+        }
+      '';
+
+    enableParallelBuilding = true;
+
+    passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
+    meta = with lib; {
+      description = "Complete, cross-platform solution to record, convert and stream audio and video";
+      homepage = "https://www.ffmpeg.org/";
+      changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog";
+      longDescription = ''
+        FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
+        mux, demux, stream, filter and play pretty much anything that humans and machines
+        have created. It supports the most obscure ancient formats up to the cutting edge.
+        No matter if they were designed by some standards committee, the community or
+        a corporation.
+      '';
+      license =
+        with licenses;
+        [ lgpl21Plus ]
+        ++ optional withGPL gpl2Plus
+        ++ optional withVersion3 lgpl3Plus
+        ++ optional withGPLv3 gpl3Plus
+        ++ optional withUnfree unfreeRedistributable
+        ++ optional (withGPL && withUnfree) unfree;
+      pkgConfigModules =
+        [ ]
+        ++ optional buildAvcodec "libavcodec"
+        ++ optional buildAvdevice "libavdevice"
+        ++ optional buildAvfilter "libavfilter"
+        ++ optional buildAvformat "libavformat"
+        ++ optional buildAvresample "libavresample"
+        ++ optional buildAvutil "libavutil"
+        ++ optional buildPostproc "libpostproc"
+        ++ optional buildSwresample "libswresample"
+        ++ optional buildSwscale "libswscale";
+      platforms = platforms.all;
+      # See https://github.com/NixOS/nixpkgs/pull/295344#issuecomment-1992263658
+      broken = stdenv.hostPlatform.isMinGW && stdenv.hostPlatform.is64bit;
+      maintainers = with maintainers; [
+        atemu
+        jopejoe1
+        emily
+      ];
+      mainProgram = "ffmpeg";
+    };
+  }
+  // lib.optionalAttrs withCudaLLVM {
+    # remove once https://github.com/NixOS/nixpkgs/issues/318674 is addressed properly
+    hardeningDisable = [ "zerocallusedregs" ];
+  }
+)

From 4dc9948c81ef1a72504f98d23ec84a0a142d933a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 5 Mar 2025 23:49:43 +0100
Subject: [PATCH 139/156] opencv: format

---
 pkgs/development/libraries/opencv/4.x.nix | 791 ++++++++++++----------
 1 file changed, 442 insertions(+), 349 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index dd9a3fd73bb2..dbb6be5efad9 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -1,105 +1,113 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchFromGitHub
-, cmake
-, pkg-config
-, unzip
-, zlib
-, pcre2
-, hdf5
-, boost
-, glib
-, glog
-, gflags
-, protobuf_29
-, config
-, ocl-icd
-, qimgv
-, opencv4
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  unzip,
+  zlib,
+  pcre2,
+  hdf5,
+  boost,
+  glib,
+  glog,
+  gflags,
+  protobuf_29,
+  config,
+  ocl-icd,
+  qimgv,
+  opencv4,
 
-, enableJPEG ? true
-, libjpeg
-, enablePNG ? true
-, libpng
-, enableTIFF ? true
-, libtiff
-, enableWebP ? true
-, libwebp
-, enableEXR ? !stdenv.hostPlatform.isDarwin
-, openexr
-, ilmbase
-, enableJPEG2000 ? true
-, openjpeg
-, enableEigen ? true
-, eigen
-, enableBlas ? true
-, blas
-, enableVA ? !stdenv.hostPlatform.isDarwin
-, libva
-, enableContrib ? true
+  enableJPEG ? true,
+  libjpeg,
+  enablePNG ? true,
+  libpng,
+  enableTIFF ? true,
+  libtiff,
+  enableWebP ? true,
+  libwebp,
+  enableEXR ? !stdenv.hostPlatform.isDarwin,
+  openexr,
+  ilmbase,
+  enableJPEG2000 ? true,
+  openjpeg,
+  enableEigen ? true,
+  eigen,
+  enableBlas ? true,
+  blas,
+  enableVA ? !stdenv.hostPlatform.isDarwin,
+  libva,
+  enableContrib ? true,
 
-, enableCuda ? config.cudaSupport
-, enableCublas ? enableCuda
-, enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default
-, enableCufft ? enableCuda
-, cudaPackages
-, nvidia-optical-flow-sdk
+  enableCuda ? config.cudaSupport,
+  enableCublas ? enableCuda,
+  enableCudnn ? false, # NOTE: CUDNN has a large impact on closure size so we disable it by default
+  enableCufft ? enableCuda,
+  cudaPackages,
+  nvidia-optical-flow-sdk,
 
-, enableLto ? true
-, enableUnfree ? false
-, enableIpp ? false
-, enablePython ? false
-, pythonPackages
-, enableGtk2 ? false
-, gtk2
-, enableGtk3 ? false
-, gtk3
-, enableVtk ? false
-, vtk
-, enableFfmpeg ? true
-, ffmpeg
-, enableGStreamer ? true
-, elfutils
-, gst_all_1
-, orc
-, libunwind
-, zstd
-, enableTesseract ? false
-, tesseract
-, leptonica
-, enableTbb ? false
-, tbb
-, enableOvis ? false
-, ogre
-, enableGPhoto2 ? false
-, libgphoto2
-, enableDC1394 ? false
-, libdc1394
-, enableDocs ? false
-, doxygen
-, graphviz-nox
+  enableLto ? true,
+  enableUnfree ? false,
+  enableIpp ? false,
+  enablePython ? false,
+  pythonPackages,
+  enableGtk2 ? false,
+  gtk2,
+  enableGtk3 ? false,
+  gtk3,
+  enableVtk ? false,
+  vtk,
+  enableFfmpeg ? true,
+  ffmpeg,
+  enableGStreamer ? true,
+  elfutils,
+  gst_all_1,
+  orc,
+  libunwind,
+  zstd,
+  enableTesseract ? false,
+  tesseract,
+  leptonica,
+  enableTbb ? false,
+  tbb,
+  enableOvis ? false,
+  ogre,
+  enableGPhoto2 ? false,
+  libgphoto2,
+  enableDC1394 ? false,
+  libdc1394,
+  enableDocs ? false,
+  doxygen,
+  graphviz-nox,
 
-, runAccuracyTests ? true
-, runPerformanceTests ? false
-# Modules to enable via BUILD_LIST to build a customized opencv.
-# An empty lists means this setting is omitted which matches upstreams default.
-, enabledModules ? [ ]
+  runAccuracyTests ? true,
+  runPerformanceTests ? false,
+  # Modules to enable via BUILD_LIST to build a customized opencv.
+  # An empty lists means this setting is omitted which matches upstreams default.
+  enabledModules ? [ ],
 
-, AVFoundation
-, Cocoa
-, VideoDecodeAcceleration
-, CoreMedia
-, MediaToolbox
-, Accelerate
-, bzip2
-, callPackage
+  AVFoundation,
+  Cocoa,
+  VideoDecodeAcceleration,
+  CoreMedia,
+  MediaToolbox,
+  Accelerate,
+  bzip2,
+  callPackage,
 }@inputs:
 
 let
   inherit (lib.attrsets) mapAttrsToList optionalAttrs;
   inherit (lib.lists) last optionals;
-  inherit (lib.strings) cmakeBool cmakeFeature cmakeOptionType concatStrings concatStringsSep optionalString;
+  inherit (lib.strings)
+    cmakeBool
+    cmakeFeature
+    cmakeOptionType
+    concatStrings
+    concatStringsSep
+    optionalString
+    ;
   inherit (lib.trivial) flip;
 
   version = "4.11.0";
@@ -135,13 +143,18 @@ let
 
   # See opencv/3rdparty/ippicv/ippicv.cmake
   ippicv = {
-    src = fetchFromGitHub {
-      owner = "opencv";
-      repo = "opencv_3rdparty";
-      rev = "7f55c0c26be418d494615afca15218566775c725";
-      hash = "sha256-XbmS+FXUL8MAG7kawbDkb2XHG9R0DpPhiYhq/18eTnY=";
-    } + "/ippicv";
-    files = let name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz"; in
+    src =
+      fetchFromGitHub {
+        owner = "opencv";
+        repo = "opencv_3rdparty";
+        rev = "7f55c0c26be418d494615afca15218566775c725";
+        hash = "sha256-XbmS+FXUL8MAG7kawbDkb2XHG9R0DpPhiYhq/18eTnY=";
+      }
+      + "/ippicv";
+    files =
+      let
+        name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz";
+      in
       if effectiveStdenv.hostPlatform.system == "x86_64-linux" then
         { ${name "lnx_intel64"} = ""; }
       else if effectiveStdenv.hostPlatform.system == "i686-linux" then
@@ -233,15 +246,35 @@ let
   };
 
   # See opencv/cmake/OpenCVDownload.cmake
-  installExtraFiles = {dst, files, src, ...}: ''
-    mkdir -p "${dst}"
-  '' + concatStrings (flip mapAttrsToList files (name: md5: ''
-    ln -s "${src}/${name}" "${dst}/${md5}-${name}"
-  ''));
-  installExtraFile = {dst, md5, name, src, ...}: ''
-    mkdir -p "${dst}"
-    ln -s "${src}" "${dst}/${md5}-${name}"
-  '';
+  installExtraFiles =
+    {
+      dst,
+      files,
+      src,
+      ...
+    }:
+    ''
+      mkdir -p "${dst}"
+    ''
+    + concatStrings (
+      flip mapAttrsToList files (
+        name: md5: ''
+          ln -s "${src}/${name}" "${dst}/${md5}-${name}"
+        ''
+      )
+    );
+  installExtraFile =
+    {
+      dst,
+      md5,
+      name,
+      src,
+      ...
+    }:
+    ''
+      mkdir -p "${dst}"
+      ln -s "${src}" "${dst}/${md5}-${name}"
+    '';
 
   withOpenblas = (enableBlas && blas.provider.pname == "openblas");
   #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests
@@ -257,12 +290,14 @@ effectiveStdenv.mkDerivation {
   pname = "opencv";
   inherit version src;
 
-  outputs = [
-    "out"
-    "cxxdev"
-  ] ++ optionals (runAccuracyTests || runPerformanceTests) [
-    "package_tests"
-  ];
+  outputs =
+    [
+      "out"
+      "cxxdev"
+    ]
+    ++ optionals (runAccuracyTests || runPerformanceTests) [
+      "package_tests"
+    ];
   cudaPropagateToOutput = "cxxdev";
 
   postUnpack = optionalString buildContrib ''
@@ -270,11 +305,13 @@ effectiveStdenv.mkDerivation {
   '';
 
   # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
-  patches = [
-    ./cmake-don-t-use-OpenCVFindOpenEXR.patch
-  ] ++ optionals enableCuda [
-    ./cuda_opt_flow.patch
-  ];
+  patches =
+    [
+      ./cmake-don-t-use-OpenCVFindOpenEXR.patch
+    ]
+    ++ optionals enableCuda [
+      ./cuda_opt_flow.patch
+    ];
 
   # This prevents cmake from using libraries in impure paths (which
   # causes build failure on non NixOS)
@@ -283,129 +320,163 @@ effectiveStdenv.mkDerivation {
   '';
 
   preConfigure =
-    installExtraFile ade +
-    optionalString enableIpp (installExtraFiles ippicv) + (
-      optionalString buildContrib ''
-        cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
+    installExtraFile ade
+    + optionalString enableIpp (installExtraFiles ippicv)
+    + (optionalString buildContrib ''
+      cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
 
-        ${installExtraFiles vgg}
-        ${installExtraFiles boostdesc}
-        ${installExtraFiles face}
-        ${installExtraFiles wechat_qrcode}
-      ''
-    );
+      ${installExtraFiles vgg}
+      ${installExtraFiles boostdesc}
+      ${installExtraFiles face}
+      ${installExtraFiles wechat_qrcode}
+    '');
 
   postConfigure = ''
     [ -e modules/core/version_string.inc ]
     echo '"(build info elided)"' > modules/core/version_string.inc
   '';
 
-  buildInputs = [
-    boost
-    gflags
-    glib
-    glog
-    pcre2
-    protobuf_29
-    zlib
-  ] ++ optionals enablePython [
-    pythonPackages.python
-  ] ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [
-    hdf5
-  ] ++ optionals enableGtk2 [
-    gtk2
-  ] ++ optionals enableGtk3 [
-    gtk3
-  ] ++ optionals enableVtk [
-    vtk
-  ] ++ optionals enableJPEG [
-    libjpeg
-  ] ++ optionals enablePNG [
-    libpng
-  ] ++ optionals enableTIFF [
-    libtiff
-  ] ++ optionals enableWebP [
-    libwebp
-  ] ++ optionals enableEXR [
-    openexr
-    ilmbase
-  ] ++ optionals enableJPEG2000 [
-    openjpeg
-  ] ++ optionals enableFfmpeg [
-    ffmpeg
-  ] ++ optionals (enableFfmpeg && effectiveStdenv.hostPlatform.isDarwin) [
-    bzip2
-    VideoDecodeAcceleration
-  ] ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
-    elfutils
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gstreamer
-    libunwind
-    orc
-    zstd
-  ] ++ optionals enableOvis [
-    ogre
-  ] ++ optionals enableGPhoto2 [
-    libgphoto2
-  ] ++ optionals enableDC1394 [
-    libdc1394
-  ] ++ optionals enableEigen [
-    eigen
-  ] ++ optionals enableVA [
-    libva
-  ] ++ optionals enableBlas [
-    blas.provider
-  ] ++ optionals enableTesseract [
-    # There is seemingly no compile-time flag for Tesseract.  It's
-    # simply enabled automatically if contrib is built, and it detects
-    # tesseract & leptonica.
-    tesseract
-    leptonica
-  ] ++ optionals enableTbb [
-    tbb
-  ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [
-    bzip2
-    AVFoundation
-    Cocoa
-    VideoDecodeAcceleration
-    CoreMedia
-    MediaToolbox
-    Accelerate
-  ] ++ optionals enableDocs [
-    doxygen
-    graphviz-nox
-  ] ++ optionals enableCuda [
-    cudaPackages.cuda_cudart
-    cudaPackages.cuda_cccl # <thrust/*>
-    cudaPackages.libnpp # npp.h
-    nvidia-optical-flow-sdk
-  ] ++ optionals enableCublas [
-    # May start using the default $out instead once
-    # https://github.com/NixOS/nixpkgs/issues/271792
-    # has been addressed
-    cudaPackages.libcublas # cublas_v2.h
-  ] ++ optionals enableCudnn [
-    cudaPackages.cudnn # cudnn.h
-  ] ++ optionals enableCufft [
-    cudaPackages.libcufft # cufft.h
-  ];
+  buildInputs =
+    [
+      boost
+      gflags
+      glib
+      glog
+      pcre2
+      protobuf_29
+      zlib
+    ]
+    ++ optionals enablePython [
+      pythonPackages.python
+    ]
+    ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [
+      hdf5
+    ]
+    ++ optionals enableGtk2 [
+      gtk2
+    ]
+    ++ optionals enableGtk3 [
+      gtk3
+    ]
+    ++ optionals enableVtk [
+      vtk
+    ]
+    ++ optionals enableJPEG [
+      libjpeg
+    ]
+    ++ optionals enablePNG [
+      libpng
+    ]
+    ++ optionals enableTIFF [
+      libtiff
+    ]
+    ++ optionals enableWebP [
+      libwebp
+    ]
+    ++ optionals enableEXR [
+      openexr
+      ilmbase
+    ]
+    ++ optionals enableJPEG2000 [
+      openjpeg
+    ]
+    ++ optionals enableFfmpeg [
+      ffmpeg
+    ]
+    ++ optionals (enableFfmpeg && effectiveStdenv.hostPlatform.isDarwin) [
+      bzip2
+      VideoDecodeAcceleration
+    ]
+    ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
+      elfutils
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-good
+      gst_all_1.gstreamer
+      libunwind
+      orc
+      zstd
+    ]
+    ++ optionals enableOvis [
+      ogre
+    ]
+    ++ optionals enableGPhoto2 [
+      libgphoto2
+    ]
+    ++ optionals enableDC1394 [
+      libdc1394
+    ]
+    ++ optionals enableEigen [
+      eigen
+    ]
+    ++ optionals enableVA [
+      libva
+    ]
+    ++ optionals enableBlas [
+      blas.provider
+    ]
+    ++ optionals enableTesseract [
+      # There is seemingly no compile-time flag for Tesseract.  It's
+      # simply enabled automatically if contrib is built, and it detects
+      # tesseract & leptonica.
+      tesseract
+      leptonica
+    ]
+    ++ optionals enableTbb [
+      tbb
+    ]
+    ++ optionals effectiveStdenv.hostPlatform.isDarwin [
+      bzip2
+      AVFoundation
+      Cocoa
+      VideoDecodeAcceleration
+      CoreMedia
+      MediaToolbox
+      Accelerate
+    ]
+    ++ optionals enableDocs [
+      doxygen
+      graphviz-nox
+    ]
+    ++ optionals enableCuda [
+      cudaPackages.cuda_cudart
+      cudaPackages.cuda_cccl # <thrust/*>
+      cudaPackages.libnpp # npp.h
+      nvidia-optical-flow-sdk
+    ]
+    ++ optionals enableCublas [
+      # May start using the default $out instead once
+      # https://github.com/NixOS/nixpkgs/issues/271792
+      # has been addressed
+      cudaPackages.libcublas # cublas_v2.h
+    ]
+    ++ optionals enableCudnn [
+      cudaPackages.cudnn # cudnn.h
+    ]
+    ++ optionals enableCufft [
+      cudaPackages.libcufft # cufft.h
+    ];
 
   propagatedBuildInputs = optionals enablePython [ pythonPackages.numpy ];
 
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    unzip
-  ] ++ optionals enablePython ([
-    pythonPackages.pip
-    pythonPackages.wheel
-    pythonPackages.setuptools
-  ] ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [
-    pythonPackages.pythonImportsCheckHook
-  ]) ++ optionals enableCuda [
-    cudaPackages.cuda_nvcc
-  ];
+  nativeBuildInputs =
+    [
+      cmake
+      pkg-config
+      unzip
+    ]
+    ++ optionals enablePython (
+      [
+        pythonPackages.pip
+        pythonPackages.wheel
+        pythonPackages.setuptools
+      ]
+      ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [
+        pythonPackages.pythonImportsCheckHook
+      ]
+    )
+    ++ optionals enableCuda [
+      cudaPackages.cuda_nvcc
+    ];
 
   env.NIX_CFLAGS_COMPILE = optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
 
@@ -413,78 +484,86 @@ effectiveStdenv.mkDerivation {
   OpenBLAS_HOME = optionalString withOpenblas openblas_.dev;
   OpenBLAS = optionalString withOpenblas openblas_;
 
-  cmakeFlags = [
-    (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
-    (cmakeBool "WITH_OPENMP" true)
-    (cmakeBool "BUILD_PROTOBUF" false)
-    (cmakeBool "PROTOBUF_UPDATE_FILES" true)
-    (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)
-    (cmakeBool "BUILD_TESTS" runAccuracyTests)
-    (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests)
-    (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
-    (cmakeBool "BUILD_DOCS" enableDocs)
-    # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT"
-    # but we have proper separation of build and host libs :), fixes cross
-    (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true)
-    (cmakeBool "WITH_IPP" enableIpp)
-    (cmakeBool "WITH_TIFF" enableTIFF)
-    (cmakeBool "WITH_WEBP" enableWebP)
-    (cmakeBool "WITH_JPEG" enableJPEG)
-    (cmakeBool "WITH_PNG" enablePNG)
-    (cmakeBool "WITH_OPENEXR" enableEXR)
-    (cmakeBool "WITH_OPENJPEG" enableJPEG2000)
-    (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled
-    (cmakeBool "WITH_TBB" enableTbb)
+  cmakeFlags =
+    [
+      (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
+      (cmakeBool "WITH_OPENMP" true)
+      (cmakeBool "BUILD_PROTOBUF" false)
+      (cmakeBool "PROTOBUF_UPDATE_FILES" true)
+      (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)
+      (cmakeBool "BUILD_TESTS" runAccuracyTests)
+      (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests)
+      (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
+      (cmakeBool "BUILD_DOCS" enableDocs)
+      # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT"
+      # but we have proper separation of build and host libs :), fixes cross
+      (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true)
+      (cmakeBool "WITH_IPP" enableIpp)
+      (cmakeBool "WITH_TIFF" enableTIFF)
+      (cmakeBool "WITH_WEBP" enableWebP)
+      (cmakeBool "WITH_JPEG" enableJPEG)
+      (cmakeBool "WITH_PNG" enablePNG)
+      (cmakeBool "WITH_OPENEXR" enableEXR)
+      (cmakeBool "WITH_OPENJPEG" enableJPEG2000)
+      (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled
+      (cmakeBool "WITH_TBB" enableTbb)
 
-    # CUDA options
-    (cmakeBool "WITH_CUDA" enableCuda)
-    (cmakeBool "WITH_CUBLAS" enableCublas)
-    (cmakeBool "WITH_CUDNN" enableCudnn)
-    (cmakeBool "WITH_CUFFT" enableCufft)
+      # CUDA options
+      (cmakeBool "WITH_CUDA" enableCuda)
+      (cmakeBool "WITH_CUBLAS" enableCublas)
+      (cmakeBool "WITH_CUDNN" enableCudnn)
+      (cmakeBool "WITH_CUFFT" enableCufft)
 
-    # LTO options
-    (cmakeBool "ENABLE_LTO" enableLto)
-    (cmakeBool "ENABLE_THIN_LTO" (
-      enableLto && (
-        # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv,
-        effectiveStdenv.cc.isClang ||
-          # or through the backend effectiveStdenv.
-          (enableCuda && effectiveStdenv.cc.isClang)
-      )
-    ))
-  ] ++ optionals enableCuda [
-    (cmakeBool "CUDA_FAST_MATH" true)
-    (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr")
+      # LTO options
+      (cmakeBool "ENABLE_LTO" enableLto)
+      (cmakeBool "ENABLE_THIN_LTO" (
+        enableLto
+        && (
+          # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv,
+          effectiveStdenv.cc.isClang
+          ||
+            # or through the backend effectiveStdenv.
+            (enableCuda && effectiveStdenv.cc.isClang)
+        )
+      ))
+    ]
+    ++ optionals enableCuda [
+      (cmakeBool "CUDA_FAST_MATH" true)
+      (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr")
 
-    # OpenCV respects at least three variables:
-    # -DCUDA_GENERATION takes a single arch name, e.g. Volta
-    # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6"
-    # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6"
-    (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString)
-    (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities))
+      # OpenCV respects at least three variables:
+      # -DCUDA_GENERATION takes a single arch name, e.g. Volta
+      # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6"
+      # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6"
+      (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString)
+      (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities))
 
-    (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath)
-  ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [
-    (cmakeBool "WITH_OPENCL" false)
-    (cmakeBool "WITH_LAPACK" false)
+      (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath)
+    ]
+    ++ optionals effectiveStdenv.hostPlatform.isDarwin [
+      (cmakeBool "WITH_OPENCL" false)
+      (cmakeBool "WITH_LAPACK" false)
 
-    # Disable unnecessary vendoring that's enabled by default only for Darwin.
-    # Note that the opencvFlag feature flags listed above still take
-    # precedence, so we can safely list everything here.
-    (cmakeBool "BUILD_ZLIB" false)
-    (cmakeBool "BUILD_TIFF" false)
-    (cmakeBool "BUILD_OPENJPEG" false)
-    (cmakeBool "BUILD_JASPER" false)
-    (cmakeBool "BUILD_JPEG" false)
-    (cmakeBool "BUILD_PNG" false)
-    (cmakeBool "BUILD_WEBP" false)
-  ] ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [
-    (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so")
-  ] ++ optionals enablePython [
-    (cmakeOptionType "path" "OPENCV_PYTHON_INSTALL_PATH" pythonPackages.python.sitePackages)
-  ] ++ optionals (enabledModules != [ ]) [
-    (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules))
-  ];
+      # Disable unnecessary vendoring that's enabled by default only for Darwin.
+      # Note that the opencvFlag feature flags listed above still take
+      # precedence, so we can safely list everything here.
+      (cmakeBool "BUILD_ZLIB" false)
+      (cmakeBool "BUILD_TIFF" false)
+      (cmakeBool "BUILD_OPENJPEG" false)
+      (cmakeBool "BUILD_JASPER" false)
+      (cmakeBool "BUILD_JPEG" false)
+      (cmakeBool "BUILD_PNG" false)
+      (cmakeBool "BUILD_WEBP" false)
+    ]
+    ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [
+      (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so")
+    ]
+    ++ optionals enablePython [
+      (cmakeOptionType "path" "OPENCV_PYTHON_INSTALL_PATH" pythonPackages.python.sitePackages)
+    ]
+    ++ optionals (enabledModules != [ ]) [
+      (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules))
+    ];
 
   postBuild = optionalString enableDocs ''
     make doxygen
@@ -494,9 +573,11 @@ effectiveStdenv.mkDerivation {
     optionalString (runAccuracyTests || runPerformanceTests) ''
       mkdir $package_tests
       cp -R $src/samples $package_tests/
-    '' + optionalString runAccuracyTests ''
+    ''
+    + optionalString runAccuracyTests ''
       mv ./bin/*test* $package_tests/
-    '' + optionalString runPerformanceTests ''
+    ''
+    + optionalString runPerformanceTests ''
       mv ./bin/*perf* $package_tests/
     '';
 
@@ -512,62 +593,74 @@ effectiveStdenv.mkDerivation {
   # Note that ${exec_prefix} is set to $out but that $out is also appended to
   # ${exec_prefix}. This causes linker errors in downstream packages so we strip
   # of $out after the ${exec_prefix} and ${prefix} prefixes:
-  postInstall = ''
-    sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
-      "$out/lib/pkgconfig/opencv4.pc"
-    mkdir "$cxxdev"
-  ''
-  # fix deps not propagating from opencv4.cxxdev if cuda is disabled
-  # see https://github.com/NixOS/nixpkgs/issues/276691
-  + optionalString (!enableCuda) ''
-    mkdir -p "$cxxdev/nix-support"
-    echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
-  ''
-  # remove the requirement that the exact same version of CUDA is used in packages
-  # consuming OpenCV's CMakes files
-  + optionalString enableCuda ''
-    substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
-      --replace-fail \
-        'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \
-        'find_host_package(CUDA REQUIRED)' \
-      --replace-fail \
-        'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \
-        'message("OpenCV static library was compiled with CUDA'
-  ''
-  # install python distribution information, so other packages can `import opencv`
-  + optionalString enablePython ''
-    pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package
-    python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
+  postInstall =
+    ''
+      sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
+        "$out/lib/pkgconfig/opencv4.pc"
+      mkdir "$cxxdev"
+    ''
+    # fix deps not propagating from opencv4.cxxdev if cuda is disabled
+    # see https://github.com/NixOS/nixpkgs/issues/276691
+    + optionalString (!enableCuda) ''
+      mkdir -p "$cxxdev/nix-support"
+      echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
+    ''
+    # remove the requirement that the exact same version of CUDA is used in packages
+    # consuming OpenCV's CMakes files
+    + optionalString enableCuda ''
+      substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
+        --replace-fail \
+          'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \
+          'find_host_package(CUDA REQUIRED)' \
+        --replace-fail \
+          'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \
+          'message("OpenCV static library was compiled with CUDA'
+    ''
+    # install python distribution information, so other packages can `import opencv`
+    + optionalString enablePython ''
+      pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package
+      python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
 
-    pushd dist
-    python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache
+      pushd dist
+      python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache
 
-    popd
-    popd
-  '';
+      popd
+      popd
+    '';
 
-  pythonImportsCheck = [ "cv2" "cv2.sfm" ];
+  pythonImportsCheck = [
+    "cv2"
+    "cv2.sfm"
+  ];
 
   passthru = {
     cudaSupport = enableCuda;
 
-    tests = {
-      inherit (gst_all_1) gst-plugins-bad;
-    }
-    // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) {
-      inherit qimgv;
-      withIpp = opencv4.override { enableIpp = true; };
-    }
-    // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }
-    // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") {
-      opencv4-tests = callPackage ./tests.nix {
-        inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc;
-        inherit opencv4;
+    tests =
+      {
+        inherit (gst_all_1) gst-plugins-bad;
+      }
+      // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) {
+        inherit qimgv;
+        withIpp = opencv4.override { enableIpp = true; };
+      }
+      // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }
+      // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") {
+        opencv4-tests = callPackage ./tests.nix {
+          inherit
+            enableGStreamer
+            enableGtk2
+            enableGtk3
+            runAccuracyTests
+            runPerformanceTests
+            testDataSrc
+            ;
+          inherit opencv4;
+        };
+      }
+      // optionalAttrs (enableCuda) {
+        no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
       };
-    }
-    // optionalAttrs (enableCuda) {
-      no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
-    };
   } // optionalAttrs enablePython { pythonPath = [ ]; };
 
   meta = {

From 38f5f81af720dcfdfe2753bf6960b65f6d0f9266 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:00:50 -0700
Subject: [PATCH 140/156] {alsa-lib,alsa-topology-conf,alsa-ucm-conf}: fix
 build for FreeBSD

---
 pkgs/by-name/al/alsa-lib/package.nix          |  2 +-
 .../by-name/al/alsa-topology-conf/package.nix |  2 +-
 pkgs/by-name/al/alsa-ucm-conf/package.nix     | 47 ++++++++++---------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/al/alsa-lib/package.nix b/pkgs/by-name/al/alsa-lib/package.nix
index f21d216a63bb..2ae87a0533a1 100644
--- a/pkgs/by-name/al/alsa-lib/package.nix
+++ b/pkgs/by-name/al/alsa-lib/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
       "alsa"
       "alsa-topology"
     ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.freebsd;
     maintainers = with maintainers; [ l-as ];
   };
 })
diff --git a/pkgs/by-name/al/alsa-topology-conf/package.nix b/pkgs/by-name/al/alsa-topology-conf/package.nix
index 7f881bbe6a66..87cb278760da 100644
--- a/pkgs/by-name/al/alsa-topology-conf/package.nix
+++ b/pkgs/by-name/al/alsa-topology-conf/package.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
 
     license = licenses.bsd3;
     maintainers = [ maintainers.roastiek ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.freebsd;
   };
 }
diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix
index 9d727e8d21ab..ea27eed8fbc6 100644
--- a/pkgs/by-name/al/alsa-ucm-conf/package.nix
+++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix
@@ -18,31 +18,36 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontBuild = true;
 
-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    ''
+      runHook preInstall
 
-    substituteInPlace ucm2/lib/card-init.conf \
-      --replace-fail "/bin/rm" "${coreutils}/bin/rm" \
-      --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir"
+      substituteInPlace ucm2/lib/card-init.conf \
+        --replace-fail "/bin/rm" "${coreutils}/bin/rm" \
+        --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir"
 
-    files=(
-        "ucm2/HDA/HDA.conf"
-        "ucm2/codecs/rt715/init.conf"
-        "ucm2/codecs/rt715-sdca/init.conf"
-        "ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf"
-        "ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf"
-    )
+      files=(
+          "ucm2/HDA/HDA.conf"
+          "ucm2/codecs/rt715/init.conf"
+          "ucm2/codecs/rt715-sdca/init.conf"
+          "ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf"
+          "ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf"
+      )
 
-    for file in "''${files[@]}"; do
-        substituteInPlace "$file" \
-            --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe'
-    done
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      for file in "''${files[@]}"; do
+          substituteInPlace "$file" \
+              --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe'
+      done
+    ''
+    + ''
 
-    mkdir -p $out/share/alsa
-    cp -r ucm ucm2 $out/share/alsa
+      mkdir -p $out/share/alsa
+      cp -r ucm ucm2 $out/share/alsa
 
-    runHook postInstall
-  '';
+      runHook postInstall
+    '';
 
   passthru.updateScript = directoryListingUpdater {
     url = "https://www.alsa-project.org/files/pub/lib/";
@@ -59,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.roastiek ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.freebsd;
   };
 })

From f8c7dd4d0bfd5bdcca1bcbf636c81edcfbf395b6 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:01:31 -0700
Subject: [PATCH 141/156] imagemagick: Mark support for FreeBSD

---
 pkgs/applications/graphics/ImageMagick/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 9ad25b457819..f1c1f7f933be 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -204,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: {
       "ImageMagick"
       "MagickWand"
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
     maintainers = with maintainers; [
       dotlambda
       rhendric

From ef4490603d3c104ebe9c97cf1036d0140da4597e Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:02:00 -0700
Subject: [PATCH 142/156] frei0r: mark support for FreeBSD

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

diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix
index b8afe3eca36b..77df045e964d 100644
--- a/pkgs/by-name/fr/frei0r/package.nix
+++ b/pkgs/by-name/fr/frei0r/package.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     description = "Minimalist, cross-platform, shared video plugins";
     license = licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
   };
 }

From cfcdb0e1bd69f80a56eec8b5adf3734208dcb7ca Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:03:33 -0700
Subject: [PATCH 143/156] libcamera: mark as linux-only

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

diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index a26adf10b65e..b9e321fd4dcf 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -132,6 +132,7 @@ stdenv.mkDerivation rec {
     changelog = "https://git.libcamera.org/libcamera/libcamera.git/tag/?h=${src.rev}";
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ citadelcore ];
+    platforms = platforms.linux;
     badPlatforms = [
       # Mandatory shared libraries.
       lib.systems.inspect.platformPatterns.isStatic

From 4ab80fec2f91c658d4887f82579f3ae26e4100cb Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:04:16 -0700
Subject: [PATCH 144/156] libvisual: mark support for FreeBSD

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

diff --git a/pkgs/by-name/li/libvisual/package.nix b/pkgs/by-name/li/libvisual/package.nix
index 944ea60409c7..a2a559deccf2 100644
--- a/pkgs/by-name/li/libvisual/package.nix
+++ b/pkgs/by-name/li/libvisual/package.nix
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
     description = "Abstraction library for audio visualisations";
     homepage = "https://sourceforge.net/projects/libvisual/";
     license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.freebsd;
   };
 }

From 9052f5223a595a28d6e5f5aea0162776698d223e Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:04:56 -0700
Subject: [PATCH 145/156] quirc: fix build for FreeBSD

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

diff --git a/pkgs/by-name/qu/quirc/package.nix b/pkgs/by-name/qu/quirc/package.nix
index 0251561a2262..f20be686b7c1 100644
--- a/pkgs/by-name/qu/quirc/package.nix
+++ b/pkgs/by-name/qu/quirc/package.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-WLQK7vy34VmgJzppTnRjAcZoSGWVaXQSaGq9An8W0rw=";
       })
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Disable building of linux-only demos on darwin systems
+    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
+      # Disable building of linux-only demos on non-linux systems
       ./0001-Don-t-build-demos.patch
     ];
 
@@ -84,9 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Small QR code decoding library";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux ++ [
-      "x86_64-darwin"
-      "aarch64-darwin"
-    ];
+    platforms = lib.platforms.unix;
   };
 })

From 94c6912c793ee40fe11dcf06ac6c744b964a2353 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:05:48 -0700
Subject: [PATCH 146/156] socat: fix build for FreeBSD

---
 pkgs/by-name/so/socat/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix
index ea9e1f9fa238..da08ab588569 100644
--- a/pkgs/by-name/so/socat/package.nix
+++ b/pkgs/by-name/so/socat/package.nix
@@ -25,9 +25,13 @@ stdenv.mkDerivation rec {
       --replace /sbin/ifconfig ifconfig
   '';
 
-  configureFlags = lib.optionals (!stdenv.hostPlatform.isLinux) [
-    "--disable-posixmq"
-  ];
+  configureFlags =
+    lib.optionals (!stdenv.hostPlatform.isLinux) [
+      "--disable-posixmq"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+      "--disable-dccp"
+    ];
 
   buildInputs = [
     openssl

From 2138f8e870334fa7ac16ea6875e365f8855f4b6e Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:07:02 -0700
Subject: [PATCH 147/156] x265: fix build for FreeBSD

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

diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix
index ddd820c145f5..eec407eeaf1b 100644
--- a/pkgs/by-name/x2/x265/package.nix
+++ b/pkgs/by-name/x2/x265/package.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     ]
     # Clang does not support the endfunc directive so use GCC.
     ++ lib.optional (
-      stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin
+      stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
     ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc";
 
   cmakeStaticLibFlags =

From eaaea8bdc02bdb4a42897aa3ceded62ea8444d53 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:07:53 -0700
Subject: [PATCH 148/156] xavs: mark support for FreeBSD

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

diff --git a/pkgs/by-name/xa/xavs/package.nix b/pkgs/by-name/xa/xavs/package.nix
index a4116ab1f807..e136438e09c7 100644
--- a/pkgs/by-name/xa/xavs/package.nix
+++ b/pkgs/by-name/xa/xavs/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     mainProgram = "xavs";
     homepage = "https://xavs.sourceforge.net/";
     license = licenses.lgpl2;
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ codyopel ];
   };
 }

From 74c80cecbaac100d76bf1afe03f5ed5448a50e73 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 5 Mar 2025 17:54:19 -0500
Subject: [PATCH 149/156] calamares-nixos-extensions: 0.3.21 -> 0.3.22

---
 pkgs/by-name/ca/calamares-nixos-extensions/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
index fc2469c72e18..c55a3a214f1f 100644
--- a/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
+++ b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calamares-nixos-extensions";
-  version = "0.3.21";
+  version = "0.3.22";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "calamares-nixos-extensions";
     rev = finalAttrs.version;
-    hash = "sha256-txEPZ3S231g46nKN8wnMU334dMExvfRoc/SAspVJZiY=";
+    hash = "sha256-Tmp/sWQmhiZe2dmA+msCMPwPlBd1Oa3q5X+QP+CoAWI=";
   };
 
   installPhase = ''

From 5708672a33ed7984d08cb87e78cfa9f5f17c398b Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:09:02 -0700
Subject: [PATCH 150/156] ffmpeg: fix build for FreeBSD

---
 pkgs/development/libraries/ffmpeg/generic.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index fa60d9c6dc5b..650db88130ad 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -117,7 +117,7 @@
   withRav1e ? withFullDeps, # AV1 encoder (focused on speed and safety)
   withRist ? withHeadlessDeps, # Reliable Internet Stream Transport (RIST) protocol
   withRtmp ? withFullDeps, # RTMP[E] support
-  withRubberband ? withFullDeps && withGPL, # Rubberband filter
+  withRubberband ? withFullDeps && withGPL && !stdenv.hostPlatform.isFreeBSD, # Rubberband filter
   withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3, # Samba protocol
   withSdl2 ? withSmallDeps,
   withShaderc ? withFullDeps && !stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "5.0",
@@ -793,10 +793,7 @@ stdenv.mkDerivation (
         cuda_nvcc
       ]
       ++ optionals withDav1d [ dav1d ]
-      ++ optionals withDc1394 [
-        libdc1394
-        libraw1394
-      ]
+      ++ optionals withDc1394 ([ libdc1394 ] ++ (lib.optional stdenv.hostPlatform.isLinux libraw1394))
       ++ optionals withDrm [ libdrm ]
       ++ optionals withDvdnav [ libdvdnav ]
       ++ optionals withDvdread [ libdvdread ]

From 26fabe77ea5839b295fc2e22d465288a48a1ecf3 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:09:52 -0700
Subject: [PATCH 151/156] libdvdcss: mark support for FreeBSD

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

diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index eeb7330f85a5..d0195e668993 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.videolan.org/developers/libdvdcss.html";
     description = "Library for decrypting DVDs";
     license = licenses.gpl2;
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.unix;
   };
 }

From 8dd49365b599ae6b015ee2af09ba073c8a807b0d Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:10:11 -0700
Subject: [PATCH 152/156] libdvdread: mark support for FreeBSD

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

diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 07ab45310504..5daa6063932f 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Library for reading DVDs";
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.wmertens ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = lib.platforms.unix;
   };
 }

From 406efa04433b53a09a2b88a34431bbc44cf4bafa Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:11:41 -0700
Subject: [PATCH 153/156] opencv: mark support for FreeBSD

---
 pkgs/development/libraries/opencv/4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index dbb6be5efad9..264fad638389 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -668,6 +668,6 @@ effectiveStdenv.mkDerivation {
     homepage = "https://opencv.org/";
     license = if enableUnfree then lib.licenses.unfree else lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ basvandijk ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = lib.platforms.unix;
   };
 }

From f094dbd787f1590a969d74f7e43262dd72798723 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:12:38 -0700
Subject: [PATCH 154/156] openblas: enable support for x86_64-freebsd

---
 .../libraries/science/math/openblas/default.nix           | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 9ceec2d760d0..9a07f5355219 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -128,6 +128,14 @@ let
       DYNAMIC_ARCH = setDynamicArch true;
       USE_OPENMP = true;
     };
+
+    x86_64-freebsd = {
+      BINARY = 64;
+      TARGET = setTarget "ATHLON";
+      DYNAMIC_ARCH = setDynamicArch true;
+      NO_AVX512 = !enableAVX512;
+      USE_OPENMP = true;
+    };
   };
 in
 

From 84b8c066959156b1a1c408d73669592b3ab10a9c Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 5 Mar 2025 01:13:06 -0700
Subject: [PATCH 155/156] python3Packages.pycairo: mark support for FreeBSD

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

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index fe5b332d9132..b1f0e5eba83e 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
       lgpl21Only
       mpl11
     ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    platforms = platforms.unix;
   };
 }

From f21847f019c57ed1afe9776493bf0bd438e6ad31 Mon Sep 17 00:00:00 2001
From: Willi Carlsen <carlsenwilli@gmail.com>
Date: Thu, 6 Mar 2025 00:04:21 +0100
Subject: [PATCH 156/156] granted: remove withFish flag completely (#387013)

* Remove withFish flag completely

Signed-off-by: Willi Carlsen <carlsenwilli@gmail.com>

* granted: remove 'withFish' flag

Signed-off-by: Willi Carlsen <carlsenwilli@gmail.com>

---------

Signed-off-by: Willi Carlsen <carlsenwilli@gmail.com>
---
 pkgs/by-name/gr/granted/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 6eeb315d27a8..1339b6dfdcf6 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -4,9 +4,6 @@
   nix-update-script,
   versionCheckHook,
 
-  withFish ? false,
-  fish,
-
   lib,
   makeWrapper,
   xdg-utils,
@@ -75,12 +72,11 @@ buildGoModule rec {
 
       # Insert below the #!/bin/sh shebang
       echo "$addToPath" | sed "/#!\/bin\/sh/r /dev/stdin" $src/scripts/assume >> $out/bin/assume
-    ''
-    + lib.optionalString withFish ''
+
       # Install fish script
       install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
       substituteInPlace $out/share/assume.fish \
-        --replace /bin/fish ${fish}/bin/fish
+        --replace-fail "#!/bin/fish" "#!/usr/bin/env fish"
     '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];