From 52ca7ce469a1a9ee8112096f1ef47ceb34daa819 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 8 Nov 2024 22:55:33 +0100
Subject: [PATCH 01/68] python312Packages.publicsuffixlist: 1.0.2.20241102 ->
 1.0.2.20241108

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20241108-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 826e97b476c4..8802981fd3b5 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20241102";
+  version = "1.0.2.20241108";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dNnGnAybp11y8WGSvXiP0MNFRmw5TQgnrVBQGqwsDSQ=";
+    hash = "sha256-OsuirJ28KmKPnjntwXw6xrPKCX7wu/iGeeX/zIpf6qc=";
   };
 
   build-system = [ setuptools ];

From 79757ed4fce034453324a54d197c94e173b6c3b6 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 8 Nov 2024 02:55:36 +0900
Subject: [PATCH 02/68] ox: add passthru.tests.version

---
 pkgs/by-name/ox/ox/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index a9b15a7380e5..5890b1af9cd4 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, testers, ox }:
 
 rustPlatform.buildRustPackage rec {
   pname = "ox";
@@ -13,6 +13,12 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-2Jk8uDiTGUQqLOOQVlYm5R7qQXIqP0PkFvv5E5qTzT0=";
 
+  passthru = {
+    tests.version = testers.testVersion {
+      package = ox;
+    };
+  };
+
   meta = with lib; {
     description = "Independent Rust text editor that runs in your terminal";
     homepage = "https://github.com/curlpipe/ox";

From 5e9fc87458299705c0672985da0f707b8239a8cd Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 8 Nov 2024 02:56:51 +0900
Subject: [PATCH 03/68] ox: add updateScript

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

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index 5890b1af9cd4..c09d94b7c35c 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, testers, ox }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, testers, nix-update-script, ox }:
 
 rustPlatform.buildRustPackage rec {
   pname = "ox";
@@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec {
     tests.version = testers.testVersion {
       package = ox;
     };
+
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {

From 6aad62aae8a71b9f43f699406228252486914c9b Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 8 Nov 2024 02:57:47 +0900
Subject: [PATCH 04/68] ox: format with nixfmt-rfc-style

---
 pkgs/by-name/ox/ox/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix
index c09d94b7c35c..fe0728c44d47 100644
--- a/pkgs/by-name/ox/ox/package.nix
+++ b/pkgs/by-name/ox/ox/package.nix
@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, testers, nix-update-script, ox }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  testers,
+  nix-update-script,
+  ox,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "ox";

From 3a475abf3cceba9736c77aff7a625d9b7d8893de Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 12 Nov 2024 18:00:31 +0100
Subject: [PATCH 05/68] go2rtc: 1.9.6 -> 1.9.7

https://github.com/AlexxIT/go2rtc/releases/tag/v1.9.7
---
 pkgs/by-name/go/go2rtc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/go2rtc/package.nix b/pkgs/by-name/go/go2rtc/package.nix
index 6c672837b1ad..6fbac66e09e1 100644
--- a/pkgs/by-name/go/go2rtc/package.nix
+++ b/pkgs/by-name/go/go2rtc/package.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "go2rtc";
-  version = "1.9.6";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "go2rtc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Vq0w3JldUVUh4soULyWQI9D2yknkx529n4aAwhpdfdU=";
+    hash = "sha256-pxKocvnFy1XMrjQ57VAmCnavcBgVPuNqWzT0v5+pWMI=";
   };
 
   vendorHash = "sha256-N8aJmxNQ/p2ddJG9DuIVVjcgzEC6TzD0sz992h3q0RU=";

From e9ea7c2fe97467f593ca9dc11075e32ade60cecc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 14 Nov 2024 10:11:56 +0100
Subject: [PATCH 06/68] python312Packages.identify: 2.6.1 -> 2.6.2

Diff: https://github.com/pre-commit/identify/compare/refs/tags/v2.6.1...v2.6.2
---
 pkgs/development/python-modules/identify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index a04317e4ed9e..250b546cf9c5 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "2.6.1";
+  version = "2.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "pre-commit";
     repo = "identify";
     rev = "refs/tags/v${version}";
-    hash = "sha256-EbJiMTDE9eumhkWTXlcB38rHrX5DPAZdqix2H4ocnkE=";
+    hash = "sha256-6sKnHsVLkwHy2udd8znqiFFMfWnmWTxTU949X4bqLNU=";
   };
 
   build-system = [ setuptools ];

From bf608e22be37b62071c44f2c05d5d615988a0250 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Nov 2024 22:03:11 +0000
Subject: [PATCH 07/68] composer-require-checker: 4.13.0 -> 4.14.0

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

diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index 4e83f0fc8d9f..5d2ca96d1389 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -5,16 +5,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "composer-require-checker";
-  version = "4.13.0";
+  version = "4.14.0";
 
   # Upstream no longer provides the composer.lock in their release artifact
   src = fetchgit {
     url = "https://github.com/maglnet/ComposerRequireChecker";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-xq8W5SXwtmJ3uu5g26/rxL02jqBuxvEEQpwazPdCE5Y=";
+    hash = "sha256-dBUDkgbuUBKA3MKB4fxwHhDoT9wYRl49m/2ZCvIcNMM=";
   };
 
-  vendorHash = "sha256-GGT/9kBpd7PU/pMJFWw1rrEW2QFUlrp3lljUCyo+/bw=";
+  vendorHash = "sha256-JNdSek3f3WEtJQHjSV+HF6b8l9eZvbI0n4g3UUUVja4=";
 
   meta = {
     description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies";

From 33021e5d338d1c5117582959a4c2cbcd5fab6f0a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 15 Nov 2024 09:45:50 +0100
Subject: [PATCH 08/68] invidious: format

---
 pkgs/by-name/in/invidious/package.nix | 40 +++++++++++++++++----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index a52d431a1ce9..4a7d9de5d579 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -1,14 +1,15 @@
-{ lib
-, callPackage
-, crystal
-, fetchFromGitHub
-, librsvg
-, pkg-config
-, libxml2
-, openssl
-, shards
-, sqlite
-, nixosTests
+{
+  lib,
+  callPackage,
+  crystal,
+  fetchFromGitHub,
+  librsvg,
+  pkg-config,
+  libxml2,
+  openssl,
+  shards,
+  sqlite,
+  nixosTests,
 
   # All versions, revisions, and checksums are stored in ./versions.json.
   # The update process is the following:
@@ -19,7 +20,7 @@
   #     but nix's sandboxing does not allow that)
   #   * if shard.lock changed
   #     * recreate shards.nix by running crystal2nix
-, versions ? lib.importJSON ./versions.json
+  versions ? lib.importJSON ./versions.json,
 }:
 let
   # normally video.js is downloaded at build time
@@ -75,8 +76,15 @@ crystal.buildCrystalPackage rec {
           --replace-fail 'Process.run(%(rsvg-convert' 'Process.run(%(${lib.getBin librsvg}/bin/rsvg-convert'
     '';
 
-  nativeBuildInputs = [ pkg-config shards ];
-  buildInputs = [ libxml2 openssl sqlite ];
+  nativeBuildInputs = [
+    pkg-config
+    shards
+  ];
+  buildInputs = [
+    libxml2
+    openssl
+    sqlite
+  ];
 
   format = "crystal";
   shardsFile = ./shards.nix;
@@ -114,7 +122,9 @@ crystal.buildCrystalPackage rec {
   '';
 
   passthru = {
-    tests = { inherit (nixosTests) invidious; };
+    tests = {
+      inherit (nixosTests) invidious;
+    };
     updateScript = ./update.sh;
   };
 

From 6e266cd41623dc3f72a589c6474fbb652ecca15d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 15 Nov 2024 09:58:55 +0100
Subject: [PATCH 09/68] invidious: clean derivation

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

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index 4a7d9de5d579..6157e59d01da 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -34,7 +34,7 @@ crystal.buildCrystalPackage rec {
     owner = "iv-org";
     repo = "invidious";
     fetchSubmodules = true;
-    rev = versions.invidious.rev or "v${version}";
+    rev = versions.invidious.rev or "refs/tags/v${version}";
     inherit (versions.invidious) hash;
   };
 
@@ -128,12 +128,12 @@ crystal.buildCrystalPackage rec {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open source alternative front-end to YouTube";
     mainProgram = "invidious";
     homepage = "https://invidious.io/";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
       _999eagle
       GaetanLepage
       sbruder

From 966b40728fdbe48bc8281e0733ef0eff1b25214c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Nov 2024 11:07:03 +0100
Subject: [PATCH 10/68] python312Packages.slack-sdk: 3.33.2 -> 3.33.3

Diff: https://github.com/slackapi/python-slack-sdk/compare/refs/tags/v3.33.2...v3.33.3

Changelog: https://github.com/slackapi/python-slack-sdk/releases/tag/v3.33.3
---
 pkgs/development/python-modules/slack-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index 9a6bafea9c9d..9273bb331b80 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "slack-sdk";
-  version = "3.33.2";
+  version = "3.33.3";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "slackapi";
     repo = "python-slack-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6Uvp7hVFgHVavJO6Un5L793pOOOBtaT4+eywS3rRWUU=";
+    hash = "sha256-ewNEo8kcxdrd6mVze/UbKdnTIIf59s7OnMP42St1www=";
   };
 
   postPatch = ''

From aa4a06fba4967e52c7e0672af4a0cc3bf0253c79 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Sun, 9 Jun 2024 13:29:32 -0400
Subject: [PATCH 11/68] bisq2: init at 2.1.2

---
 pkgs/by-name/bi/bisq2/package.nix | 169 ++++++++++++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 pkgs/by-name/bi/bisq2/package.nix

diff --git a/pkgs/by-name/bi/bisq2/package.nix b/pkgs/by-name/bi/bisq2/package.nix
new file mode 100644
index 000000000000..3c3283fef71c
--- /dev/null
+++ b/pkgs/by-name/bi/bisq2/package.nix
@@ -0,0 +1,169 @@
+{
+  stdenvNoCC,
+  lib,
+  makeWrapper,
+  runtimeShell,
+  fetchurl,
+  makeDesktopItem,
+  copyDesktopItems,
+  imagemagick,
+  jdk23,
+  dpkg,
+  writeShellScript,
+  bash,
+  tor,
+  zip,
+  gnupg,
+}:
+
+let
+  version = "2.1.2";
+
+  jdk = jdk23.override { enableJavaFX = true; };
+
+  bisq-launcher =
+    args:
+    writeShellScript "bisq-launcher" ''
+      # This is just a comment to convince Nix that Tor is a
+      # runtime dependency; The Tor binary is in a *.jar file,
+      # whereas Nix only scans for hashes in uncompressed text.
+      # ${lib.getExe' tor "tor"}
+
+      rm -fR $HOME/.local/share/Bisq2/tor
+
+      exec "${lib.getExe jdk}" -Djpackage.app-version=@version@ -classpath @out@/lib/app/desktop-app-launcher.jar:@out@/lib/app/* ${args} bisq.desktop_app_launcher.DesktopAppLauncher "$@"
+    '';
+
+  # A given release will be signed by either Alejandro Garcia or Henrik Jannsen
+  # as indicated in the file
+  # https://github.com/bisq-network/bisq2/releases/download/v${version}/signingkey.asc
+  publicKey =
+    {
+      "E222AA02" = fetchurl {
+        url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/E222AA02.asc";
+        sha256 = "sha256-31uBpe/+0QQwFyAsoCt1TUWRm0PHfCFOGOx1M16efoE=";
+      };
+
+      "387C8307" = fetchurl {
+        url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/387C8307.asc";
+        sha256 = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI=";
+      };
+    }
+    ."387C8307";
+in
+stdenvNoCC.mkDerivation rec {
+  inherit version;
+
+  pname = "bisq2";
+
+  src = fetchurl {
+    url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
+    sha256 = "0zgv70xlz3c9mrwmiaa1dgagbc441ppk2vrkgard8zjrvk8rg7va";
+
+    # Verify the upstream Debian package prior to extraction.
+    # See https://bisq.wiki/Bisq_2#Installation
+    # This ensures that a successful build of this Nix package requires the Debian
+    # package to pass verification.
+    nativeBuildInputs = [ gnupg ];
+    downloadToTemp = true;
+
+    postFetch = ''
+      pushd $(mktemp -d)
+      export GNUPGHOME=./gnupg
+      mkdir -m 700 -p $GNUPGHOME
+      ln -s $downloadedFile ./Bisq-${version}.deb
+      ln -s ${signature} ./signature.asc
+      gpg --import ${publicKey}
+      gpg --batch --verify signature.asc Bisq-${version}.deb
+      popd
+      mv $downloadedFile $out
+    '';
+  };
+
+  signature = fetchurl {
+    url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
+    sha256 = "sha256-WZhI8RDmb7nQqpCQJM86vrp8qQNg+mvRVdSPcDqgzxE=";
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    dpkg
+    imagemagick
+    makeWrapper
+    zip
+    gnupg
+    makeWrapper
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "bisq2";
+      exec = "bisq2";
+      icon = "bisq2";
+      desktopName = "Bisq 2";
+      genericName = "Decentralized bitcoin exchange";
+      categories = [
+        "Network"
+        "P2P"
+      ];
+    })
+
+    (makeDesktopItem {
+      name = "bisq2-hidpi";
+      exec = "bisq2-hidpi";
+      icon = "bisq2";
+      desktopName = "Bisq 2 (HiDPI)";
+      genericName = "Decentralized bitcoin exchange";
+      categories = [
+        "Network"
+        "P2P"
+      ];
+    })
+  ];
+
+  unpackPhase = ''
+    dpkg -x $src .
+  '';
+
+  buildPhase = ''
+    # Replace the Tor binary embedded in tor.jar (which is in the zip archive tor.zip)
+    # with the Tor binary from Nixpkgs.
+
+    makeWrapper ${lib.getExe' tor "tor"} ./tor
+    zip tor.zip ./tor
+    zip opt/bisq2/lib/app/tor.jar tor.zip
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib $out/bin
+    cp -r opt/bisq2/lib/app $out/lib
+
+    install -D -m 777 ${bisq-launcher ""} $out/bin/bisq2
+    substituteAllInPlace $out/bin/bisq2
+
+    install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq2-hidpi
+    substituteAllInPlace $out/bin/bisq2-hidpi
+
+    for n in 16 24 32 48 64 96 128 256; do
+      size=$n"x"$n
+      magick convert opt/bisq2/lib/Bisq2.png -resize $size bisq2.png
+      install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq2.png
+    done;
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Decentralized bitcoin exchange network";
+    homepage = "https://bisq.network";
+    mainProgram = "bisq2";
+    sourceProvenance = with sourceTypes; [
+      binaryBytecode
+    ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ emmanuelrosa ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

From 98a9f147e1dc312f373f271c1af4494a94ed2be6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 08:55:44 +0100
Subject: [PATCH 12/68] python312Packages.slack-bolt: 1.20.1 -> 1.21.2

Diff: https://github.com/slackapi/bolt-python/compare/refs/tags/v1.20.1...v1.21.2

Changelog: https://github.com/slackapi/bolt-python/releases/tag/v1.21.2
---
 .../python-modules/slack-bolt/default.nix     | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix
index 9b533254b46f..55b844655944 100644
--- a/pkgs/development/python-modules/slack-bolt/default.nix
+++ b/pkgs/development/python-modules/slack-bolt/default.nix
@@ -10,7 +10,6 @@
   falcon,
   fastapi,
   fetchFromGitHub,
-  fetchpatch,
   flask,
   flask-sockets,
   gunicorn,
@@ -33,32 +32,23 @@
 
 buildPythonPackage rec {
   pname = "slack-bolt";
-  version = "1.20.1";
+  version = "1.21.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "slackapi";
     repo = "bolt-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wDiRQ44ei59I8/2JXv2j9VQFthdyS7sSEZLS7trhdp0=";
+    hash = "sha256-4zEg60f3wtLnzrZU4mZMJmF6hO0EiHDTx6iw4WDsx0U=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "pytest-runner==5.2" ""
+    substituteInPlace pyproject.toml \
+      --replace-fail '"pytest-runner==5.2",' ""
   '';
 
-  patches = [
-    # moto >=5 support, https://github.com/slackapi/bolt-python/pull/1046
-    (fetchpatch {
-      name = "moto-support.patch";
-      url = "https://github.com/slackapi/bolt-python/commit/69c2015ef49773de111f184dca9668aefac9e7c0.patch";
-      hash = "sha256-KW7KPeOqanV4n1UOv4DCadplJsqsPY+ju4ry0IvUqpA=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [ slack-sdk ];

From b5d0e590f60660589f9c8e457bce03efcef389a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 09:10:15 +0100
Subject: [PATCH 13/68] =?UTF-8?q?python312Packages.identify:=20u=C3=BCdate?=
 =?UTF-8?q?=20disabled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 250b546cf9c5..2de402aef215 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   version = "2.6.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "pre-commit";

From 4edd859ac9e357f5bbf63e95e5f0830ae91aa288 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 09:12:44 +0100
Subject: [PATCH 14/68] sqlmap: 1.8.9 -> 1.8.11

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

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index f7632133b545..987f04dbdc9a 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.8.9";
+  version = "1.8.11";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0ARkSUzmrqyRSPl3EXU7NzcnaWf+Zbt4zQZ626gvfEs=";
+    hash = "sha256-um1s5vqiaTRxTDIlyd4wbi/u239K5EtLFspc2QdPWOQ=";
   };
 
   postPatch = ''

From cc935c8f583e2c2436c8baf6ac59b440b68f8482 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 09:51:38 +0100
Subject: [PATCH 15/68] exploitdb: 2024-10-02 -> 2024-11-16

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2024-10-02...2024-11-16
---
 pkgs/by-name/ex/exploitdb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 68c8aab57a42..91ae39a73c64 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2024-10-02";
+  version = "2024-11-16";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-uNFBMZ6pk/xT6OZMb8EKax141lc+uumQl3xbihFMYAI=";
+    hash = "sha256-49xG3mVh5M9MfK4WuU3rc9Q+QlZo7IyV3jwAdBUEmu0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 6e0e40c92ef3ddceef827a86c7ff825c0c68143e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Nov 2024 13:55:26 +0100
Subject: [PATCH 16/68] python312Packages.hishel: 0.0.33 -> 0.1.1

Diff: https://github.com/karpetrosyan/hishel/compare/refs/tags/0.0.33...0.1.1

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

diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix
index f997fba130ac..5d1c0ba0a67e 100644
--- a/pkgs/development/python-modules/hishel/default.nix
+++ b/pkgs/development/python-modules/hishel/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "hishel";
-  version = "0.0.33";
+  version = "0.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "karpetrosyan";
     repo = "hishel";
     rev = "refs/tags/${version}";
-    hash = "sha256-zi+13X7u2pk9w2EoYjfl3/Y8O5hHpA0wZx3sSv2vU6U=";
+    hash = "sha256-V8QiBnOz5l/vjTFf9gKjxth4YsGCYuADlbwiWc7VFds=";
   };
 
   build-system = [

From a3b4688866b8fb15a995667374aa2b3beb588294 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 09:05:58 +0100
Subject: [PATCH 17/68] python312Packages.hishel: update disabled

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

diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix
index 5d1c0ba0a67e..a2e079169e1e 100644
--- a/pkgs/development/python-modules/hishel/default.nix
+++ b/pkgs/development/python-modules/hishel/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   version = "0.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "karpetrosyan";

From 9204a583f5d6df2049b7243cf0ac7d4bfeb9af87 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 10:13:54 +0100
Subject: [PATCH 18/68] pdm: relax hishel

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

diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index a7b7f26f17a9..b8b43dc9f7f3 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -22,6 +22,8 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-xgwIPHlTtmgCNN4R6/BJsqmI9hbA0wFAiq4YCa+r/UM=";
   };
 
+  pythonRelaxDeps = [ "hishel" ];
+
   nativeBuildInputs = [ installShellFiles ];
 
   build-system = with python3.pkgs; [

From c1c764fc53a0c2b18e9f58639ef7837b07096967 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 10:36:10 +0100
Subject: [PATCH 19/68] greenmask: 0.2.0 -> 0.2.3

Diff: https://github.com/GreenmaskIO/greenmask/compare/refs/tags/v0.2.0...v0.2.3

Changelog: https://github.com/GreenmaskIO/greenmask/releases/tag/v0.2.3
---
 pkgs/by-name/gr/greenmask/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix
index bec5628c9960..53dadf66516d 100644
--- a/pkgs/by-name/gr/greenmask/package.nix
+++ b/pkgs/by-name/gr/greenmask/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "greenmask";
-  version = "0.2.0";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "GreenmaskIO";
     repo = "greenmask";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ouDYXXlmvLRuR6ATUAk2Gn9toTVxRwQY1CgMyQUN/B0=";
+    hash = "sha256-wAYkr6vCqRQIfZaK31/NSluZZbZYGN5QJkLgdubEGoM=";
   };
 
-  vendorHash = "sha256-M7HcTQp4pzfSLvyCiV/loqqprKM1B93LOr4wxOVoHjk=";
+  vendorHash = "sha256-D4XMEFi0uk6ogdo6+G1k/g16QpHynB1OjdoGcY2fSds=";
 
   subPackages = [ "cmd/greenmask/" ];
 

From 979730f4bdc674ce2d3a125e5c68e92e550466e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 10:39:50 +0100
Subject: [PATCH 20/68] python312Packages.google-cloud-workstations: 0.5.9 ->
 0.5.10

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

diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix
index ffcfcb48ca0f..33c37a19a97f 100644
--- a/pkgs/development/python-modules/google-cloud-workstations/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-workstations";
-  version = "0.5.9";
+  version = "0.5.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_workstations";
     inherit version;
-    hash = "sha256-9bxYupNFRYenfGUOOAeeWIIkUEh3o9umnMzijXesQyE=";
+    hash = "sha256-EKrD1erP904vC/OljY9jm2KMvA3IhL3puxxcPJPPzvg=";
   };
 
   build-system = [ setuptools ];

From cbacaa74f7ce69f4086752f345dccf2c7f32a5ff Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 10:40:36 +0100
Subject: [PATCH 21/68] python312Packages.google-cloud-workflows: 1.15.0 ->
 1.15.1

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

diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix
index 8ce558e29d4e..24af64cab5cf 100644
--- a/pkgs/development/python-modules/google-cloud-workflows/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-workflows";
-  version = "1.15.0";
+  version = "1.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_workflows";
     inherit version;
-    hash = "sha256-rR3VbImKo4Vk0TxQeEUCy3faAnH74os0nN0sTs0DPyw=";
+    hash = "sha256-FrYsxhvLIFb8+b1LdlB9xs0mMoKKbTDBW5paeEim9Wk=";
   };
 
   build-system = [ setuptools ];

From 66f339638a148d6b4d55fd2da5459eb1916e7b27 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 10:41:07 +0100
Subject: [PATCH 22/68] python312Packages.google-cloud-webrisk: 1.15.0 ->
 1.15.1

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

diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
index 97f5ced69221..8c673acff1e6 100644
--- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix
+++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-webrisk";
-  version = "1.15.0";
+  version = "1.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_webrisk";
     inherit version;
-    hash = "sha256-7nTkIgAfn7c9XGJFnq7fNRExNV4Kfdjv4Trrc+nRW6k=";
+    hash = "sha256-x6UVAIaJkuUtRvuj7yVa3dCnqbzfTcOiX+U/oywuyGA=";
   };
 
   build-system = [ setuptools ];

From 5f696a26214b1127a81b585f554361f30d0a458c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 10:41:36 +0100
Subject: [PATCH 23/68] python312Packages.google-cloud-vpc-access: 1.11.0 ->
 1.11.1

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

diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
index 20ce956e2cf2..09f5f8629841 100644
--- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-vpc-access";
-  version = "1.11.0";
+  version = "1.11.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_vpc_access";
     inherit version;
-    hash = "sha256-WtgnMVuQHXSpSKSP9mRT9gXkjszF/bOjcdiJlxFUZiE=";
+    hash = "sha256-V7sTx337AT3e6rCmC2gdLpGgEWh5RxdoFMWL47LSq5E=";
   };
 
   build-system = [ setuptools ];

From 7f0b8190dfa3c669c8782c738dc762a777f23efe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 10:42:50 +0100
Subject: [PATCH 24/68] python312Packages.google-cloud-shell: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix
index 21a97ef6593f..aea6744cfd5e 100644
--- a/pkgs/development/python-modules/google-cloud-shell/default.nix
+++ b/pkgs/development/python-modules/google-cloud-shell/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-shell";
-  version = "1.10.0";
+  version = "1.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_shell";
     inherit version;
-    hash = "sha256-xhwDKKtksCVXrLEiefPg6aYgWZlNZ2QYFs1AmBIJNjw=";
+    hash = "sha256-JgKBwyQ/KlLqtQtvpjal7+3IT7oS6HHmIsZ/amIEFRk=";
   };
 
   build-system = [ setuptools ];

From 7ca25724fc58dfde5ab0027d8bc8b096dfadd631 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 11:27:09 +0100
Subject: [PATCH 25/68] python312Packages.rzpipe: 0.6.0 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix
index 3238a062980c..bce20efed4d4 100644
--- a/pkgs/development/python-modules/rzpipe/default.nix
+++ b/pkgs/development/python-modules/rzpipe/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "rzpipe";
-  version = "0.6.0";
+  version = "0.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-py4oiNp+WUcOGHn2AdHyIpgV8BsI8A1gtJi2joi1Wxc=";
+    hash = "sha256-KKqPFMGgsmiYZ0tXTIhhvhLDfm/iV8JcYeVc4akezYc=";
   };
 
   build-system = [ setuptools ];

From 9d038c3494d9f149d433b5b29511adb25db5401d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 11:36:37 +0100
Subject: [PATCH 26/68] python312Packages.aiosql: 12.2 -> 13.0

Diff: https://github.com/nackjicholson/aiosql/compare/refs/tags/12.2...13.0

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

diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix
index 415eeaeb271e..f70c95060269 100644
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiosql";
-  version = "12.2";
+  version = "13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "nackjicholson";
     repo = "aiosql";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ouk1bzoczkUeYG0JKOgleLuyu9ll2y17AN7gsUI3SRo=";
+    hash = "sha256-WvYCMImLrQjaTrMgDrkF1fOUv/pxbwFHT+SwOZkTMl0=";
   };
 
   sphinxRoot = "docs/source";

From e218d13e0304ef5ec084ca08bd09da5a2779b85f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 12:10:30 +0100
Subject: [PATCH 27/68] python312Packages.coinmetrics-api-client: 2024.10.15.19
 -> 2024.10.31.17

---
 .../python-modules/coinmetrics-api-client/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index cff80702d5fa..942372b2f4e0 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2024.10.15.19";
+  version = "2024.10.31.17";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-TNpF8OihU0Z/mAUF/5hxpZgaqIBRUfX7zhwZAKd7OEo=";
+    hash = "sha256-TFs71py2BonLGGJB0RoqYEOIRSEcB+eiHv8w3b0m8xU=";
   };
 
   pythonRelaxDeps = [ "typer" ];

From d5ef44e3bcd84c9f2b47397d359fe5384a776b2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 12:21:13 +0100
Subject: [PATCH 28/68] python312Packages.eve: 2.1.0 -> 2.2.0

Diff: https://github.com/pyeve/eve/compare/refs/tags/v2.1.0...v2.2.0

Changelog: https://github.com/pyeve/eve/blob/v2.2.0/CHANGES.rst
---
 .../python-modules/eve/default.nix            | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index ef664651a542..0e25f3a12115 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -1,51 +1,50 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
-  flask,
-  events,
-  pymongo,
-  simplejson,
   cerberus,
+  events,
+  fetchFromGitHub,
+  flask,
+  pymongo,
+  pythonOlder,
   setuptools,
+  simplejson,
 }:
 
 buildPythonPackage rec {
   pname = "eve";
-  version = "2.1.0";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "Eve";
-    hash = "sha256-NobIzu+7+NI7M4NRQKjrhye3v6YGMeGnbDRB39b3Dy8=";
-  };
+  version = "2.2.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
+  src = fetchFromGitHub {
+    owner = "pyeve";
+    repo = "eve";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-BLDuJLAN6ieaD7vBPV6AwlpPqbAyb+LzEp9AfCHveSY=";
+  };
+
+  pythonRelaxDeps = [ "events" ];
+
+  build-system = [ setuptools ];
+
   propagatedBuildInputs = [
     cerberus
     events
     flask
     pymongo
     simplejson
-    setuptools
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "events>=0.3,<0.4" "events>=0.3"
-  '';
-
   pythonImportsCheck = [ "eve" ];
 
-  # tests call a running mongodb instance
+  # Tests call a running mongodb instance
   doCheck = false;
 
   meta = with lib; {
-    homepage = "https://python-eve.org/";
     description = "Open source Python REST API framework designed for human beings";
+    homepage = "https://python-eve.org/";
     changelog = "https://github.com/pyeve/eve/blob/v${version}/CHANGES.rst";
     license = licenses.bsd3;
     maintainers = [ ];

From 16a95b742bd5527c5e333dc71374fd0fb198e324 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 12:24:12 +0100
Subject: [PATCH 29/68] python312Packages.google-cloud-automl: 2.14.0 -> 2.14.1

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

diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index e78652373f0c..63f5463f31a0 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-automl";
-  version = "2.14.0";
+  version = "2.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_automl";
     inherit version;
-    hash = "sha256-CpVwnxU1DAdU7VGY1LjkOlv5ki2ZxlA0sWd9vsR5rkI=";
+    hash = "sha256-APghvmZPVcscmm1y6BfFPk6QfGovn5Q1KxPTe08mHKM=";
   };
 
   build-system = [ setuptools ];

From faed846ea0571b1e157e649cf5b6a036c128c027 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 12:25:15 +0100
Subject: [PATCH 30/68] python312Packages.google-cloud-asset: 3.27.0 -> 3.27.1

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

diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index f692306f62d8..d0ec91a1a553 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-asset";
-  version = "3.27.0";
+  version = "3.27.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_asset";
     inherit version;
-    hash = "sha256-AuFuc3Qu1N2iWtNlYKhNQX2ETwjLB2e8ydrGO9ozR+E=";
+    hash = "sha256-bQgmutEMH4Zsg0HBIiY7rPHNtMhwiFhtX9hFOm3iKGQ=";
   };
 
   build-system = [ setuptools ];

From 0c5a46e2645108d551f4062bb2295be0004d45d3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 14:18:52 +0100
Subject: [PATCH 31/68] python312Packages.env-canada: add defusedxml

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

diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix
index d2424a76c004..ce07ef171e1f 100644
--- a/pkgs/development/python-modules/env-canada/default.nix
+++ b/pkgs/development/python-modules/env-canada/default.nix
@@ -2,6 +2,7 @@
   lib,
   aiohttp,
   buildPythonPackage,
+  defusedxml,
   fetchFromGitHub,
   geopy,
   imageio,
@@ -33,6 +34,7 @@ buildPythonPackage rec {
 
   dependencies = [
     aiohttp
+    defusedxml
     geopy
     imageio
     lxml

From 4fc04feb4687dc6bf46570d3be0f1972ff6df130 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:17:07 +0100
Subject: [PATCH 32/68] python312Packages.google-cloud-artifact-registry:
 1.12.0 -> 1.13.1

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

diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
index c67815b9d7ab..3e313d3ba0db 100644
--- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
+++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-artifact-registry";
-  version = "1.12.0";
+  version = "1.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_artifact_registry";
     inherit version;
-    hash = "sha256-XuPps4IBJxIfF+9qmqDYzZDw3BOrZeVUznk/3af33XQ=";
+    hash = "sha256-wbr6WfuA9n94DK/B0OKS8PrnP1tiCRORKGXtDv6vU0Q=";
   };
 
   build-system = [ setuptools ];

From 724da8eedf9c2dcb13a578e1b7d6a99a46f2fd31 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:18:42 +0100
Subject: [PATCH 33/68] python312Packages.google-cloud-bigquery-datatransfer:
 3.16.0 -> 3.17.1

Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-datatransfer-v3.17.1/packages/google-cloud-bigquery-datatransfer/CHANGELOG.md
---
 .../google-cloud-bigquery-datatransfer/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 384dcd6d0edd..b1ba4627e594 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-datatransfer";
-  version = "3.16.0";
+  version = "3.17.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_bigquery_datatransfer";
     inherit version;
-    hash = "sha256-EyYdNDLDmIPyBZ9zYLASahS0gUrJ9SXhdjokKKWZ4lU=";
+    hash = "sha256-Djqvlyo1JvP+to+/xpvSHZ4J0yQ3jF4ardlAxcusIxg=";
   };
 
   build-system = [ setuptools ];

From 7fe9179fe69d635b1575ebf596bc59118c4f5da0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:19:39 +0100
Subject: [PATCH 34/68] python312Packages.google-cloud-bigtable: 2.26.0 ->
 2.27.0

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

diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index fe8e5f496360..796ca1c504c5 100644
--- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigtable";
-  version = "2.26.0";
+  version = "2.27.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_bigtable";
     inherit version;
-    hash = "sha256-g88QrbMzNISzme+uWk0kEhfBiFxj/bmwTCaTAXYrGLc=";
+    hash = "sha256-pqIZgoO9fRHkPD+Ydnqa9DeJs4mvhadhoFsI/dn1e6s=";
   };
 
   build-system = [ setuptools ];

From 58fafd520355ccb214ddea7915159048781741ff Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:22:48 +0100
Subject: [PATCH 35/68] python312Packages.google-cloud-compute: 1.20.0 ->
 1.22.0

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

diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix
index 83e5ae9ea3d9..07df31429b67 100644
--- a/pkgs/development/python-modules/google-cloud-compute/default.nix
+++ b/pkgs/development/python-modules/google-cloud-compute/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-compute";
-  version = "1.20.0";
+  version = "1.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_compute";
     inherit version;
-    hash = "sha256-q32xYqLCWV+tpJKgBnAV3DDjWCxPFOTtbMdDNyHIcp0=";
+    hash = "sha256-U4ryl/WiFBMzao4yzLqGkNMV3kxvCaR2O6mKqYtw5hg=";
   };
 
   build-system = [ setuptools ];

From 303980d7296ac2f0fa311c07b3d2b63f624d5a0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:23:26 +0100
Subject: [PATCH 36/68] python312Packages.google-cloud-container: 2.53.0 ->
 2.54.0

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

diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 218d0fe52c0c..424053fa7b95 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "2.53.0";
+  version = "2.54.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_container";
     inherit version;
-    hash = "sha256-vgvcpw8DrBwRbpVkywpNYZGXagpNhV2BO9+CSt1LFVA=";
+    hash = "sha256-aa+4zenNMYiTAdpwxEEpFghoaT9hmRzdAEszfbnsFcQ=";
   };
 
   build-system = [ setuptools ];

From a89eb6479d99ef2a70c6ce0a7d0f6fdbdc8b4d08 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:26:49 +0100
Subject: [PATCH 37/68] python312Packages.google-cloud-vision: 3.8.0 -> 3.8.1

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

diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index 354a822af121..2555fd5c184a 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-vision";
-  version = "3.8.0";
+  version = "3.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_vision";
     inherit version;
-    hash = "sha256-WRydHKJjCPEFV/0LH+zOuqemUZn3Ant33HMRggQAcgs=";
+    hash = "sha256-dcf5wiGZumY86n1sEZPVpyrB5eIhU0aoUq8TPOacT18=";
   };
 
   build-system = [ setuptools ];

From 9d8bc9bf3d3bd82e41663fe24bdae4b2accb71bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:27:34 +0100
Subject: [PATCH 38/68] python312Packages.google-cloud-videointelligence:
 2.13.5 -> 2.14.1

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

diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index 835a80491cd0..6e5e8d2a3439 100644
--- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-videointelligence";
-  version = "2.13.5";
+  version = "2.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_videointelligence";
     inherit version;
-    hash = "sha256-cpx3TA+1Ukr8rsRjN7lGCI2qWu2RoOLhXwA1TXw7+KM=";
+    hash = "sha256-w0d4YvbhtUsQB0gZQ6SXTNKeDRIuc92BDNQUrfdh9Ow=";
   };
 
   build-system = [ setuptools ];

From 8870b762fdff156c552a1a3d484ee0955bdd4178 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:29:07 +0100
Subject: [PATCH 39/68] python312Packages.google-cloud-translate: 3.16.0 ->
 3.18.0

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

diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index ef1a3925b957..b730f018d3f5 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
-  version = "3.16.0";
+  version = "3.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_translate";
     inherit version;
-    hash = "sha256-B5fZVMT26gcyKelQASugg6TMl1K0MdwGJOJZTih0ae8=";
+    hash = "sha256-v7/54cMaDbbO12h+s0Jg5FGgMJh83QP3fb/LyYjt82E=";
   };
 
   build-system = [ setuptools ];

From ba663fc4429b7871cca8b0e0bb982bb4caedcee0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:31:31 +0100
Subject: [PATCH 40/68] python312Packages.google-cloud-trace: 1.13.5 -> 1.14.1

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

diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix
index 18f08c81820e..4768f0268027 100644
--- a/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-trace";
-  version = "1.13.5";
+  version = "1.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_trace";
     inherit version;
-    hash = "sha256-aJVMHEriU29cw3RzbQZc6WNwi9NcnZXvNuiz1L8HxqI=";
+    hash = "sha256-GXak86/llk1RftQKhjY4fjRNiXFMliZsryByneEczQQ=";
   };
 
   build-system = [ setuptools ];

From 5beb1e0bdc22d806b8be07c792cfac786a1609df Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:32:11 +0100
Subject: [PATCH 41/68] python312Packages.google-cloud-texttospeech: 2.18.0 ->
 2.21.1

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

diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 8164ebb27137..15f416ad28cb 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-texttospeech";
-  version = "2.18.0";
+  version = "2.21.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_texttospeech";
     inherit version;
-    hash = "sha256-jR91d6b4btSDNeEIFGgCYeKXbaVIiMih1YYETuGRlvQ=";
+    hash = "sha256-nfDiywBfleDpHZ8Av2GhIuS0xyyNiG8PJ7a3/ZEVx+w=";
   };
 
   build-system = [ setuptools ];

From 7db96d1c33047d875825dec9caae38baf268bcb0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:33:17 +0100
Subject: [PATCH 42/68] python312Packages.google-cloud-tasks: 2.17.0 -> 2.17.1

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

diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 22e3c2454ade..513bc1045a87 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-tasks";
-  version = "2.17.0";
+  version = "2.17.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_tasks";
     inherit version;
-    hash = "sha256-5tcJsIrzsXO2w/uA/wK2bi1ZVPkulNVHTYCzA4R6OME=";
+    hash = "sha256-FkQVslby22oSOrQiJ7Fk7Y4lkXhZgkoIj28lYPR6q+E=";
   };
 
   build-system = [ setuptools ];

From 0f09d1887c3e519101e3111fee2b7e205a518661 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:34:09 +0100
Subject: [PATCH 43/68] python312Packages.google-cloud-speech: 2.28.0 -> 2.28.1

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

diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index 443d3ebb48b0..83c8fd07707c 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "2.28.0";
+  version = "2.28.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_speech";
     inherit version;
-    hash = "sha256-cGvKg647ru1cz1HM+7BkIqyUTPfjepPdm/KygwXqdEU=";
+    hash = "sha256-hGYZC7PUH6Yg7Cztw9F8bb6AMMDtbWn/wScMR4gcVSQ=";
   };
 
   build-system = [ setuptools ];

From 5cf33dab3331241ce86a0cc73ec9141253c798cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:36:13 +0100
Subject: [PATCH 44/68] python312Packages.google-cloud-spanner: 3.49.1 ->
 3.50.1

Diff: https://github.com/googleapis/python-spanner/compare/refs/tags/v3.49.1...v3.50.1

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

diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index da4dbf120eb1..1260c41a1690 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-spanner";
-  version = "3.49.1";
+  version = "3.50.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "googleapis";
     repo = "python-spanner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KwANiuzVyqsz+KKTqNPM1WftuoMtUXRI8xbIdAzZF+s=";
+    hash = "sha256-eRCu+CwzJmhixN7VkLZkvlBEe9PMiSDtAIoyktdgN3M=";
   };
 
   build-system = [ setuptools ];

From 254864fc686bfd38731354533a85d033045d0a1e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:37:58 +0100
Subject: [PATCH 45/68] python312Packages.google-cloud-pubsub: 2.25.0 -> 2.27.1

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

diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index df1d6704dacb..c54d2bf0ee9e 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.25.0";
+  version = "2.27.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_pubsub";
     inherit version;
-    hash = "sha256-Kg/RYQDBbHE3Q45G1M42y++kvXnPk8h3aruf3oPPWQQ=";
+    hash = "sha256-cRnbxa9LkV7N+hKJkZ95GkMpJ+qqe7++t0Dm1wIMGB4=";
   };
 
   build-system = [ setuptools ];

From 8b67f6f5aa9791872ba1c778883bc1239a507c7a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:38:46 +0100
Subject: [PATCH 46/68] python312Packages.google-cloud-os-config: 1.18.0 ->
 1.18.1

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

diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index a7ab5c1aec0e..6b78fbb9aae2 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-os-config";
-  version = "1.18.0";
+  version = "1.18.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_os_config";
     inherit version;
-    hash = "sha256-Xx83zfz+zBUtlZKGqO4gBbRmy/8F1TE5AvizqHEIF7M=";
+    hash = "sha256-lDSUK3Xieuqn+rdqw4Jy1naGjIuJrtxLckSHa1ytXNY=";
   };
 
   build-system = [ setuptools ];

From 7e8448344d5ee3ef46fedb7a1a9f850d515cbde2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:39:21 +0100
Subject: [PATCH 47/68] python312Packages.google-cloud-network-connectivity:
 2.5.0 -> 2.5.1

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

diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
index e36b0cc2fab3..9c6782662931 100644
--- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
+++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-network-connectivity";
-  version = "2.5.0";
+  version = "2.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "google_cloud_network_connectivity";
-    hash = "sha256-+qCSCQJCsmtRtyEu6m9TnOa40bZGKISw/7+yHUMSXD0=";
+    hash = "sha256-n/E8kTwQrs/sdP9I374ieVc1CDt72a3rg+60Kf6TEqk=";
   };
 
   build-system = [ setuptools ];

From e70b04fc9743279425ffa9d04fd7d4187f10f587 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:40:07 +0100
Subject: [PATCH 48/68] python312Packages.google-cloud-netapp: 0.3.14 -> 0.3.16

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

diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix
index 4fd68969054e..5e0ce1abde1b 100644
--- a/pkgs/development/python-modules/google-cloud-netapp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-netapp";
-  version = "0.3.14";
+  version = "0.3.16";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_netapp";
     inherit version;
-    hash = "sha256-XjhNY4YG51+9OTZBj3jivgA2Del7RafXCIE/ATtyqWE=";
+    hash = "sha256-INSBGr5IslKzhmzWy+8zuncATFkldPh9QzGl6ddC9IY=";
   };
 
   build-system = [ setuptools ];

From 4ca42def5f7eb26acc180e115484855b8dc42ab5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:41:07 +0100
Subject: [PATCH 49/68] python312Packages.google-cloud-monitoring: 2.22.2 ->
 2.23.1

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

diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index ff4f7bb7ed49..a0c3e24f7575 100644
--- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-monitoring";
-  version = "2.22.2";
+  version = "2.23.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_monitoring";
     inherit version;
-    hash = "sha256-n8ItrEjRTdHH+4PuSlT3pXv5hS7mtcncqeO7CTsEx+4=";
+    hash = "sha256-I5qrBa3ILAaKbMTlSGiK1e9I7q1jDJ/R1K/QkOCeJvA=";
   };
 
   build-system = [ setuptools ];

From f079c812e0bb9a918290e48922bcd0f5b94253db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:41:42 +0100
Subject: [PATCH 50/68] python312Packages.google-cloud-language: 2.14.0 ->
 2.15.1

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

diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 6571959153dd..ddafee39b091 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-language";
-  version = "2.14.0";
+  version = "2.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_language";
     inherit version;
-    hash = "sha256-BeXnoiGavnq9TvUaMpzFy7ZMMd0CS9U3LZ+iv2GVF6k=";
+    hash = "sha256-HGHHFbAkxbOWmF7N7qr6CLhldiag3WjQKGq/WD2Ox5Q=";
   };
 
   build-system = [ setuptools ];

From ceb44177d5cabc4374a38148b53f084416f43724 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Nov 2024 16:44:23 +0100
Subject: [PATCH 51/68] python312Packages.google-cloud-resource-manager: 1.13.0
 -> 1.13.1

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

diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index 5ae9acb7e4bd..cf959cba4ee7 100644
--- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-resource-manager";
-  version = "1.13.0";
+  version = "1.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_resource_manager";
     inherit version;
-    hash = "sha256-rkv2lEPxSzcAfU2EFQEVsJQuiwFlD9eh/G/03Bdg5cQ=";
+    hash = "sha256-vuny+x2FZzEYK3zAWYDSFqroSJR8za3yhIosZMzWu+o=";
   };
 
   build-system = [ setuptools ];

From 683a41fcb27886dfc78259c068521e64d5fd6002 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 16 Nov 2024 15:55:45 +0000
Subject: [PATCH 52/68] koboldcpp: 1.77 -> 1.78

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.78
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.77...v1.78
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 40cc23278ea7..7a99f2e62392 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -53,13 +53,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.77";
+  version = "1.78";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-dyu//4LRjpdxkyA9M5yNDO0DA7inZZjH4pSkj6l2afk=";
+    hash = "sha256-6RvodNWO/IVGlKxC/zt0itYDzymhk+hEBpbmQ1jHigU=";
   };
 
   enableParallelBuilding = true;

From 7e91f3884709d42cf385ca851afa4cf178240fc3 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sat, 16 Nov 2024 19:34:57 +0100
Subject: [PATCH 53/68] phlare: format using nixfmt

---
 pkgs/by-name/ph/phlare/package.nix | 31 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ph/phlare/package.nix b/pkgs/by-name/ph/phlare/package.nix
index b1290953a852..57145610ffdb 100644
--- a/pkgs/by-name/ph/phlare/package.nix
+++ b/pkgs/by-name/ph/phlare/package.nix
@@ -1,4 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   pname = "phlare";
@@ -14,17 +18,20 @@ buildGoModule rec {
   proxyVendor = true;
   vendorHash = "sha256-l7+iDT9GAP9BX+xKvnx57iVF8wCM1YyHwq6dD9PbTDI=";
 
-  ldflags = let
-    prefix = "github.com/grafana/phlare/pkg/util/build";
-  in [
-    "-s" "-w"
-    # https://github.com/grafana/phlare/blob/v0.6.1/Makefile#L32
-    "-X ${prefix}.Version=${version}"
-    "-X ${prefix}.Branch=v${version}"
-    "-X ${prefix}.Revision=v${version}"
-    "-X ${prefix}.BuildUser=nix"
-    "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z"
-  ];
+  ldflags =
+    let
+      prefix = "github.com/grafana/phlare/pkg/util/build";
+    in
+    [
+      "-s"
+      "-w"
+      # https://github.com/grafana/phlare/blob/v0.6.1/Makefile#L32
+      "-X ${prefix}.Version=${version}"
+      "-X ${prefix}.Branch=v${version}"
+      "-X ${prefix}.Revision=v${version}"
+      "-X ${prefix}.BuildUser=nix"
+      "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z"
+    ];
 
   subPackages = [
     "cmd/phlare"

From 7cc6a148e8c59c199497425ced46501053ce8082 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sat, 16 Nov 2024 19:41:25 +0100
Subject: [PATCH 54/68] phlare: fix build

---
 pkgs/by-name/ph/phlare/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phlare/package.nix b/pkgs/by-name/ph/phlare/package.nix
index 57145610ffdb..96c1a33fa74b 100644
--- a/pkgs/by-name/ph/phlare/package.nix
+++ b/pkgs/by-name/ph/phlare/package.nix
@@ -1,10 +1,11 @@
 {
   lib,
-  buildGoModule,
+  buildGo122Module,
   fetchFromGitHub,
 }:
-
-buildGoModule rec {
+# breaks in go 1.23 with `invalid reference to runtime.aeskeysched`
+# won't be fixed upstream since the repository is archived.
+buildGo122Module rec {
   pname = "phlare";
   version = "0.6.1";
 

From 2b669d9ae524a364f4b2c7ce05e23fe1a0e6f713 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sat, 16 Nov 2024 09:58:55 -0800
Subject: [PATCH 55/68] libtorrent: nixfmt

---
 pkgs/by-name/li/libtorrent/package.nix | 29 +++++++++++++++-----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 3f3e5a40ea46..97affd79850c 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -1,16 +1,17 @@
 # Note: this is rakshasa's version of libtorrent, used mainly by rtorrent.
 # *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc.
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoconf-archive
-, autoreconfHook
-, cppunit
-, libsigcxx
-, openssl
-, pkg-config
-, zlib
-, gitUpdater
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
+  cppunit,
+  libsigcxx,
+  openssl,
+  pkg-config,
+  zlib,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
@@ -45,7 +46,11 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/rakshasa/libtorrent";
     description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ];
+    maintainers = with lib.maintainers; [
+      ebzzry
+      codyopel
+      thiagokokada
+    ];
     platforms = lib.platforms.unix;
   };
 }

From 3fa636bc15ebdb84ac2a0c479ea412ae90cce860 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sat, 16 Nov 2024 09:59:11 -0800
Subject: [PATCH 56/68] libtorrent: fix cross-compilation

The configure script for libtorrent will attempt to compile and run a
small program during the build, which won't work when we are building
with a compiler that produces a program that won't run natively on the
build platform.
---
 pkgs/by-name/li/libtorrent/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 97affd79850c..14198f003bbd 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  configureFlags = [ "--enable-aligned=yes" ];
+
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   enableParallelBuilding = true;

From 23dc8b38e12710af6b0ad1425515e6c9de1b02a4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Nov 2024 05:45:18 +0100
Subject: [PATCH 57/68] python312Packages.google-cloud-appengine-logging: 1.4.5
 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
index 0aa83d81b55a..6c0dee2d5a9d 100644
--- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-appengine-logging";
-  version = "1.4.5";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_appengine_logging";
     inherit version;
-    hash = "sha256-3n12bl1nsZ/Fgzl0tQWzLSpbvfsoP9lB4yDnz9rky4M=";
+    hash = "sha256-OaLfaU2XmB7QDvXfVB98/MqSCpJJZwdVfysHu3up1no=";
   };
 
   build-system = [ setuptools ];

From 4789705239a1c7e6a5c3caadb701f2e9ae580f74 Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Sat, 16 Nov 2024 22:00:06 +0100
Subject: [PATCH 58/68] luckybackup: support wayland

qt.qpa.plugin: Could not find the Qt platform plugin "wayland" in ""
This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
---
 pkgs/by-name/lu/luckybackup/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/lu/luckybackup/package.nix b/pkgs/by-name/lu/luckybackup/package.nix
index 7fe889178cf7..a50ed3c58e1c 100644
--- a/pkgs/by-name/lu/luckybackup/package.nix
+++ b/pkgs/by-name/lu/luckybackup/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     rsync
     openssh
+    qt5.qtwayland
   ];
 
   strictDeps = true;

From 9799fcd3ed58ee33f3be7385ed22d7009034a4a3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 16 Nov 2024 16:20:13 -0600
Subject: [PATCH 59/68] jujutsu: skip a flaky test

A user reported that there was nothing available in the binary cache for
`aarch64-linux` for the latest release, and some investigation turned up that
the runners ran into a flaky test that was fixed recently.

For simplicity (and so that we don't have to backport the upstream patch), skip
this test. The feature works perfectly fine, it is only the test itself that
is buggy.

This should be removed next month after the 0.24.0 release.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/by-name/ju/jujutsu/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 6e9a9f534e26..7c9d024cecd3 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -77,6 +77,14 @@ rustPlatform.buildRustPackage {
     "jj-cli"
   ];
 
+  checkFlags = [
+    # flaky test fixed upstream in 0.24+; the actual feature works reliably,
+    # it's just a false caching issue inside the test. skip it to allow the
+    # binary cache to be populated. https://github.com/martinvonz/jj/issues/4784
+    "--skip"
+    "test_shallow_commits_lack_parents"
+  ];
+
   env = {
     # Disable vendored libraries.
     ZSTD_SYS_USE_PKG_CONFIG = "1";

From 307090125f11e30c44a3572e53ac7c10613e8550 Mon Sep 17 00:00:00 2001
From: Ian Kerins <git@isk.haus>
Date: Sat, 16 Nov 2024 20:59:04 -0500
Subject: [PATCH 60/68] nixos/postgresql: fix warning typo

---
 nixos/modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index b4df05d2fe62..004e8130ad6e 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -492,7 +492,7 @@ in
         mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version.";
         mkWarn = ver: warn ''
           The postgresql package is not pinned and selected automatically by
-          `systemd.stateVersion`. Right now this is `pkgs.postgresql_${ver}`, the
+          `system.stateVersion`. Right now this is `pkgs.postgresql_${ver}`, the
           oldest postgresql version available and thus the next that will be
           removed when EOL on the next stable cycle.
 

From 235d103ff746707f3c799c429b8b9947e26ee3ec Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Wed, 23 Oct 2024 21:58:20 +1100
Subject: [PATCH 61/68] nixos/clatd: add enableNetworkManagerIntegration option

---
 nixos/modules/services/networking/clatd.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nixos/modules/services/networking/clatd.nix b/nixos/modules/services/networking/clatd.nix
index 09f7fdfb6e9e..376f62cb888d 100644
--- a/nixos/modules/services/networking/clatd.nix
+++ b/nixos/modules/services/networking/clatd.nix
@@ -13,6 +13,11 @@ in
 
       package = lib.mkPackageOption pkgs "clatd" { };
 
+      enableNetworkManagerIntegration = lib.mkEnableOption "NetworkManager integration" // {
+        default = config.networking.networkmanager.enable;
+        defaultText = "config.networking.networkmanager.enable";
+      };
+
       settings = lib.mkOption {
         type = lib.types.submodule ({ name, ... }: {
           freeformType = settingsFormat.type;
@@ -75,5 +80,17 @@ in
         ];
       };
     };
+
+    networking.networkmanager.dispatcherScripts = cfg.enableNetworkManagerIntegration [
+      {
+        type = "basic";
+        # https://github.com/toreanderson/clatd/blob/master/scripts/clatd.networkmanager
+        source = pkgs.writeShellScript "restart-clatd" ''
+          [ "$DEVICE_IFACE" = "clat" ] && exit 0
+          [ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
+          ${pkgs.systemd}/bin/systemctl restart clatd.service
+        '';
+      }
+    ];
   };
 }

From a2337e4f6c23dbebe63dc2de4c998f4f2b8d1526 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Wed, 23 Oct 2024 23:08:33 +1100
Subject: [PATCH 62/68] nixos/spiped: use systemctl restart during activation

As is common with other networking services, stopIfChanged=true (the default) can cause O(seconds) downtime during activation.

Reduce this downtime by disabling stopIfChanged as done in:
* sshd https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix#L569
* tailscale https://github.com/NixOS/nixpkgs/pull/170210
---
 nixos/modules/services/networking/spiped.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix
index a5188d933995..09d8156d1c51 100644
--- a/nixos/modules/services/networking/spiped.nix
+++ b/nixos/modules/services/networking/spiped.nix
@@ -186,6 +186,7 @@ in
         Restart   = "always";
         User      = "spiped";
       };
+      stopIfChanged = false;
 
       scriptArgs = "%i";
       script = "exec ${pkgs.spiped}/bin/spiped -F `cat /etc/spiped/$1.spec`";

From 46e0588bfc4c90bc65cd7e9a8fb79ed9d8a691fb Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Sun, 17 Nov 2024 09:55:01 +0000
Subject: [PATCH 63/68] texlive.bin.dvisvgm: compile with ttfautohint (#355525)

---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index c65aceae112b..99f807593319 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, fetchpatch, buildPackages
 , texlive
 , zlib, libiconv, libpng, libX11
-, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
+, freetype, ttfautohint, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
 , perl, perlPackages, python3Packages, pkg-config, cmake, ninja
 , libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr, mupdf-headless
 , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash
@@ -355,6 +355,7 @@ dvisvgm = stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-manpage" # man pages are provided by the doc container
+    "--with-ttfautohint"
   ];
 
   # PDF handling requires mutool (from mupdf) since Ghostscript 10.01
@@ -364,7 +365,7 @@ dvisvgm = stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ core brotli ghostscript zlib freetype woff2 potrace xxHash mupdf-headless ];
+  buildInputs = [ core brotli ghostscript zlib freetype ttfautohint woff2 potrace xxHash mupdf-headless ];
 
   enableParallelBuilding = true;
 };

From 837ed96b9748a8576ea99c3845cc00947ec075fa Mon Sep 17 00:00:00 2001
From: Dmitry Ivankov <boltzmannrain@gmail.com>
Date: Sun, 17 Nov 2024 10:56:29 +0100
Subject: [PATCH 64/68] rmapi: 0.25 -> 0.0.27.1 and switching to a maintained
 fork (#355090)

Current version is outdated and falls behind server API:
```console
$ rmapi
ERROR: 2024/11/10 23:41:20 main.go:77: failed to build documents tree, last error: request failed with status 410
```

https://github.com/juruen/rmapi repo is archived
https://github.com/ddvk/rmapi looks like a viable fork

This fork and version bump is suggested in
https://www.reddit.com/r/RemarkableTablet/comments/1flzmqq/rmapi_error/
https://github.com/ddvk/rmapi/issues/5
---
 pkgs/by-name/rm/rmapi/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix
index c995fdcad389..a5632bad1180 100644
--- a/pkgs/by-name/rm/rmapi/package.nix
+++ b/pkgs/by-name/rm/rmapi/package.nix
@@ -2,23 +2,23 @@
 
 buildGoModule rec {
   pname = "rmapi";
-  version = "0.0.25";
+  version = "0.0.27.1";
 
   src = fetchFromGitHub {
-    owner = "juruen";
+    owner = "ddvk";
     repo = "rmapi";
     rev = "v${version}";
-    sha256 = "sha256-7pwCd9tey7w5B8UgsMLHegPqmmY1prLM+Sk9o42X9lY=";
+    sha256 = "sha256-nwGTBCzA9+J3S3Gd3YgwCWAj/gMcoS19awluDZWZCbU=";
   };
 
-  vendorHash = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg=";
+  vendorHash = "sha256-5m3/XFyBEWM8UB3WylkBj+QWI5XsnlVD4K3BhKVVCB4=";
 
   doCheck = false;
 
   meta = with lib; {
     description = "Go app that allows access to the ReMarkable Cloud API programmatically";
-    homepage = "https://github.com/juruen/rmapi";
-    changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/ddvk/rmapi";
+    changelog = "https://github.com/ddvk/rmapi/blob/v${version}/CHANGELOG.md";
     license = licenses.agpl3Only;
     maintainers = [ maintainers.nickhu ];
     mainProgram = "rmapi";

From e13831335ff7f0e85f16e8354b2da0edd99af4e6 Mon Sep 17 00:00:00 2001
From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 17 Nov 2024 16:11:54 +0530
Subject: [PATCH 65/68] treewide: stdenv.is -> stdenv.hostPlatform.is (#356363)

* treewide: stdenv.is -> stdenv.hostPlatform.is

* treewide: nixfmt due to ci error
---
 nixos/lib/qemu-common.nix                     |  2 +-
 pkgs/applications/radio/sdrangel/default.nix  | 86 ++++++++++---------
 .../science/misc/root/default.nix             |  2 +-
 .../rust/build-rust-package/default.nix       |  2 +-
 pkgs/by-name/al/almo/package.nix              |  2 +-
 pkgs/by-name/ar/arti/package.nix              |  4 +-
 pkgs/by-name/ba/backrest/package.nix          |  2 +-
 pkgs/by-name/bi/binsider/package.nix          |  4 +-
 pkgs/by-name/bi/bitwarden-desktop/package.nix |  2 +-
 pkgs/by-name/ca/cargo-tauri/test-app.nix      |  2 +-
 pkgs/by-name/ch/chatd/package.nix             |  2 +-
 pkgs/by-name/co/conserve/package.nix          |  2 +-
 pkgs/by-name/co/copycat/package.nix           |  2 +-
 pkgs/by-name/cy/cyrus-imapd/package.nix       |  4 +-
 pkgs/by-name/du/dut/package.nix               |  2 +-
 pkgs/by-name/en/ente-cli/package.nix          |  2 +-
 .../er/erlang-language-platform/package.nix   |  7 +-
 pkgs/by-name/ex/exo/package.nix               |  2 +-
 pkgs/by-name/fi/fido2-manage/package.nix      | 18 ++--
 pkgs/by-name/ga/gapcast/package.nix           |  2 +-
 pkgs/by-name/gm/gmt/package.nix               |  6 +-
 pkgs/by-name/go/gomanagedocker/package.nix    |  4 +-
 pkgs/by-name/im/imhex/package.nix             | 50 ++++++-----
 pkgs/by-name/in/intelli-shell/package.nix     |  2 +-
 pkgs/by-name/ka/kando/package.nix             | 12 +--
 pkgs/by-name/kt/kty/package.nix               |  2 +-
 pkgs/by-name/ku/kubetui/package.nix           |  2 +-
 pkgs/by-name/la/LAStools/package.nix          |  2 +-
 pkgs/by-name/li/lilv/package.nix              |  4 +-
 pkgs/by-name/ls/lsof/package.nix              |  4 +-
 pkgs/by-name/lu/luaformatter/package.nix      |  2 +-
 .../matrix-authentication-service/package.nix |  2 +-
 pkgs/by-name/mi/misskey/package.nix           |  2 +-
 pkgs/by-name/mk/mkuimage/package.nix          |  2 +-
 pkgs/by-name/nc/nchat/package.nix             |  2 +-
 pkgs/by-name/nc/ncmpcpp/package.nix           |  2 +-
 pkgs/by-name/ni/nix-serve/package.nix         |  2 +-
 pkgs/by-name/nu/numbat/package.nix            |  2 +-
 pkgs/by-name/op/openvi/package.nix            |  2 +-
 .../ot/otel-desktop-viewer/package.nix        |  2 +-
 pkgs/by-name/pa/packetry/package.nix          |  2 +-
 pkgs/by-name/pd/pdfarranger/package.nix       |  4 +-
 pkgs/by-name/po/positron-bin/package.nix      |  2 +-
 pkgs/by-name/q2/q2pro/package.nix             |  6 +-
 pkgs/by-name/ra/rainfrog/package.nix          |  2 +-
 pkgs/by-name/rq/rqbit/package.nix             |  6 +-
 pkgs/by-name/sa/sasquatch/package.nix         |  2 +-
 pkgs/by-name/sc/scopehal-apps/package.nix     |  8 +-
 pkgs/by-name/si/sioyek/package.nix            |  2 +-
 pkgs/by-name/sn/snakemake/package.nix         |  2 +-
 pkgs/by-name/sq/sql-studio/package.nix        |  2 +-
 pkgs/by-name/sq/sqruff/package.nix            |  2 +-
 pkgs/by-name/st/styluslabs-write/package.nix  |  2 +-
 pkgs/by-name/sw/swim/package.nix              |  2 +-
 pkgs/by-name/te/termscp/package.nix           |  2 +-
 pkgs/by-name/ve/veryl/package.nix             |  2 +-
 pkgs/by-name/wr/wrangler/package.nix          |  4 +-
 pkgs/by-name/x4/x4/package.nix                |  2 +-
 pkgs/by-name/zv/zvbi/package.nix              |  2 +-
 .../elm/packages/node/node-composition.nix    |  2 +-
 pkgs/development/compilers/smlnj/default.nix  |  2 +-
 .../compilers/swift/swiftpm/default.nix       |  4 +-
 pkgs/development/interpreters/gauche/boot.nix |  2 +-
 .../libraries/capstone/default.nix            |  2 +-
 .../libraries/librasterlite2/default.nix      |  2 +-
 .../libraries/physics/geant4/default.nix      |  2 +-
 .../libraries/qt-5/modules/qtbase.nix         |  2 +-
 pkgs/development/libraries/qt-5/qtModule.nix  |  2 +-
 .../development/libraries/unicorn/default.nix |  2 +-
 pkgs/development/lua-modules/overrides.nix    |  2 +-
 .../python-modules/arviz/default.nix          |  2 +-
 .../python-modules/berkeleydb/default.nix     |  2 +-
 .../python-modules/botorch/default.nix        |  2 +-
 .../python-modules/cleanvision/default.nix    |  2 +-
 .../python-modules/dbf/default.nix            |  2 +-
 .../python-modules/hf-transfer/default.nix    |  2 +-
 .../jaraco-functools/default.nix              |  2 +-
 .../python-modules/mss/default.nix            |  4 +-
 .../python-modules/pillow/default.nix         |  2 +-
 .../python-modules/polars/default.nix         |  2 +-
 .../pydantic-extra-types/default.nix          |  2 +-
 .../pyvirtualdisplay/default.nix              |  4 +-
 pkgs/development/web/cypress/default.nix      | 14 +--
 pkgs/servers/pleroma/default.nix              |  2 +-
 pkgs/servers/web-apps/jitsi-meet/default.nix  |  2 +-
 pkgs/tools/backup/bacula/default.nix          |  2 +-
 pkgs/tools/backup/restic/default.nix          |  2 +-
 .../tools/misc/lighthouse-steamvr/default.nix |  2 +-
 pkgs/tools/typesetting/tex/texlive/bin.nix    |  2 +-
 pkgs/top-level/all-packages.nix               |  4 +-
 90 files changed, 203 insertions(+), 194 deletions(-)

diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix
index f1e19c5b3b72..30d2d095aa27 100644
--- a/nixos/lib/qemu-common.nix
+++ b/nixos/lib/qemu-common.nix
@@ -57,7 +57,7 @@ rec {
       throwUnsupportedGuestSystem = guestMap:
         throw "Unsupported guest system ${guestSystem} for host ${hostSystem}, supported: ${lib.concatStringsSep ", " (lib.attrNames guestMap)}";
     in
-    if hostStdenv.isLinux then
+    if hostStdenv.hostPlatform.isLinux then
       linuxHostGuestMatrix.${guestSystem} or "${qemuPkg}/bin/qemu-kvm"
     else
       let
diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index 9b9d6f29bce6..170173c3bc39 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -69,48 +69,50 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    airspy
-    airspyhf
-    aptdec
-    boost
-    cm256cc
-    codec2
-    dab_lib
-    dsdcc
-    faad2
-    ffmpeg
-    fftwFloat
-    flac
-    glew
-    hackrf
-    hidapi
-    libbladeRF
-    libiio
-    libopus
-    libpulseaudio
-    libusb1
-    limesuite
-    mbelib
-    opencv4
-    qt5compat
-    qtcharts
-    qtdeclarative
-    qtlocation
-    qtmultimedia
-    qtscxml
-    qtserialport
-    qtspeech
-    qttools
-    qtwebsockets
-    qtwebengine
-    rtl-sdr
-    serialdv
-    sgp4
-    soapysdr-with-plugins
-    uhd
-    zlib
-  ] ++ lib.optionals stdenv.isLinux [ qtwayland ] ++ lib.optionals withSDRplay [ sdrplay ];
+  buildInputs =
+    [
+      airspy
+      airspyhf
+      aptdec
+      boost
+      cm256cc
+      codec2
+      dab_lib
+      dsdcc
+      faad2
+      ffmpeg
+      fftwFloat
+      flac
+      glew
+      hackrf
+      hidapi
+      libbladeRF
+      libiio
+      libopus
+      libpulseaudio
+      libusb1
+      limesuite
+      mbelib
+      opencv4
+      qt5compat
+      qtcharts
+      qtdeclarative
+      qtlocation
+      qtmultimedia
+      qtscxml
+      qtserialport
+      qtspeech
+      qttools
+      qtwebsockets
+      qtwebengine
+      rtl-sdr
+      serialdv
+      sgp4
+      soapysdr-with-plugins
+      uhd
+      zlib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals withSDRplay [ sdrplay ];
 
   cmakeFlags = [
     "-DAPT_DIR=${aptdec}"
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index b3fc3e152511..91450bcab748 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -230,7 +230,7 @@ stdenv.mkDerivation rec {
 
   # workaround for
   # https://github.com/root-project/root/issues/14778
-  env.NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "--version-script,${writeText "version.map" "ROOT { global: *; };"}";
+  env.NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "--version-script,${writeText "version.map" "ROOT { global: *; };"}";
 
   # To use the debug information on the fly (without installation)
   # add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format)
diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 6e8d13415dea..0b77df55ba72 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -104,7 +104,7 @@ assert useSysroot -> !(args.doCheck or true);
 
 stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "cargoLock" ]) // lib.optionalAttrs useSysroot {
   RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
-} // lib.optionalAttrs (stdenv.isDarwin && buildType == "debug") {
+} // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
   RUSTFLAGS =
     "-C split-debuginfo=packed "
     + lib.optionalString useSysroot "--sysroot ${sysroot} "
diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix
index 00764f5301a7..706492caa853 100644
--- a/pkgs/by-name/al/almo/package.nix
+++ b/pkgs/by-name/al/almo/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   makeFlags = [ "all" ];
 
   # remove darwin-only linker flag on linux
-  postPatch = lib.optionalString (!stdenv.isDarwin) ''
+  postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     substituteInPlace scripts/pybind.sh \
       --replace-fail " -undefined dynamic_lookup" ""
   '';
diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix
index 0fdb1f50115e..de353715cde6 100644
--- a/pkgs/by-name/ar/arti/package.nix
+++ b/pkgs/by-name/ar/arti/package.nix
@@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =
     [ sqlite ]
-    ++ lib.optionals stdenv.isLinux [ openssl ]
-    ++ lib.optionals stdenv.isDarwin (
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
       [
         CoreServices
diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index a989c6cb1fc4..25cc308ed240 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -51,7 +51,7 @@ buildGoModule {
         [
           "TestServeIndex" # Fails with handler returned wrong content encoding
         ]
-        ++ lib.optionals stdenv.isDarwin [
+        ++ lib.optionals stdenv.hostPlatform.isDarwin [
           "TestBackup" # relies on ionice
         ];
     in
diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix
index 74b5b0e38e42..644982af14fe 100644
--- a/pkgs/by-name/bi/binsider/package.nix
+++ b/pkgs/by-name/bi/binsider/package.nix
@@ -18,9 +18,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-EGqoHMkBPIhKV/PozArQ62bH/Gqc92S6ZabTjmIbQeE=";
 
-  buildNoDefaultFeatures = !stdenv.isLinux;
+  buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux;
 
-  buildInputs = lib.optionals stdenv.isDarwin (
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;
     [
       AppKit
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 45eccf132c23..8f3947caa5cb 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -167,7 +167,7 @@ in buildNpmPackage rec {
 
     mkdir $out
 
-    pushd apps/desktop/dist/linux-${lib.optionalString stdenv.isAarch64 "arm64-"}unpacked
+    pushd apps/desktop/dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked
     mkdir -p $out/opt/Bitwarden
     cp -r locales resources{,.pak} $out/opt/Bitwarden
     popd
diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index d387b2fb6aa6..d931063ac09e 100644
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [ openssl ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       glib-networking
       libayatana-appindicator
       webkitgtk_4_1
diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix
index 28a3f6d5cf3e..fa8b090c740c 100644
--- a/pkgs/by-name/ch/chatd/package.nix
+++ b/pkgs/by-name/ch/chatd/package.nix
@@ -34,7 +34,7 @@ buildNpmPackage rec {
     makeWrapper
     electron
     pkg-config
-  ] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs
+  ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; # for onnx libs
 
   buildInputs = [
     (lib.getLib stdenv.cc.cc) # for libstdc++.so, required by onnxruntime
diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix
index 1707321d1057..1d7de926c551 100644
--- a/pkgs/by-name/co/conserve/package.nix
+++ b/pkgs/by-name/co/conserve/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE=";
 
-  buildInputs = lib.optionals (stdenv.isDarwin) [
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
     darwin.apple_sdk.frameworks.Security
   ];
 
diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix
index 2fc4fb8fd31b..3771d9067f37 100644
--- a/pkgs/by-name/co/copycat/package.nix
+++ b/pkgs/by-name/co/copycat/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-oNX1MUpOjRG02FHOU7zpktLAYKu/1+R2d96jC/VA0co=";
 
-  buildInputs = lib.optionals (stdenv.isDarwin) [
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [
     darwin.apple_sdk_11_0.frameworks.AppKit
   ];
 
diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
index 860eaf162016..a2400278d8c8 100644
--- a/pkgs/by-name/cy/cyrus-imapd/package.nix
+++ b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       bison
       libsrs2
     ]
-    ++ lib.optionals stdenv.isLinux [ libcap ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ]
     ++ lib.optionals (enableHttp || enableCalalarmd || enableJMAP) [
       brotli.dev
       libical.dev
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
           cyrus_sasl
         ]
         # Darwin doesn't have libuuid, try to build without it
-        ++ lib.optional (!stdenv.isDarwin) libuuid;
+        ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid;
       imapLibs = managesieveLibs ++ [ pcre2 ];
       mkLibsString = lib.strings.concatMapStringsSep " " (l: "-L${lib.getLib l}/lib");
     in
diff --git a/pkgs/by-name/du/dut/package.nix b/pkgs/by-name/du/dut/package.nix
index 9557adfbe5a5..a1e08751a0d4 100644
--- a/pkgs/by-name/du/dut/package.nix
+++ b/pkgs/by-name/du/dut/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = lib.platforms.all;
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
     description = "A disk usage calculator for Linux";
     homepage = "https://codeberg.org/201984/dut";
     license = lib.licenses.gpl3;
diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix
index b35152a3daaa..1ee112580fea 100644
--- a/pkgs/by-name/en/ente-cli/package.nix
+++ b/pkgs/by-name/en/ente-cli/package.nix
@@ -62,7 +62,7 @@ buildGoModule {
 
   passthru = {
     # only works on linux, see comment above about ENTE_CLI_SECRETS_PATH on darwin
-    tests.version = lib.optionalAttrs stdenv.isLinux (
+    tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (
       testers.testVersion {
         package = ente-cli;
         command = ''
diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix
index 533ca17ee677..d03d858b1e8e 100644
--- a/pkgs/by-name/er/erlang-language-platform/package.nix
+++ b/pkgs/by-name/er/erlang-language-platform/package.nix
@@ -5,9 +5,12 @@
   autoPatchelfHook,
 }:
 let
-  arch = if stdenv.isAarch64 then "aarch64" else "x86_64";
+  arch = if stdenv.hostPlatform.isAarch64 then "aarch64" else "x86_64";
   release =
-    if stdenv.isDarwin then "macos-${arch}-apple-darwin" else "linux-${arch}-unknown-linux-gnu";
+    if stdenv.hostPlatform.isDarwin then
+      "macos-${arch}-apple-darwin"
+    else
+      "linux-${arch}-unknown-linux-gnu";
 
   hashes = {
     linux-aarch64-unknown-linux-gnu = "sha256-vWMrq/uFU/uyuDnsxZK0ZyvtraVCZwvGjzO1a5QjR8g=";
diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix
index 332bc4ac17bc..feddf544e7b9 100644
--- a/pkgs/by-name/ex/exo/package.nix
+++ b/pkgs/by-name/ex/exo/package.nix
@@ -63,7 +63,7 @@ python3Packages.buildPythonApplication {
   ];
 
   # Tests require `mlx` which is not supported on linux.
-  doCheck = stdenv.isDarwin;
+  doCheck = stdenv.hostPlatform.isDarwin;
 
   passthru = {
     updateScript = unstableGitUpdater {
diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix
index 19038a03d353..08cfd6a6e0d5 100644
--- a/pkgs/by-name/fi/fido2-manage/package.nix
+++ b/pkgs/by-name/fi/fido2-manage/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       pkg-config
       cmake
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       copyDesktopItems
       imagemagick
     ];
@@ -60,12 +60,12 @@ stdenv.mkDerivation rec {
       openssl
       zlib
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       xterm
       udev
       pcsclite
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libuv
       libsolv
       libcouchbase
@@ -80,23 +80,23 @@ stdenv.mkDerivation rec {
       substituteInPlace ./src/libfido2.pc.in \
         --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@"
     ''
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace ./CMakeLists.txt \
         --replace-fail "/\''${CMAKE_INSTALL_LIBDIR}" "/lib"
     '';
 
   postInstall =
-    lib.optionalString stdenv.isLinux ''
+    lib.optionalString stdenv.hostPlatform.isLinux ''
       install $src/fido2-manage.sh $out/bin/fido2-manage
       magick ${icon} -background none -gravity center -extent 512x512 token2.png
       install -Dm444 token2.png $out/share/icons/hicolor/512x512/apps/token2.png
       install $src/gui.py $out/bin/fido2-manage-gui
     ''
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       install $src/fido2-manage-mac.sh $out/bin/fido2-manage
     '';
 
-  desktopItems = lib.optionals stdenv.isLinux [
+  desktopItems = lib.optionals stdenv.hostPlatform.isLinux [
     (makeDesktopItem rec {
       desktopName = "Fido2 Manager";
       name = "fido2-manage";
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
         --replace-fail "./fido2-manage.sh" "fido2-manage" \
         --replace-fail "awk" "${gawk}/bin/awk"
     ''
-    + lib.optionalString stdenv.isLinux ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
       substituteInPlace $out/bin/fido2-manage-gui \
         --replace-fail "./fido2-manage.sh" "$out/bin/fido2-manage" \
         --replace-fail "x-terminal-emulator" "${xterm}/bin/xterm" \
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
 
       sed -i '1i #!${pythonEnv.interpreter}' $out/bin/fido2-manage-gui
     ''
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace $out/bin/fido2-manage \
         --replace-fail "ggrep" "${gnugrep}/bin/grep"
     '';
diff --git a/pkgs/by-name/ga/gapcast/package.nix b/pkgs/by-name/ga/gapcast/package.nix
index c68e19f64022..0a7329635791 100644
--- a/pkgs/by-name/ga/gapcast/package.nix
+++ b/pkgs/by-name/ga/gapcast/package.nix
@@ -37,6 +37,6 @@ buildGoModule rec {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "gapcast";
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix
index 381fd67aa4f1..528d21598e21 100644
--- a/pkgs/by-name/gm/gmt/package.nix
+++ b/pkgs/by-name/gm/gmt/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_CFLAGS_COMPILE =
       lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration "
       + lib.optionalString (
-        stdenv.isDarwin
+        stdenv.hostPlatform.isDarwin
         && lib.versionOlder (darwin.apple_sdk.MacOSX-SDK.version or darwin.apple_sdk.sdk.version) "13.3"
       ) "-D__LAPACK_int=int";
   };
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
       gshhg-gmt
     ]
     ++ (
-      if stdenv.isDarwin then
+      if stdenv.hostPlatform.isDarwin then
         with darwin.apple_sdk.frameworks;
         [
           Accelerate
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false)
       (lib.cmakeFeature "LICENSE_RESTRICTED" "LGPL")
     ]
-    ++ (lib.optionals (!stdenv.isDarwin) [
+    ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) [
       (lib.cmakeFeature "FFTW3_ROOT" "${fftwSinglePrec.dev}")
       (lib.cmakeFeature "LAPACK_LIBRARY" "${lib.getLib lapack}/lib/liblapack.so")
       (lib.cmakeFeature "BLAS_LIBRARY" "${lib.getLib blas}/lib/libblas.so")
diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix
index d31d435a7aa4..ae172d32b876 100644
--- a/pkgs/by-name/go/gomanagedocker/package.nix
+++ b/pkgs/by-name/go/gomanagedocker/package.nix
@@ -23,8 +23,8 @@ buildGoModule {
   vendorHash = "sha256-M/jfQWCBrv7hZm450yLBmcjWtNSCziKOpfipxI6U9ak=";
 
   buildInputs =
-    lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
-    ++ lib.optionals stdenv.isLinux [ xorg.libX11 ];
+    lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ];
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index e8d0a11330f8..fb43a5a6b667 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -39,7 +39,7 @@ let
     let
       baseStdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
     in
-    if stdenv.isDarwin then overrideSDK baseStdenv "11.0" else baseStdenv;
+    if stdenv.hostPlatform.isDarwin then overrideSDK baseStdenv "11.0" else baseStdenv;
 
   patterns_src = fetchFromGitHub {
     name = "ImHex-Patterns-source-${patterns_version}";
@@ -75,7 +75,7 @@ stdenv'.mkDerivation (finalAttrs: {
   ];
 
   # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application
-  postPatch = lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace cmake/modules/PostprocessBundle.cmake \
       --replace-fail "fixup_bundle" "#fixup_bundle"
   '';
@@ -89,28 +89,32 @@ stdenv'.mkDerivation (finalAttrs: {
       pkg-config
       rsync
     ]
-    ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]
-    ++ lib.optionals stdenv.isDarwin [ makeWrapper ];
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
 
-  buildInputs = [
-    capstone
-    curl
-    dbus
-    file
-    fmt
-    glfw3
-    gtk3
-    jansson
-    libGLU
-    mbedtls
-    nlohmann_json
-    yara
-  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.UniformTypeIdentifiers ];
+  buildInputs =
+    [
+      capstone
+      curl
+      dbus
+      file
+      fmt
+      glfw3
+      gtk3
+      jansson
+      libGLU
+      mbedtls
+      nlohmann_json
+      yara
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk_11_0.frameworks.UniformTypeIdentifiers
+    ];
 
   # autoPatchelfHook only searches for *.so and *.so.*, and won't find *.hexpluglib
   # however, we will append to RUNPATH ourselves
-  autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [ "*.hexpluglib" ];
-  appendRunpaths = lib.optionals stdenv.isLinux [
+  autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isLinux [ "*.hexpluglib" ];
+  appendRunpaths = lib.optionals stdenv.hostPlatform.isLinux [
     (lib.makeLibraryPath [ libGL ])
     "${placeholder "out"}/lib/imhex/plugins"
   ];
@@ -118,7 +122,7 @@ stdenv'.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "IMHEX_OFFLINE_BUILD" true)
     (lib.cmakeBool "IMHEX_COMPRESS_DEBUG_INFO" false) # avoids error: cannot compress debug sections (zstd not enabled)
-    (lib.cmakeBool "IMHEX_GENERATE_PACKAGE" stdenv.isDarwin)
+    (lib.cmakeBool "IMHEX_GENERATE_PACKAGE" stdenv.hostPlatform.isDarwin)
     (lib.cmakeBool "USE_SYSTEM_CAPSTONE" true)
     (lib.cmakeBool "USE_SYSTEM_CURL" true)
     (lib.cmakeBool "USE_SYSTEM_FMT" true)
@@ -129,12 +133,12 @@ stdenv'.mkDerivation (finalAttrs: {
 
   # rsync is used here so we can not copy the _schema.json files
   postInstall =
-    if stdenv.isLinux then
+    if stdenv.hostPlatform.isLinux then
       ''
         mkdir -p $out/share/imhex
         rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,nodes,patterns} $out/share/imhex
       ''
-    else if stdenv.isDarwin then
+    else if stdenv.hostPlatform.isDarwin then
       ''
         mkdir -p $out/Applications
         mv $out/imhex.app $out/Applications
diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index d3095b9e9b8b..5bd7f2e9794c 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     openssl
     sqlite
     zlib
-  ] ++ lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];
 
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 96eb5638661c..fa58189efff4 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -45,20 +45,20 @@ buildNpmPackage rec {
       zip
       makeWrapper
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       wayland-scanner
       copyDesktopItems
     ];
 
   buildInputs =
-    lib.optionals stdenv.isLinux [
+    lib.optionals stdenv.hostPlatform.isLinux [
       libxkbcommon
       libX11
       libXtst
       libXi
       wayland
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_11
     ];
 
@@ -69,7 +69,7 @@ buildNpmPackage rec {
     # use our own node headers since we skip downloading them
     NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node";
     # disable code signing on Darwin
-    CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.isDarwin "false";
+    CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.hostPlatform.isDarwin "false";
   };
 
   postConfigure = ''
@@ -103,7 +103,7 @@ buildNpmPackage rec {
   installPhase = ''
     runHook preInstall
 
-    ${lib.optionalString stdenv.isLinux ''
+    ${lib.optionalString stdenv.hostPlatform.isLinux ''
       mkdir -p $out/share/kando
       cp -r out/*/{locales,resources{,.pak}} $out/share/kando
 
@@ -115,7 +115,7 @@ buildNpmPackage rec {
           --inherit-argv0
     ''}
 
-    ${lib.optionalString stdenv.isDarwin ''
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir -p $out/Applications
       cp -r out/*/Kando.app $out/Applications
       makeWrapper $out/Applications/Kando.app/Contents/MacOS/Kando $out/bin/kando
diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix
index 65ba33a0a806..124cb3386510 100644
--- a/pkgs/by-name/kt/kty/package.nix
+++ b/pkgs/by-name/kt/kty/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     [
       openssl
     ]
-    ++ lib.optionals stdenv.isDarwin (
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk;
       [
         frameworks.SystemConfiguration
diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix
index 4c4ce328215b..15452a57fc0a 100644
--- a/pkgs/by-name/ku/kubetui/package.nix
+++ b/pkgs/by-name/ku/kubetui/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=workers::kube::store::tests::kubeconfigからstateを生成"
   ];
 
-  buildInputs = lib.optionals (stdenv.isDarwin) (
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) (
     with darwin.apple_sdk;
     [
       frameworks.CoreGraphics
diff --git a/pkgs/by-name/la/LAStools/package.nix b/pkgs/by-name/la/LAStools/package.nix
index e4d86733ab39..e91b8b224de7 100644
--- a/pkgs/by-name/la/LAStools/package.nix
+++ b/pkgs/by-name/la/LAStools/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "format"
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-narrowing";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/li/lilv/package.nix b/pkgs/by-name/li/lilv/package.nix
index f0c2aa304546..63c222d368c4 100644
--- a/pkgs/by-name/li/lilv/package.nix
+++ b/pkgs/by-name/li/lilv/package.nix
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
     (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic))
   ] # Add nix and NixOS specific lv2 paths
     # The default values are from: https://github.com/lv2/lilv/blob/master/src/lilv_config.h
-    ++ lib.optional stdenv.isDarwin  (lib.mesonOption "default_lv2_path"
+    ++ lib.optional stdenv.hostPlatform.isDarwin  (lib.mesonOption "default_lv2_path"
       "~/.lv2:~/Library/Audio/Plug-Ins/LV2:"
       + "/usr/local/lib/lv2:/usr/lib/lv2:"
       + "/Library/Audio/Plug-Ins/LV2:"
       + "~/.nix-profile/lib/lv2")
-    ++ lib.optional stdenv.isLinux  (lib.mesonOption "default_lv2_path"
+    ++ lib.optional stdenv.hostPlatform.isLinux  (lib.mesonOption "default_lv2_path"
       "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:"
       + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2");
 
diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix
index a878b5ff8ab5..3205a776cd1c 100644
--- a/pkgs/by-name/ls/lsof/package.nix
+++ b/pkgs/by-name/ls/lsof/package.nix
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
   # Stop build scripts from searching global include paths
   LSOF_INCLUDE = "${lib.getDev stdenv.cc.libc}/include";
   configurePhase = let genericFlags = "LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB";
-    linuxFlags = lib.optionalString stdenv.isLinux "LINUX_CONF_CC=$CC_FOR_BUILD";
-    freebsdFlags = lib.optionalString stdenv.isFreeBSD "FREEBSD_SYS=${freebsd.sys.src}/sys";
+    linuxFlags = lib.optionalString stdenv.hostPlatform.isLinux "LINUX_CONF_CC=$CC_FOR_BUILD";
+    freebsdFlags = lib.optionalString stdenv.hostPlatform.isFreeBSD "FREEBSD_SYS=${freebsd.sys.src}/sys";
     in "${genericFlags} ${linuxFlags} ${freebsdFlags} ./Configure -n ${dialect}";
 
   preBuild = ''
diff --git a/pkgs/by-name/lu/luaformatter/package.nix b/pkgs/by-name/lu/luaformatter/package.nix
index 06bb68264588..eedf1868adb6 100644
--- a/pkgs/by-name/lu/luaformatter/package.nix
+++ b/pkgs/by-name/lu/luaformatter/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString (
-    stdenv.isDarwin && stdenv.isx86_64
+    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
   ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";
 
   meta = with lib; {
diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 96318e3d4b0b..7e71432ef66f 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     npmHooks.npmConfigHook
     nodejs
     (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp
-  ] ++ lib.optional stdenv.isDarwin cctools; # libtool used by gyp;
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # libtool used by gyp;
 
   buildInputs =
     [
diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix
index db8a687cdda2..143c7716a21b 100644
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm.configHook
     makeWrapper
     python3
-  ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ];
 
   # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
   pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/mk/mkuimage/package.nix b/pkgs/by-name/mk/mkuimage/package.nix
index 355b69a37225..4a65d56af0b6 100644
--- a/pkgs/by-name/mk/mkuimage/package.nix
+++ b/pkgs/by-name/mk/mkuimage/package.nix
@@ -35,7 +35,7 @@ buildGoModule {
   # Notice that due to some legacy/bug in buildGoModule, the build isn't
   # failing even the tests are, as we get a false-positive the output
   # filtering: https://github.com/NixOS/nixpkgs/issues/349468
-  doCheck = stdenv.isLinux;
+  doCheck = stdenv.hostPlatform.isLinux;
 
   # The tests want to copy /bin/bash and /bin/ls, but we don't have those.
   # As these are interesting e2e tests to check if things work, we substitute
diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix
index df72bce1cb02..e181a873bea8 100644
--- a/pkgs/by-name/nc/nchat/package.nix
+++ b/pkgs/by-name/nc/nchat/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       sqlite
       zlib
     ]
-    ++ lib.optionals stdenv.isDarwin (
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
       [
         AppKit
diff --git a/pkgs/by-name/nc/ncmpcpp/package.nix b/pkgs/by-name/nc/ncmpcpp/package.nix
index ebe6eb1530f3..3f5baff5963e 100644
--- a/pkgs/by-name/nc/ncmpcpp/package.nix
+++ b/pkgs/by-name/nc/ncmpcpp/package.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     ''
       ./autogen.sh
     ''
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # std::result_of was removed in c++20 and unusable for clang16
       substituteInPlace ./configure \
         --replace-fail "std=c++20" "std=c++17"
diff --git a/pkgs/by-name/ni/nix-serve/package.nix b/pkgs/by-name/ni/nix-serve/package.nix
index 2ece72b66bf1..e8a0a0930030 100644
--- a/pkgs/by-name/ni/nix-serve/package.nix
+++ b/pkgs/by-name/ni/nix-serve/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
     maintainers = [ maintainers.eelco ];
     license = licenses.lgpl21;
     # See https://github.com/edolstra/nix-serve/issues/57
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
     platforms = nix.meta.platforms;
     mainProgram = "nix-serve";
   };
diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index ccddeeb94ecc..778f478c62de 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec {
       atemu
     ];
     # Failing tests on Darwin.
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/op/openvi/package.nix b/pkgs/by-name/op/openvi/package.nix
index 59592c707546..6b88bdd29667 100644
--- a/pkgs/by-name/op/openvi/package.nix
+++ b/pkgs/by-name/op/openvi/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     perl
-  ] ++ lib.optionals stdenv.isDarwin [ apple-sdk_11 ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
   makeFlags = [
     "PREFIX=$(out)"
diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
index c8a7e0b33948..6c91d5774743 100644
--- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix
+++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
 
   ldflags = [ "-s" "-w" ];
 
-  buildInputs = lib.optional stdenv.isDarwin apple-sdk_12;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12;
 
   passthru.tests.version = testers.testVersion {
     inherit version;
diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix
index f2766c3998d0..42e5f062faeb 100644
--- a/pkgs/by-name/pa/packetry/package.nix
+++ b/pkgs/by-name/pa/packetry/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
       gtk4
       pango
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_11
     ];
 
diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index ed832c2be816..e1879ba6599d 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -22,9 +22,9 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-94qziqJaKW8/L/6+U1yojxdG8BmeAStn+qbfGemTrVA=";
   };
 
-  nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ gettext ];
+  nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
 
-  postPatch = lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     LINTL="${lib.getLib gettext}/lib/libintl.8.dylib"
     substituteInPlace pdfarranger/pdfarranger.py --replace-fail \
       "return 'libintl.8.dylib'" \
diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index c26e54e5b3d1..8a155f6390fc 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   inherit version pname;
 
   src =
-    if stdenv.isDarwin then
+    if stdenv.hostPlatform.isDarwin then
       fetchurl {
         url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.dmg";
         hash = "sha256-5Ym42InDgFLGdZk0LYV1H0eC5WzmsYToG1KLdiGgTto=";
diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
index de838ef82fef..6befd73b6823 100644
--- a/pkgs/by-name/q2/q2pro/package.nix
+++ b/pkgs/by-name/q2/q2pro/package.nix
@@ -21,8 +21,8 @@
   wayland-scanner,
   makeWrapper,
   versionCheckHook,
-  x11Support ? stdenv.isLinux,
-  waylandSupport ? stdenv.isLinux,
+  x11Support ? stdenv.hostPlatform.isLinux,
+  waylandSupport ? stdenv.hostPlatform.isLinux,
 }:
 
 stdenv.mkDerivation (finalAttrs: rec {
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: rec {
     (lib.mesonBool "variable-fps" true)
     (lib.mesonEnable "wayland" waylandSupport)
     (lib.mesonEnable "x11" x11Support)
-    (lib.mesonEnable "icmp-errors" stdenv.isLinux)
+    (lib.mesonEnable "icmp-errors" stdenv.hostPlatform.isLinux)
     (lib.mesonEnable "windows-crash-dumps" false)
   ];
 
diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 4f9b3b56239f..11d0e510a960 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-L0gXxV/3+5oRV/Ipm4sRqr9dh9AEChWhtILO3PaNxYY=";
 
-  buildInputs = lib.optionals stdenv.isDarwin (
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;
     [
       AppKit
diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index 9be8715f9cb1..43dc1cf733db 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -47,13 +47,13 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-esDUzzVm5J8fKftBfk5StJzN1YzLa1p0t7BsoxzrowI=";
 
-  nativeBuildInputs = lib.optionals stdenv.isLinux [
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     pkg-config
   ];
 
   buildInputs =
-    lib.optionals stdenv.isLinux [ openssl ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
+    lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
 
   preConfigure = ''
     mkdir -p crates/librqbit/webui/dist
diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix
index 40d31d04a143..678812819eb5 100644
--- a/pkgs/by-name/sa/sasquatch/package.nix
+++ b/pkgs/by-name/sa/sasquatch/package.nix
@@ -23,7 +23,7 @@ let
       hash = "sha256-0itva+j5WMKvueiUaO253UQ1S6W29xgtFvV4i3yvMtU=";
     };
 
-    patches = lib.optional stdenv.isDarwin ./darwin.patch;
+    patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
 
     strictDeps = true;
     nativeBuildInputs = [ which ];
diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix
index aae1cbb53f04..7b6342150518 100644
--- a/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
       shaderc
       spirv-tools
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       wrapGAppsHook4
     ];
 
@@ -66,13 +66,13 @@ stdenv.mkDerivation {
       yaml-cpp
       zstd
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       ffts
       gtkmm3
       libtirpc
     ]
     ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_11
       (darwinMinVersionHook "10.15")
       moltenvk
@@ -84,7 +84,7 @@ stdenv.mkDerivation {
       --replace-fail '"/share/' '"/../share/'
   '';
 
-  cmakeFlags = lib.optionals stdenv.isDarwin [
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
     "-DCMAKE_INSTALL_RPATH=${lib.strings.makeLibraryPath [ vulkan-loader ]}"
   ];
 
diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index dc4be19cfd06..b33eb88dc5ff 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postInstall =
-    if stdenv.isDarwin then
+    if stdenv.hostPlatform.isDarwin then
       ''
         cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders
         cp pdf_viewer/{prefs,prefs_user,keys,key_user}.config tutorial.pdf sioyek.app/Contents/MacOS/
diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index 5fa93c593006..4f530aeb30c2 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -121,7 +121,7 @@ python3Packages.buildPythonApplication rec {
       "test_output_file_cache_storage"
       "test_storage"
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # Unclear failure:
       # AssertionError: expected successful execution
       # `__darwinAllowLocalNetworking` doesn't help
diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix
index b3ef7d0317eb..9dbbd199041a 100644
--- a/pkgs/by-name/sq/sql-studio/package.nix
+++ b/pkgs/by-name/sq/sql-studio/package.nix
@@ -42,6 +42,6 @@ rustPlatform.buildRustPackage {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.frectonz ];
     platforms = lib.platforms.all;
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix
index f923d3a1edfb..e676ca7be28e 100644
--- a/pkgs/by-name/sq/sqruff/package.nix
+++ b/pkgs/by-name/sq/sqruff/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     rust-jemalloc-sys
-  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
 
   # Patch the tests to find the binary
   postPatch = ''
diff --git a/pkgs/by-name/st/styluslabs-write/package.nix b/pkgs/by-name/st/styluslabs-write/package.nix
index 6efc8c246513..2da1066ae975 100644
--- a/pkgs/by-name/st/styluslabs-write/package.nix
+++ b/pkgs/by-name/st/styluslabs-write/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
       atemu
     ];
     platforms = with lib.platforms; linux ++ darwin ++ windows;
-    broken = !stdenv.isLinux;
+    broken = !stdenv.hostPlatform.isLinux;
     mainProgram = "Write";
   };
 })
diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix
index 3fd19809f907..3e04dce7b78e 100644
--- a/pkgs/by-name/sw/swim/package.nix
+++ b/pkgs/by-name/sw/swim/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     [
       openssl
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.Security
       darwin.apple_sdk.frameworks.SystemConfiguration
     ];
diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix
index 076d11b29722..812d30c14d85 100644
--- a/pkgs/by-name/te/termscp/package.nix
+++ b/pkgs/by-name/te/termscp/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
       "--skip=cli::remote::test::test_should_make_remote_args_from_two_bookmarks_and_local_dir"
       "--skip=cli::remote::test::test_should_make_remote_args_from_two_remotes_and_local_dir"
     ]
-    ++ lib.optionals stdenvNoCC.isDarwin [
+    ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [
       "--skip=system::watcher::test::should_poll_file_removed"
       "--skip=system::watcher::test::should_poll_file_update"
     ];
diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix
index c59dc81710e5..f00ba1658799 100644
--- a/pkgs/by-name/ve/veryl/package.nix
+++ b/pkgs/by-name/ve/veryl/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     [
       dbus
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.CoreFoundation
       darwin.apple_sdk.frameworks.CoreServices
       darwin.apple_sdk.frameworks.Security
diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 41db1bf4a379..84427e0be7d5 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
       llvmPackages.libcxx
       llvmPackages.libunwind
     ]
-    ++ lib.optionals (stdenv.isLinux) [
+    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
       musl # not used, but requires extra work to remove
       xorg.libX11 # for the clipboardy package
     ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
       nodejs
       pnpm_9.configHook
     ]
-    ++ lib.optionals (stdenv.isLinux) [
+    ++ lib.optionals (stdenv.hostPlatform.isLinux) [
       autoPatchelfHook
     ];
 
diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix
index d0c153b4c5a2..7e3998d1f90b 100644
--- a/pkgs/by-name/x4/x4/package.nix
+++ b/pkgs/by-name/x4/x4/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
       openssl
       zlib
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.Security
     ];
 
diff --git a/pkgs/by-name/zv/zvbi/package.nix b/pkgs/by-name/zv/zvbi/package.nix
index cc48da24bb3c..55982a1c81b9 100644
--- a/pkgs/by-name/zv/zvbi/package.nix
+++ b/pkgs/by-name/zv/zvbi/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     validatePkgConfig
   ];
 
-  buildInputs = lib.optional stdenv.isDarwin libiconv;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   outputs = [
     "out"
diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix
index 1580d1f43fdd..0ab5a28046c2 100644
--- a/pkgs/development/compilers/elm/packages/node/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../../../node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 17a43f50f7cd..718415a5eabd 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
   patchPhase = ''
     sed -i '/^PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
     echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
-  '' + lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Locate standard headers like <unistd.h>
     substituteInPlace base/runtime/config/gen-posix-names.sh \
       --replace "\$SDK_PATH/usr" "${Libsystem}"
diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix
index 48718527965c..52f07e3f822c 100644
--- a/pkgs/development/compilers/swift/swiftpm/default.nix
+++ b/pkgs/development/compilers/swift/swiftpm/default.nix
@@ -356,7 +356,7 @@ let
       swift-driver
       swift-system
       swift-tools-support-core
-    ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ];
+    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.15.4") ];
 
     cmakeFlags = [
       "-DUSE_CMAKE_INSTALL=ON"
@@ -386,7 +386,7 @@ in stdenv.mkDerivation (commonAttrs // {
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       CryptoKit
       LocalAuthentication
-  ] ++ lib.optionals stdenv.isDarwin [ (darwinMinVersionHook "10.15.4") ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.15.4") ];
 
   configurePhase = generated.configure + ''
     # Functionality provided by Xcode XCTest, but not available in
diff --git a/pkgs/development/interpreters/gauche/boot.nix b/pkgs/development/interpreters/gauche/boot.nix
index 04b69b524067..4b3179da90c1 100644
--- a/pkgs/development/interpreters/gauche/boot.nix
+++ b/pkgs/development/interpreters/gauche/boot.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       mbedtls
       cacert
     ]
-    ++ lib.optionals (stdenv.isDarwin) [
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       darwin.apple_sdk_11_0.frameworks.CoreServices
     ];
 
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 9342000c864b..8873286d912a 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-  ] ++ lib.optionals stdenv.isDarwin [ (lib.cmakeBool "CAPSTONE_BUILD_MACOS_THIN" true) ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "CAPSTONE_BUILD_MACOS_THIN" true) ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/development/libraries/librasterlite2/default.nix b/pkgs/development/libraries/librasterlite2/default.nix
index 0286d944691f..d933baafdfff 100644
--- a/pkgs/development/libraries/librasterlite2/default.nix
+++ b/pkgs/development/libraries/librasterlite2/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     proj
     sqlite
     zstd
-  ] ++ lib.optional stdenv.isDarwin ApplicationServices;
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin ApplicationServices;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 31e76793ec01..eff46f5ff924 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -4,7 +4,7 @@
 , enableQt             ? enableQT
 , enableXM             ? false
 , libGLX
-, enableOpenGLX11      ? !stdenv.isDarwin
+, enableOpenGLX11      ? !stdenv.hostPlatform.isDarwin
 , enablePython         ? false
 , enableRaytracerX11   ? false
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index eb3fc8af96d7..49912da2b167 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: ({
       [ libinput ]
       ++ lib.optional withGtk3 gtk3
     )
-    ++ lib.optional stdenv.isDarwin darwinVersionInputs
+    ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysqlSupport) libmysqlclient
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index d3d810cbbf68..3bf1a0ba678d 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -28,7 +28,7 @@ mkDerivation (args // {
   buildInputs =
     args.buildInputs or [ ]
     # Per https://doc.qt.io/qt-5/macos.html#supported-versions
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       apple-sdk_13
       (darwinMinVersionHook "10.13")
     ];
diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix
index 93fc0531ccd9..23e13897e5d8 100644
--- a/pkgs/development/libraries/unicorn/default.nix
+++ b/pkgs/development/libraries/unicorn/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       cmake
       pkg-config
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       cctools
     ];
 
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 1ed1d6719e38..9da488ab30b5 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -561,7 +561,7 @@ in
   });
 
   neotest  = prev.neotest.overrideAttrs(oa: {
-    doCheck = stdenv.isLinux;
+    doCheck = stdenv.hostPlatform.isLinux;
     nativeCheckInputs = oa.nativeCheckInputs ++ [
       final.nlua final.busted neovim-unwrapped
     ];
diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix
index 0406894c8b05..563f5d786c49 100644
--- a/pkgs/development/python-modules/arviz/default.nix
+++ b/pkgs/development/python-modules/arviz/default.nix
@@ -101,7 +101,7 @@ buildPythonPackage rec {
   ];
 
   # Tests segfault on darwin
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   pythonImportsCheck = [ "arviz" ];
 
diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix
index 01135c55dbbf..efb065b17194 100644
--- a/pkgs/development/python-modules/berkeleydb/default.nix
+++ b/pkgs/development/python-modules/berkeleydb/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   # Every test currently fails with:
   # berkeleydb.db.DBRunRecoveryError: (-30973, 'BDB0087 DB_RUNRECOVERY: Fatal error, run database recovery -- BDB1546 unable to join the environment')
-  doCheck = !stdenv.isDarwin;
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   checkPhase = ''
     ${python.interpreter} test.py
diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix
index 9970378d3741..3bf81a2c0e4d 100644
--- a/pkgs/development/python-modules/botorch/default.nix
+++ b/pkgs/development/python-modules/botorch/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
       # stuck tests on hydra
       "test_moo_predictive_entropy_search"
     ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.isAarch64) [
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
       # Numerical error slightly above threshold
       # AssertionError: Tensor-likes are not close!
       "test_model_list_gpytorch_model"
diff --git a/pkgs/development/python-modules/cleanvision/default.nix b/pkgs/development/python-modules/cleanvision/default.nix
index e82ebeb52f7c..ff25048ab886 100644
--- a/pkgs/development/python-modules/cleanvision/default.nix
+++ b/pkgs/development/python-modules/cleanvision/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ GaetanLepage ];
     # Fatal Python error: Aborted
-    broken = stdenv.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index cdecd4e85c8f..75969681b000 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   };
 
   # Workaround for https://github.com/ethanfurman/dbf/issues/48
-  patches = lib.optional python.stdenv.isDarwin ./darwin.patch;
+  patches = lib.optional python.stdenv.hostPlatform.isDarwin ./darwin.patch;
 
   propagatedBuildInputs = [ aenum ];
 
diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix
index 6a526c59be7d..8007552ef405 100644
--- a/pkgs/development/python-modules/hf-transfer/default.nix
+++ b/pkgs/development/python-modules/hf-transfer/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     [
       openssl
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.Security
       darwin.apple_sdk.frameworks.SystemConfiguration
       libiconv
diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix
index bbc107fdda4f..20f50cb6a789 100644
--- a/pkgs/development/python-modules/jaraco-functools/default.nix
+++ b/pkgs/development/python-modules/jaraco-functools/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   ];
 
   # test is flaky on darwin
-  disabledTests = if stdenv.isDarwin then [ "test_function_throttled" ] else null;
+  disabledTests = if stdenv.hostPlatform.isDarwin then [ "test_function_throttled" ] else null;
 
   pythonNamespaces = [ "jaraco" ];
 
diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix
index 8be69129140f..a967c90bd858 100644
--- a/pkgs/development/python-modules/mss/default.nix
+++ b/pkgs/development/python-modules/mss/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     hash = "sha256-yWpOxzIk2n2yK8B+88+qGPi4aQDRhy4pETu87wCToh4=";
   };
 
-  patches = lib.optionals stdenv.isLinux [
+  patches = lib.optionals stdenv.hostPlatform.isLinux [
     (substituteAll {
       src = ./linux-paths.patch;
       x11 = "${xorg.libX11}/lib/libX11.so";
@@ -44,7 +44,7 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  doCheck = stdenv.isLinux;
+  doCheck = stdenv.hostPlatform.isLinux;
 
   nativeCheckInputs = [
     lsof
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 30d741052a09..16594fc13d1e 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -117,7 +117,7 @@ buildPythonPackage rec {
       "test_save"
     ];
 
-  disabledTestPaths = lib.optionals stdenv.isDarwin [
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     # Crashes the interpreter
     "Tests/test_imagetk.py"
   ];
diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix
index e552bd6941cc..d4bb4daf5cd8 100644
--- a/pkgs/development/python-modules/polars/default.nix
+++ b/pkgs/development/python-modules/polars/default.nix
@@ -93,7 +93,7 @@ buildPythonPackage {
       polarsMemoryAllocator
       (pkgs.__splicedPackages.zstd or pkgs.zstd)
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.AppKit
       darwin.apple_sdk.frameworks.IOKit
       darwin.apple_sdk.frameworks.Security
diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix
index 588ed7b5312e..d89e11fd1d5a 100644
--- a/pkgs/development/python-modules/pydantic-extra-types/default.nix
+++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   ];
 
   # PermissionError accessing '/etc/localtime'
-  disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_pendulum_dt.py" ];
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_pendulum_dt.py" ];
 
   meta = with lib; {
     changelog = "https://github.com/pydantic/pydantic-extra-types/blob/${src.rev}/HISTORY.md";
diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
index fcbb8c0de00b..9905ee45e367 100644
--- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix
+++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     hash = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk=";
   };
 
-  patches = lib.optionals stdenv.isLinux [
+  patches = lib.optionals stdenv.hostPlatform.isLinux [
     (substituteAll {
       src = ./paths.patch;
       xauth = lib.getExe xorg.xauth;
@@ -40,7 +40,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  doCheck = stdenv.isLinux;
+  doCheck = stdenv.hostPlatform.isLinux;
 
   nativeCheckInputs = [
     easyprocess
diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 2f3b8cf20808..38fb11782402 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   src = fetchzip {
     url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip";
     sha256 = checksum;
-    stripRoot = !stdenv.isDarwin;
+    stripRoot = !stdenv.hostPlatform.isDarwin;
   };
 
   # don't remove runtime deps
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
       unzip
       makeShellWrapper
     ]
-    ++ lib.optionals stdenv.isLinux [
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
       # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
       # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
@@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
     ];
 
 
-  buildInputs = lib.optionals stdenv.isLinux (with xorg; [
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux (with xorg; [
     libXScrnSaver
     libXdamage
     libXtst
@@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
     alsa-lib
     gtk3
     mesa # for libgbm
-  ]) ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  ]) ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
     Cocoa
     CoreServices
     CoreMedia
@@ -80,7 +80,7 @@ in stdenv.mkDerivation rec {
     ApplicationServices
   ]);
 
-  runtimeDependencies = lib.optional stdenv.isLinux (lib.getLib udev);
+  runtimeDependencies = lib.optional stdenv.hostPlatform.isLinux (lib.getLib udev);
 
   installPhase = ''
     runHook preInstall
@@ -93,7 +93,7 @@ in stdenv.mkDerivation rec {
     printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json
     # Cypress now looks for binary_state.json in bin
     echo '{"verified": true}' > $out/binary_state.json
-    ${if stdenv.isDarwin then ''
+    ${if stdenv.hostPlatform.isDarwin then ''
       ln -s $out/opt/cypress/Cypress.app/Contents/MacOS/Cypress $out/bin/cypress
     '' else ''
       ln -s $out/opt/cypress/Cypress $out/bin/cypress
@@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postFixup = lib.optionalString (!stdenv.isDarwin) ''
+  postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     # exit with 1 after 25.05
     makeWrapper $out/opt/cypress/Cypress $out/bin/Cypress \
       --run 'echo "Warning: Use the lowercase cypress executable instead of the capitalized one."'
diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix
index 88b0f14741fc..a21153932c3a 100644
--- a/pkgs/servers/pleroma/default.nix
+++ b/pkgs/servers/pleroma/default.nix
@@ -98,7 +98,7 @@ beamPackages.mixRelease rec {
             vips
             glib.dev
           ]
-          ++ lib.optionals stdenv.isDarwin [
+          ++ lib.optionals stdenv.hostPlatform.isDarwin [
             darwin.apple_sdk.frameworks.Foundation
             darwin.apple_sdk.frameworks.AppKit
             darwin.apple_sdk.frameworks.Kerberos
diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix
index c60ac20cea44..fe7b6ba66c60 100644
--- a/pkgs/servers/web-apps/jitsi-meet/default.nix
+++ b/pkgs/servers/web-apps/jitsi-meet/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   # Test requires running Jitsi Videobridge and Jicofo which are Linux-only
-  passthru.tests = lib.optionalAttrs stdenv.isLinux {
+  passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
     single-host-smoke-test = nixosTests.jitsi-meet;
   };
 
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index 58bb7ebb4014..5ab53918d149 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     "--with-working-dir=/var/lib/bacula"
     "--mandir=\${out}/share/man"
   ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # bacula’s `configure` script fails to detect CoreFoundation correctly,
       # but these symbols are available in the nixpkgs CoreFoundation framework.
       "gt_cv_func_CFLocaleCopyCurrent=yes"
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index b525d50d7dfe..cc9ff35a2331 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
 
   nativeCheckInputs = [ python3 ];
 
-  passthru.tests = lib.optionalAttrs stdenv.isLinux {
+  passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
     restic = nixosTests.restic;
   };
 
diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix
index 9c9f7e97fa68..f614301a010c 100644
--- a/pkgs/tools/misc/lighthouse-steamvr/default.nix
+++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ dbus ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
+  buildInputs = [ dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];
 
   meta = with lib; {
     description = "VR Lighthouse power state management";
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 99f807593319..7ffc8963971b 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -267,7 +267,7 @@ core-big = stdenv.mkDerivation {
   ''
   # force XeTeX to use fontconfig instead of Core Text, so that fonts can be made available via FONTCONFIG_FILE,
   # by tricking configure into thinking that the relevant test result is already in the config cache
-  + lib.optionalString stdenv.isDarwin ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
     export kpse_cv_have_ApplicationServices=no
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efa448c47cd0..00f652b009be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9511,7 +9511,7 @@ with pkgs;
 
   gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer {
     callPackage = newScope gst_all_1;
-    stdenv = if stdenv.isDarwin then overrideSDK stdenv "12.3" else stdenv;
+    stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "12.3" else stdenv;
     inherit (darwin.apple_sdk_12_3.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security SystemConfiguration VideoToolbox;
     inherit (darwin.apple_sdk_12_3.libs) xpc;
   });
@@ -10490,7 +10490,7 @@ with pkgs;
     else callPackage ../development/libraries/ncurses {
       # ncurses is included in the SDK. Avoid an infinite recursion by using a bootstrap stdenv.
       stdenv =
-        if stdenv.isDarwin then
+        if stdenv.hostPlatform.isDarwin then
           darwin.bootstrapStdenv
         else
           stdenv;

From 5be1290bb6621c154c77dfdf3e81c2a168d9a511 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 17 Nov 2024 12:09:52 +0100
Subject: [PATCH 66/68] php83Packages.phpstan: fix hash

---
 pkgs/development/php-packages/phpstan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index 06636953beea..5701261ea371 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -11,11 +11,11 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan-src";
-    rev = finalAttrs.version;
+    rev = "refs/tags/${finalAttrs.version}";
     hash = "sha256-wF2OqJ0kg+wEjSq8mAyF5em5RAqjyXqKFkdAjxOrePM=";
   };
 
-  vendorHash = "sha256-NLaOxWMhTViv7OfXE5b7NTeL/jD7Fvbx/1ihGlRJCws=";
+  vendorHash = "sha256-IHnPhV4H8xkonjllOGMmB0zibaGapc8XBrg4km/jKb4=";
   composerStrictValidation = false;
 
   meta = {

From 02d0071fa9fed7d9b240ef86824edba00c1ded1d Mon Sep 17 00:00:00 2001
From: Bot_wxt1221 <3264117476@qq.com>
Date: Sun, 17 Nov 2024 19:20:21 +0800
Subject: [PATCH 67/68] rustdesk-flutter: fix build (#356450)

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

diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 3ff05d808baa..0c6ecb9a6bd3 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -163,8 +163,11 @@ flutter319.buildFlutterApplication rec {
   patches = [ ./make-build-reproducible.patch ];
 
   postPatch = ''
-    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
-      --replace-fail "libayatana-appindicator3.so.1" "${lib.getLib libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+    if [ $cargoDepsCopy ]; then # That will be inherited to buildDartPackage and it doesn't have cargoDepsCopy
+      substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+        --replace-fail "libayatana-appindicator3.so.1" "${lib.getLib libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+    fi
+
     substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" ""
     # The supplied Cargo.lock doesn't work with our fetcher so copy over the fixed version
     cp ${./Cargo.lock} ../Cargo.lock

From 8ca24a7a2b8172baaaa11b519b55f0ee67d0212c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Nov 2024 11:52:23 +0100
Subject: [PATCH 68/68] nixos: remove boot.loader.raspberryPi

This has been announced for 24.11 in #241534, so let's follow through.
---
 .../manual/release-notes/rl-2411.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/rename.nix                      |   1 +
 .../raspberrypi/raspberrypi-builder.nix       |   9 --
 .../loader/raspberrypi/raspberrypi-builder.sh | 143 -----------------
 .../boot/loader/raspberrypi/raspberrypi.nix   | 151 ------------------
 .../boot/loader/raspberrypi/uboot-builder.nix |  37 -----
 .../boot/loader/raspberrypi/uboot-builder.sh  |  38 -----
 8 files changed, 3 insertions(+), 379 deletions(-)
 delete mode 100644 nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix
 delete mode 100644 nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
 delete mode 100644 nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
 delete mode 100644 nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
 delete mode 100644 nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 48d96d4e4184..8cb0986567f2 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -803,6 +803,8 @@
 
 - The new `boot.loader.systemd-boot.windows` option makes setting up dual-booting with Windows on a different drive easier.
 
+- The `boot.loader.raspberryPi` options were marked as deprecated in 23.11 and have now been removed.
+
 - Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11.
 
 - Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 67545614bdaa..350bb8a0e3cb 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1632,7 +1632,6 @@
   ./system/boot/loader/external/external.nix
   ./system/boot/loader/init-script/init-script.nix
   ./system/boot/loader/loader.nix
-  ./system/boot/loader/raspberrypi/raspberrypi.nix
   ./system/boot/loader/systemd-boot/systemd-boot.nix
   ./system/boot/luksroot.nix
   ./system/boot/stratisroot.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index ca3b2df9fc9a..7888c9883a70 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -20,6 +20,7 @@ in
     (mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
 
     # Completely removed modules
+    (mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ] "The raspberryPi boot loader has been removed. See https://github.com/NixOS/nixpkgs/pull/241534 for what to use instead.")
     (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed")
     (mkRemovedOptionModule [ "environment" "noXlibs" ] ''
       The environment.noXlibs option was removed, as it often caused surprising breakages for new users.
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix
deleted file mode 100644
index 64e106036abd..000000000000
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, configTxt, firmware ? pkgs.raspberrypifw }:
-
-pkgs.substituteAll {
-  src = ./raspberrypi-builder.sh;
-  isExecutable = true;
-  inherit (pkgs) bash;
-  path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-  inherit firmware configTxt;
-}
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
deleted file mode 100644
index 0541ca1ba622..000000000000
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#! @bash@/bin/sh
-
-# This can end up being called disregarding the shebang.
-set -e
-
-shopt -s nullglob
-
-export PATH=/empty
-for i in @path@; do PATH=$PATH:$i/bin; done
-
-usage() {
-    echo "usage: $0 -c <path-to-default-configuration> [-d <boot-dir>]" >&2
-    exit 1
-}
-
-default=                # Default configuration
-target=/boot            # Target directory
-
-while getopts "c:d:" opt; do
-    case "$opt" in
-        c) default="$OPTARG" ;;
-        d) target="$OPTARG" ;;
-        \?) usage ;;
-    esac
-done
-
-echo "updating the boot generations directory..."
-
-mkdir -p $target/old
-
-# Convert a path to a file in the Nix store such as
-# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
-cleanName() {
-    local path="$1"
-    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
-}
-
-# Copy a file from the Nix store to $target/kernels.
-declare -A filesCopied
-
-copyToKernelsDir() {
-    local src="$1"
-    local dst="$target/old/$(cleanName $src)"
-    # Don't copy the file if $dst already exists.  This means that we
-    # have to create $dst atomically to prevent partially copied
-    # kernels or initrd if this script is ever interrupted.
-    if ! test -e $dst; then
-        local dstTmp=$dst.tmp.$$
-        cp $src $dstTmp
-        mv $dstTmp $dst
-    fi
-    filesCopied[$dst]=1
-    result=$dst
-}
-
-copyForced() {
-    local src="$1"
-    local dst="$2"
-    cp $src $dst.tmp
-    mv $dst.tmp $dst
-}
-
-outdir=$target/old
-mkdir -p $outdir || true
-
-# Copy its kernel and initrd to $target/old.
-addEntry() {
-    local path="$1"
-    local generation="$2"
-
-    if ! test -e $path/kernel -a -e $path/initrd; then
-        return
-    fi
-
-    local kernel=$(readlink -f $path/kernel)
-    local initrd=$(readlink -f $path/initrd)
-    local dtb_path=$(readlink -f $path/dtbs)
-
-    if test -n "@copyKernels@"; then
-        copyToKernelsDir $kernel; kernel=$result
-        copyToKernelsDir $initrd; initrd=$result
-    fi
-
-    echo $(readlink -f $path) > $outdir/$generation-system
-    echo $(readlink -f $path/init) > $outdir/$generation-init
-    cp $path/kernel-params $outdir/$generation-cmdline.txt
-    echo $initrd > $outdir/$generation-initrd
-    echo $kernel > $outdir/$generation-kernel
-
-    if test "$generation" = "default"; then
-      copyForced $kernel $target/kernel.img
-      copyForced $initrd $target/initrd
-      for dtb in $dtb_path/{broadcom,}/bcm*.dtb; do
-        dst="$target/$(basename $dtb)"
-        copyForced $dtb "$dst"
-        filesCopied[$dst]=1
-      done
-      cp "$(readlink -f "$path/init")" $target/nixos-init
-      echo "`cat $path/kernel-params` init=$path/init" >$target/cmdline.txt
-    fi
-}
-
-addEntry $default default
-
-# Add all generations of the system profile to the menu, in reverse
-# (most recent to least recent) order.
-for generation in $(
-    (cd /nix/var/nix/profiles && ls -d system-*-link) \
-    | sed 's/system-\([0-9]\+\)-link/\1/' \
-    | sort -n -r); do
-    link=/nix/var/nix/profiles/system-$generation-link
-    addEntry $link $generation
-done
-
-# Add the firmware files
-fwdir=@firmware@/share/raspberrypi/boot/
-copyForced $fwdir/bootcode.bin  $target/bootcode.bin
-copyForced $fwdir/fixup.dat     $target/fixup.dat
-copyForced $fwdir/fixup4.dat    $target/fixup4.dat
-copyForced $fwdir/fixup4cd.dat  $target/fixup4cd.dat
-copyForced $fwdir/fixup4db.dat  $target/fixup4db.dat
-copyForced $fwdir/fixup4x.dat   $target/fixup4x.dat
-copyForced $fwdir/fixup_cd.dat  $target/fixup_cd.dat
-copyForced $fwdir/fixup_db.dat  $target/fixup_db.dat
-copyForced $fwdir/fixup_x.dat   $target/fixup_x.dat
-copyForced $fwdir/start.elf     $target/start.elf
-copyForced $fwdir/start4.elf    $target/start4.elf
-copyForced $fwdir/start4cd.elf  $target/start4cd.elf
-copyForced $fwdir/start4db.elf  $target/start4db.elf
-copyForced $fwdir/start4x.elf   $target/start4x.elf
-copyForced $fwdir/start_cd.elf  $target/start_cd.elf
-copyForced $fwdir/start_db.elf  $target/start_db.elf
-copyForced $fwdir/start_x.elf   $target/start_x.elf
-
-# Add the config.txt
-copyForced @configTxt@ $target/config.txt
-
-# Remove obsolete files from $target and $target/old.
-for fn in $target/old/*linux* $target/old/*initrd-initrd* $target/bcm*.dtb; do
-    if ! test "${filesCopied[$fn]}" = 1; then
-        rm -vf -- "$fn"
-    fi
-done
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
deleted file mode 100644
index cf1f37bc62b8..000000000000
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ /dev/null
@@ -1,151 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.boot.loader.raspberryPi;
-
-  builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
-  builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
-
-  builder =
-    if cfg.uboot.enable then
-      "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c"
-    else
-      "${builderGeneric} -c";
-
-  blCfg = config.boot.loader;
-  timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
-
-  isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
-  optional = pkgs.lib.optionalString;
-
-  configTxt =
-    pkgs.writeText "config.txt" (''
-      # U-Boot used to need this to work, regardless of whether UART is actually used or not.
-      # TODO: check when/if this can be removed.
-      enable_uart=1
-
-      # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
-      # when attempting to show low-voltage or overtemperature warnings.
-      avoid_warnings=1
-    '' + optional isAarch64 ''
-      # Boot in 64-bit mode.
-      arm_64bit=1
-    '' + (if cfg.uboot.enable then ''
-      kernel=u-boot-rpi.bin
-    '' else ''
-      kernel=kernel.img
-      initramfs initrd followkernel
-    '') + optional (cfg.firmwareConfig != null) cfg.firmwareConfig);
-
-in
-
-{
-  options = {
-
-    boot.loader.raspberryPi = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Whether to create files with the system generations in
-          `/boot`.
-          `/boot/old` will hold files from old generations.
-
-          ::: {.note}
-          These options are deprecated, unsupported, and may not work like expected.
-          :::
-        '';
-      };
-
-      version = mkOption {
-        default = 2;
-        type = types.enum [ 0 1 2 3 4 ];
-        description = "";
-      };
-
-      uboot = {
-        enable = mkOption {
-          default = false;
-          type = types.bool;
-          description = ''
-            Enable using uboot as bootmanager for the raspberry pi.
-
-            ::: {.note}
-            These options are deprecated, unsupported, and may not work like expected.
-            :::
-          '';
-        };
-
-        configurationLimit = mkOption {
-          default = 20;
-          example = 10;
-          type = types.int;
-          description = ''
-            Maximum number of configurations in the boot menu.
-
-            ::: {.note}
-            These options are deprecated, unsupported, and may not work like expected.
-            :::
-          '';
-        };
-
-      };
-
-      firmwareConfig = mkOption {
-        default = null;
-        type = types.nullOr types.lines;
-        description = ''
-          Extra options that will be appended to `/boot/config.txt` file.
-          For possible values, see: https://www.raspberrypi.com/documentation/computers/config_txt.html
-
-          ::: {.note}
-          These options are deprecated, unsupported, and may not work like expected.
-          :::
-        '';
-      };
-    };
-  };
-
-  config = mkMerge[
-    (mkIf cfg.uboot.enable {
-      warnings = [
-        ''
-          The option set for `boot.loader.raspberrypi.uboot` has been recommended against
-          for years, and is now formally deprecated.
-
-          It is possible it already did not work like you expected.
-
-          It never worked on the Raspberry Pi 4 family.
-
-          These options will be removed by NixOS 24.11.
-        ''
-      ];
-    })
-    (mkIf cfg.enable {
-      warnings = [
-        ''
-          The option set for `boot.loader.raspberrypi` has been recommended against
-          for years, and is now formally deprecated.
-
-          It is possible it already did not work like you expected.
-
-          It never worked on the Raspberry Pi 4 family.
-
-          These options will be removed by NixOS 24.11.
-        ''
-      ];
-    })
-    (mkIf cfg.enable {
-      assertions = singleton {
-        assertion = !pkgs.stdenv.hostPlatform.isAarch64 || cfg.version >= 3;
-        message = "Only Raspberry Pi >= 3 supports aarch64.";
-      };
-
-      system.build.installBootLoader = builder;
-      system.boot.loader.id = "raspberrypi";
-      system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
-    })
-  ];
-}
diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
deleted file mode 100644
index a4352ab9a240..000000000000
--- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs, version, configTxt }:
-
-let
-  isAarch64 = pkgs.stdenv.hostPlatform.isAarch64;
-
-  uboot =
-    if version == 0 then
-      pkgs.ubootRaspberryPiZero
-    else if version == 1 then
-      pkgs.ubootRaspberryPi
-    else if version == 2 then
-      pkgs.ubootRaspberryPi2
-    else if version == 3 then
-      if isAarch64 then
-        pkgs.ubootRaspberryPi3_64bit
-      else
-        pkgs.ubootRaspberryPi3_32bit
-    else
-      throw "U-Boot is not yet supported on the raspberry pi 4.";
-
-  extlinuxConfBuilder =
-    import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
-      pkgs = pkgs.buildPackages;
-    };
-in
-pkgs.substituteAll {
-  src = ./uboot-builder.sh;
-  isExecutable = true;
-  inherit (pkgs) bash;
-  path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
-  firmware = pkgs.raspberrypifw;
-  inherit uboot;
-  inherit configTxt;
-  inherit extlinuxConfBuilder;
-  inherit version;
-}
-
diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh
deleted file mode 100644
index ea591427179f..000000000000
--- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! @bash@/bin/sh -e
-
-target=/boot # Target directory
-
-while getopts "t:c:d:g:" opt; do
-    case "$opt" in
-        d) target="$OPTARG" ;;
-        *) ;;
-    esac
-done
-
-copyForced() {
-    local src="$1"
-    local dst="$2"
-    cp $src $dst.tmp
-    mv $dst.tmp $dst
-}
-
-# Call the extlinux builder
-"@extlinuxConfBuilder@" "$@"
-
-# Add the firmware files
-fwdir=@firmware@/share/raspberrypi/boot/
-copyForced $fwdir/bootcode.bin  $target/bootcode.bin
-copyForced $fwdir/fixup.dat     $target/fixup.dat
-copyForced $fwdir/fixup_cd.dat  $target/fixup_cd.dat
-copyForced $fwdir/fixup_db.dat  $target/fixup_db.dat
-copyForced $fwdir/fixup_x.dat   $target/fixup_x.dat
-copyForced $fwdir/start.elf     $target/start.elf
-copyForced $fwdir/start_cd.elf  $target/start_cd.elf
-copyForced $fwdir/start_db.elf  $target/start_db.elf
-copyForced $fwdir/start_x.elf   $target/start_x.elf
-
-# Add the uboot file
-copyForced @uboot@/u-boot.bin $target/u-boot-rpi.bin
-
-# Add the config.txt
-copyForced @configTxt@ $target/config.txt