From 46383fc82bb6c7b2442889422ed62e3cafdb0161 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 14 Jun 2023 14:38:09 +0000
Subject: [PATCH 01/95] linuxManualConfig: set badPlatforms

Older kernels shouldn't be marked as supporting architectures that
were only added to the kernel later.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 61013ef090af..8dd92c99db4a 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -352,6 +352,9 @@ let
           maintainers.thoughtpolice
         ];
         platforms = platforms.linux;
+        badPlatforms =
+          lib.optionals (lib.versionOlder version "4.15") [ "riscv32-linux" "riscv64-linux" ] ++
+          lib.optional (lib.versionOlder version "5.19") "loongarch64-linux";
         timeout = 14400; # 4 hours
       } // extraMeta;
     };

From 614b63922b6fd8bcc28760fa52c495f55fa35800 Mon Sep 17 00:00:00 2001
From: Jade Lovelace <software@lfcode.ca>
Date: Sun, 26 Feb 2023 21:25:28 -0800
Subject: [PATCH 02/95] ubootTools: add man pages

As far as I can tell, there are no makefile targets to install these, or
anything like that, so we have to do it by hand.

This adds man pages for dumpimage, kwboot, mkeficapsule, and mkimage.
There are no man pages in other sections than 1.
---
 pkgs/misc/uboot/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 517f9e784a61..81b37d7632c1 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -8,6 +8,7 @@
 , fetchurl
 , flex
 , gnutls
+, installShellFiles
 , libuuid
 , meson-tools
 , ncurses
@@ -66,6 +67,7 @@ let
       bison
       dtc
       flex
+      installShellFiles
       openssl
       (buildPackages.python3.withPackages (p: [
         p.libfdt
@@ -136,6 +138,12 @@ in {
     dontStrip = false;
     extraMeta.platforms = lib.platforms.linux;
     extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
+
+    outputs = [ "out" "man" ];
+
+    postInstall = ''
+      installManPage doc/*.1
+    '';
     filesToInstall = [
       "tools/dumpimage"
       "tools/fdtgrep"

From 4337cf0e721c18c90385660fb1366be4050b340e Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 3 Aug 2023 14:51:50 +0200
Subject: [PATCH 03/95] lvm2: 2.03.21 -> 2.03.22

https://github.com/lvmteam/lvm2/blob/v2_03_22/WHATS_NEW
---
 pkgs/os-specific/linux/lvm2/2_03.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix
index e054d3dbfc9c..b2f6b0aa8a23 100644
--- a/pkgs/os-specific/linux/lvm2/2_03.nix
+++ b/pkgs/os-specific/linux/lvm2/2_03.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "2.03.21";
-  hash = "sha256-HiYZIdYhmYrcN5YMYV3nhMYUXH9zeoC3gfMQj77Gen4=";
+  version = "2.03.22";
+  hash = "sha256-TFppI70aznzgRHRgioSTfOBTupGxrOnwsAFyaOcy3Hw=";
 }

From 23b3bf2c6998a5807947f680d00c7d63dd52aae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 9 Aug 2023 11:35:59 -0700
Subject: [PATCH 04/95] python310Packages.pikepdf: 8.2.1 -> 8.3.0

Diff: https://github.com/pikepdf/pikepdf/compare/v8.2.1...v8.3.0

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

diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 66d7cf680bfd..01884677f26d 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "8.2.1";
+  version = "8.3.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-8uPPEoLxoMRq/tkpThatwjPHZIMYQ8lNL6fLcG+nsnw=";
+    hash = "sha256-d76s4iJFwhzWSySXTS53PQQuWfWIboIRecEyjzobsME=";
   };
 
   patches = [

From 8522d789be48eb151be33f2c5053f425158ec4f2 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 13 Aug 2023 14:43:11 -0400
Subject: [PATCH 05/95] cargo-auditable-cargo-wrapper: fix wrapper

Packages were not correctly built with carog-auditable due to the
missing auditable flag
---
 .../compilers/rust/cargo-auditable-cargo-wrapper.nix           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
index cc4aed0262ff..d415b2431fc3 100644
--- a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
@@ -9,5 +9,6 @@ runCommand "auditable-${cargo.name}" {
   mkdir -p $out/bin
   makeWrapper ${cargo}/bin/cargo $out/bin/cargo \
     --set CARGO_AUDITABLE_IGNORE_UNSUPPORTED 1 \
-    --prefix PATH : ${lib.makeBinPath [ cargo cargo-auditable ]}
+    --prefix PATH : ${lib.makeBinPath [ cargo cargo-auditable ]} \
+    --add-flags auditable
 ''

From dc7cdbe466be4b1b632a8d4d0be5f4a9b372b1f1 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 13 Aug 2023 14:50:43 -0400
Subject: [PATCH 06/95] cargo-auditable-cargo-wrapper: add test

---
 .../compilers/rust/cargo-auditable-cargo-wrapper.nix     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
index d415b2431fc3..d00ab4f496b3 100644
--- a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
@@ -1,7 +1,14 @@
-{ lib, runCommand, makeBinaryWrapper, cargo, cargo-auditable }:
+{ lib, runCommand, makeBinaryWrapper, rust-audit-info, cargo, cargo-auditable }:
 
 runCommand "auditable-${cargo.name}" {
   nativeBuildInputs = [ makeBinaryWrapper ];
+
+  passthru.tests = runCommand "rust-audit-info-test" {
+    nativeBuildInputs = [ rust-audit-info ];
+  } ''
+    rust-audit-info ${lib.getBin rust-audit-info}/bin/rust-audit-info > $out
+  '';
+
   meta = cargo-auditable.meta // {
     mainProgram = "cargo";
   };

From 4ed066807b97385e39017a9a1506c36e5ea3c9d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Aug 2023 15:23:39 -0700
Subject: [PATCH 07/95] python310Packages.faust-cchardet: 2.1.18 -> 2.1.19

Diff: https://github.com/faust-streaming/cChardet/compare/refs/tags/v2.1.18...v2.1.19

Changelog: https://github.com/faust-streaming/cChardet/releases/tag/v2.1.19
---
 pkgs/development/python-modules/faust-cchardet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix
index ad979dbaf6ab..6ee8b07137ee 100644
--- a/pkgs/development/python-modules/faust-cchardet/default.nix
+++ b/pkgs/development/python-modules/faust-cchardet/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "faust-cchardet";
-  version = "2.1.18";
+  version = "2.1.19";
   format = "pyproject";
 
   src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     repo = "cChardet";
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
-    hash = "sha256-jTOqxBss/FAb8nMkU62H6O4ysmirD2FTA9mtvxXh43k=";
+    hash = "sha256-yY6YEhXC4S47rxnkKAta4m16IVGn7gkHSt056bYOYJ4=";
   };
 
   nativeBuildInputs = [

From 8fd949b78ea141663ea4aacb3bdb52d129f4d818 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Aug 2023 06:18:58 +0000
Subject: [PATCH 08/95] exempi: 2.6.3 -> 2.6.4

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

diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 54bab95992c0..ac45084a74f9 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "exempi";
-  version = "2.6.3";
+  version = "2.6.4";
 
   src = fetchurl {
     url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-sHSdsYqeeM93FzeVSoOM3NsdVBWIi6wbqcr4y6d8ZWw=";
+    sha256 = "sha256-p1FJyWth45zcsEb9XlbYjP7qtuCPiU4V6//ZlECSv9A=";
   };
 
   configureFlags = [

From 74ac830839ebe3297dafa25d36961b137325d689 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 1 Jun 2023 15:47:30 +0200
Subject: [PATCH 09/95] protobuf: init 3.24

---
 pkgs/development/libraries/protobuf/3.24.nix | 6 ++++++
 pkgs/top-level/all-packages.nix              | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/protobuf/3.24.nix

diff --git a/pkgs/development/libraries/protobuf/3.24.nix b/pkgs/development/libraries/protobuf/3.24.nix
new file mode 100644
index 000000000000..5534e16b17ac
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.24.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic-v3-cmake.nix ({
+  version = "3.24.1";
+  sha256 = "sha256-70gKH18Ak3TJisscj8JsbOJavOFxbWbVEtGjTXUlqSI=";
+} // args)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afa659852f35..a0163f0435e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24525,8 +24525,9 @@ with pkgs;
 
   prospector = callPackage ../development/tools/prospector { };
 
-  protobuf = protobuf3_23;
+  protobuf = protobuf3_24;
 
+  protobuf3_24 = callPackage ../development/libraries/protobuf/3.24.nix { };
   protobuf3_23 = callPackage ../development/libraries/protobuf/3.23.nix { };
   protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix {
     abseil-cpp = abseil-cpp_202103;

From 65fb82bad16dab2e8ed4974255203da0e26bbff9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 22 Aug 2023 10:46:53 +0200
Subject: [PATCH 10/95] python311Packages.cryptography: 41.0.2 -> 41.0.3

Changelog: https://cryptography.io/en/latest/changelog/#v41-0-3
---
 .../python-modules/cryptography/default.nix   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 076e045d7272..aa762e315c13 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -1,10 +1,10 @@
 { lib
 , stdenv
-, callPackage
 , buildPythonPackage
-, fetchPypi
+, callPackage
 , cargo
 , cffi
+, fetchPypi
 , hypothesis
 , iso8601
 , isPyPy
@@ -14,8 +14,8 @@
 , pkg-config
 , pretend
 , py
-, pytestCheckHook
 , pytest-subtests
+, pytestCheckHook
 , pythonOlder
 , pytz
 , rustc
@@ -29,20 +29,20 @@ let
 in
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "41.0.2"; # Also update the hash in vectors.nix
+  version = "41.0.3"; # Also update the hash in vectors.nix
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fSML+FYWTeFk7LYVzMFMf8beaQbd1bSR86+Q01FMklw=";
+    hash = "sha256-bRknQRE+9eMNidy1uVbvThV48wRwhwG4tz044+FGHzQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "${pname}-${version}/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-hkuoICa/suMXlr4u95JbMlFzi27lJqJRmWnX3nZfzKU=";
+    hash = "sha256-LQu7waympGUs+CZun2yDQd2gUUAgyisKBG5mddrfSo0=";
   };
 
   postPatch = ''
@@ -62,9 +62,14 @@ buildPythonPackage rec {
     cffi
   ];
 
-  buildInputs = [ openssl ]
-    ++ lib.optionals stdenv.isDarwin [ Security libiconv ]
-    ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ];
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    Security
+    libiconv
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    libxcrypt
+  ];
 
   propagatedBuildInputs = lib.optionals (!isPyPy) [
     cffi

From ea8fbffd04cb4955ce4f2f1afca2e13fc77129c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 22 Aug 2023 10:48:37 +0200
Subject: [PATCH 11/95] python311Packages.cryptography-vectors: 41.0.2 ->
 41.0.3

---
 .../python-modules/cryptography/vectors.nix     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 554873de89e1..ff8bfa05ed51 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -1,4 +1,9 @@
-{ buildPythonPackage, fetchPypi, lib, cryptography, setuptools }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cryptography
+, setuptools
+}:
 
 buildPythonPackage rec {
   pname = "cryptography-vectors";
@@ -9,15 +14,19 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cryptography_vectors";
     inherit version;
-    hash = "sha256-Ao3/lKhSLKgYsRKV/xLfVfNI8zoZPAWX3f6COeU9FYI=";
+    hash = "sha256-gN4EUsSzT1b1UY6B69dba5BfVyiq7VIdQuQfTryKQ/s=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  nativeBuildInputs = [
+    setuptools
+  ];
 
   # No tests included
   doCheck = false;
 
-  pythonImportsCheck = [ "cryptography_vectors" ];
+  pythonImportsCheck = [
+    "cryptography_vectors"
+  ];
 
   meta = with lib; {
     description = "Test vectors for the cryptography package";

From 30b6520d9e5486d19af0143d91008807435eab4b Mon Sep 17 00:00:00 2001
From: Anund <anundm@gmail.com>
Date: Mon, 21 Aug 2023 21:05:51 -0600
Subject: [PATCH 12/95] python3.pkgs.pip: install man pages

---
 .../python-modules/pip/default.nix            | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index bc06cb39e247..01cdb5f6273d 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -10,6 +10,9 @@
 , pretend
 , pytest
 
+# docs
+, sphinx
+
 # coupled downsteam dependencies
 , pip-tools
 }:
@@ -36,14 +39,46 @@ buildPythonPackage rec {
     installShellFiles
     setuptools
     wheel
+
+    # docs
+    sphinx
   ];
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  # pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting
+  # to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148
+  postBuild = ''
+    cd docs
+
+    # remove references to sphinx extentions only required for html doc generation
+    # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug
+    # sphinxcontrib.towncrier is not currently packaged
+    for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do
+      substituteInPlace html/conf.py --replace '"'$ext'",' ""
+    done
+
+    PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \
+      -d build/doctrees/man \
+      -c html \
+      -d build/doctrees/man \
+      -b man \
+      man \
+      build/man
+    cd ..
+  '';
+
   nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ];
 
   # Pip wants pytest, but tests are not distributed
   doCheck = false;
 
   postInstall = ''
+    installManPage docs/build/man/*
+
     installShellCompletion --cmd pip \
       --bash <($out/bin/pip completion --bash) \
       --fish <($out/bin/pip completion --fish) \

From b1c95fb843374ca29684b89009a54955a22db8c5 Mon Sep 17 00:00:00 2001
From: Anund <anundm@gmail.com>
Date: Mon, 21 Aug 2023 21:17:39 -0600
Subject: [PATCH 13/95] python3Packages.pip: silence pip warning in build

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

diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index 01cdb5f6273d..484a15e85876 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -80,9 +80,9 @@ buildPythonPackage rec {
     installManPage docs/build/man/*
 
     installShellCompletion --cmd pip \
-      --bash <($out/bin/pip completion --bash) \
-      --fish <($out/bin/pip completion --fish) \
-      --zsh <($out/bin/pip completion --zsh)
+      --bash <($out/bin/pip completion --bash --no-cache-dir) \
+      --fish <($out/bin/pip completion --fish --no-cache-dir) \
+      --zsh <($out/bin/pip completion --zsh --no-cache-dir)
   '';
 
   passthru.tests = { inherit pip-tools; };

From 2b2ff2019e44d8aabf8985dce89955a2f8678312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BE=E5=9C=B0=20=E5=B8=8C=E7=95=99=E8=80=B6?=
 <65301509+KiruyaMomochi@users.noreply.github.com>
Date: Wed, 23 Aug 2023 02:44:44 +0800
Subject: [PATCH 14/95] python3.pkgs.ruamel-base: add pythonNamespaces to
 remove nspkg.pth file

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

diff --git a/pkgs/development/python-modules/ruamel-base/default.nix b/pkgs/development/python-modules/ruamel-base/default.nix
index 26b94d0fd917..675ae527b311 100644
--- a/pkgs/development/python-modules/ruamel-base/default.nix
+++ b/pkgs/development/python-modules/ruamel-base/default.nix
@@ -18,6 +18,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ruamel.base" ];
 
+  pythonNamespaces = [ "ruamel" ];
+
   meta = with lib; {
     description = "Common routines for ruamel packages";
     homepage = "https://sourceforge.net/projects/ruamel-base/";

From 59b0c42c6af10aa3221d68143d726d9bd5a80c66 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 23 Aug 2023 16:28:08 +0200
Subject: [PATCH 15/95] python310Packages.regex: 2022.10.31 -> 2023.8.8

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

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index d41bed6136ed..2df8bf922ea7 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2022.10.31";
+  version = "2023.8.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-o6mJIdqaG/hFeu7mpVGUioNgFonl7N1zaJTqm77HfoM=";
+    hash = "sha256-/L3F8rDxzQ9qVs20b+QdLM4eZE47aIMvPu68X7D3cS4=";
   };
 
   checkPhase = ''

From 9ab635ff4151456339a6bb31f21c5f791fcf420b Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Wed, 23 Aug 2023 10:59:08 -0700
Subject: [PATCH 16/95] python3.pkgs.flask-limiter: update hash to reflect
 what's on GitHub now

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

diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix
index b32fc7b25afc..1305234e43f7 100644
--- a/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/pkgs/development/python-modules/flask-limiter/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "alisaifee";
     repo = "flask-limiter";
     rev = "refs/tags/${version}";
-    hash = "sha256-YDVZ/dD+TRJEnJRTRmGEB6EIkK5eQ5MdXh8FideoVDQ=";
+    hash = "sha256-UtmMd180bwFm426YevARq6r7DL182dI7dGAUPFKLWuM=";
   };
 
   postPatch = ''

From ecee8ebfb8637cceecfa6760683d37c25354eb2f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 18 Aug 2023 07:36:01 +0000
Subject: [PATCH 17/95] python311Packages.dnspython: 2.4.1 -> 2.4.2

Changelog: https://github.com/rthalley/dnspython/blob/v2.4.2/doc/whatsnew.rst
---
 pkgs/development/python-modules/dnspython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index 402272fb54b8..5bf9981170b1 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "dnspython";
-  version = "2.4.1";
+  version = "2.4.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wzlxx5r1vpaLuJfpXCRI4RpkXuhNk7Jlzgt6q+Xf3Kg=";
+    hash = "sha256-jc+ujHRgovhLQHLibxyfQQHKIMBxZJy3w06LapPViYQ=";
   };
 
   nativeBuildInputs = [

From 094bfcf23765c4f4630088fdba2bff3c3a549e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 25 Aug 2023 20:07:09 +0200
Subject: [PATCH 18/95] Reapply "python3Packages.pillow &
 python3Packages.pillow-simd: Fix cross compilation""

This reverts commit 68eb95705fac46c95832e84e4947a74db304bb33, reversing
changes made to 347a238ef8b00f6134315b5b441877bba56db344.
Moving the big rebuild to staging; original PR #249136, revert #251367
---
 pkgs/development/python-modules/pillow-simd/default.nix | 2 +-
 pkgs/development/python-modules/pillow/default.nix      | 2 +-
 pkgs/development/python-modules/pillow/generic.nix      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix
index 4573e25a22b2..ca0d947d37b1 100644
--- a/pkgs/development/python-modules/pillow-simd/default.nix
+++ b/pkgs/development/python-modules/pillow-simd/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k
 , olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2
 , libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml
-, pytestCheckHook
+, pytestCheckHook, setuptools
 }@args:
 
 import ../pillow/generic.nix (rec {
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index bb669f421177..bf3b1991c39a 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -6,7 +6,7 @@
 , fetchpatch
 , isPyPy
 , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11
-, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
+, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools
 # for passthru.tests
 , imageio, matplotlib, pilkit, pydicom, reportlab
 }@args:
diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix
index 95ecce0522c3..5186e8a476bb 100644
--- a/pkgs/development/python-modules/pillow/generic.nix
+++ b/pkgs/development/python-modules/pillow/generic.nix
@@ -39,6 +39,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook pyroma numpy ];
 
+  nativeBuildInputs = [ setuptools ];
+
   buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ]
     ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ]
     ++ lib.optionals (isPyPy) [ tk libX11 ];

From e2a51f1e497c50809402170876b5ddf085586e74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 25 Aug 2023 21:41:21 +0200
Subject: [PATCH 19/95] libgit2: 1.7.0 -> 1.7.1

---
 pkgs/development/libraries/libgit2/default.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix
index 9c04e9b4058f..085c4c79bdc9 100644
--- a/pkgs/development/libraries/libgit2/default.nix
+++ b/pkgs/development/libraries/libgit2/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , pkg-config
 , python3
@@ -20,29 +19,16 @@
 
 stdenv.mkDerivation rec {
   pname = "libgit2";
-  version = "1.7.0";
+  version = "1.7.1";
   # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
 
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    hash = "sha256-3ZVBGd2T5DQKsDEc5a7pS0yz01+rDCszU9ZK0zxvfyQ=";
+    hash = "sha256-3W0/i6Pu7I7D1zMQhmEqJVsa7PZpKOqU1+udNENSBvM=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "darwin-errSSLNetworkTimeout.patch";
-      url = "https://github.com/libgit2/libgit2/commit/3e15292d8863da316a57be23fede04f443460686.patch";
-      hash = "sha256-N314YK7osO9L3hCXb+FcMoDM8iBW9Bt8D5O2Szdz7YA=";
-    })
-    (fetchpatch {
-      name = "missing-git_oidarray.patch";
-      url = "https://github.com/libgit2/libgit2/commit/085a169c1d73e02888708652d7772b3bc1f1b28b.diff";
-      hash = "sha256-l6q1TLuOloyk0Jqvo5Npv4grU/oxlg+RFLa43qENaLI=";
-    })
-  ];
-
   cmakeFlags = [
     "-DUSE_HTTP_PARSER=system"
     "-DUSE_SSH=ON"

From d4c11433b850c1c8e82cf4c9913305bfd833e44b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 25 Aug 2023 23:33:35 +0200
Subject: [PATCH 20/95] protobuf: 3.24.1 -> 3.24.2

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

diff --git a/pkgs/development/libraries/protobuf/3.24.nix b/pkgs/development/libraries/protobuf/3.24.nix
index 5534e16b17ac..2deb155444ec 100644
--- a/pkgs/development/libraries/protobuf/3.24.nix
+++ b/pkgs/development/libraries/protobuf/3.24.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic-v3-cmake.nix ({
-  version = "3.24.1";
-  sha256 = "sha256-70gKH18Ak3TJisscj8JsbOJavOFxbWbVEtGjTXUlqSI=";
+  version = "3.24.2";
+  sha256 = "sha256-yVLszyVtsz1CCzeOkioL4O3mWTFKKVBUyOhwDbC5UqE=";
 } // args)

From 796ced2b2a414c7a16971c6d7fe6b63915b51a20 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 10:47:32 +0200
Subject: [PATCH 21/95] python311Packages.anyio: 3.7.0 -> 3.7.1

Diff: https://github.com/agronholm/anyio/compare/3.7.0...3.7.1

Changelog: https://github.com/agronholm/anyio/blob/3.7.1/docs/versionhistory.rst
---
 pkgs/development/python-modules/anyio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 82874b9a3132..3508554d308d 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "3.7.0";
+  version = "3.7.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = pname;
     rev = version;
-    hash = "sha256-uXPp2ycYl3T/ybZihDchImC/Yi4qgHI37ZeA+I6dg4c=";
+    hash = "sha256-9/pAcVTzw9v57E5l4d8zNyBJM+QNGEuLKrQ0WUBW5xw=";
   };
 
   env.SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 5abaf61d0fa88efbb36da7139c9004f63006d345 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 22 Aug 2023 22:31:36 -0300
Subject: [PATCH 22/95] wafHook: assimilated under waf.passthru.hook

---
 pkgs/development/tools/build-managers/waf/default.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index 58d3a7d86f42..de4022ed7d70 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, callPackage
 , ensureNewerSourcesForZipFilesHook
 , python3
 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]`
@@ -59,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    inherit python3 extraTools;
+    hook = callPackage ./hook.nix {
+      waf = finalAttrs.finalPackage;
+    };
+  };
+
   meta = {
     homepage = "https://waf.io";
     description = "The meta build system";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dc5931441f5..fd38df39e180 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14765,7 +14765,7 @@ with pkgs;
   volumeicon = callPackage ../tools/audio/volumeicon { };
 
   waf = callPackage ../development/tools/build-managers/waf { };
-  wafHook = callPackage ../development/tools/build-managers/waf/hook.nix { };
+  wafHook = waf.hook;
 
   waf-tester = callPackage ../tools/security/waf-tester { };
 

From 100df07ba59fc23419fd0826a2a9273af3514df2 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:14 -0300
Subject: [PATCH 23/95] ams-lv2: change wafHook to waf.hook

---
 pkgs/applications/audio/ams-lv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index 88956a190c4a..b771c0368148 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkg-config
-, wafHook, python3 }:
+, waf, python3 }:
 
 stdenv.mkDerivation  rec {
   pname = "ams-lv2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation  rec {
     sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook python3 ];
+  nativeBuildInputs = [ pkg-config waf.hook python3 ];
   buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ];
 
   meta = with lib; {

From d6f05c5cf5019b43280b4475f1ac4503c1d2a6d0 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:14 -0300
Subject: [PATCH 24/95] ardour-6: change wafHook to waf.hook

---
 pkgs/applications/audio/ardour/6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ardour/6.nix b/pkgs/applications/audio/ardour/6.nix
index 4e0508f00c57..fa6cfce7977a 100644
--- a/pkgs/applications/audio/ardour/6.nix
+++ b/pkgs/applications/audio/ardour/6.nix
@@ -50,7 +50,7 @@
 , suil
 , taglib
 , vamp-plugin-sdk
-, wafHook
+, waf
 , xjadeo
 , videoSupport ? true
 }:
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
     perl
     pkg-config
     python3
-    wafHook
+    waf.hook
   ];
 
   buildInputs = [

From 04f6ad419b58205319334e66c8f0a4fc5b823dd9 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:14 -0300
Subject: [PATCH 25/95] ardour: change wafHook to waf.hook

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

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 2c8a44f62162..a39aa7242e72 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -52,7 +52,7 @@
 , suil
 , taglib
 , vamp-plugin-sdk
-, wafHook
+, waf
 , xjadeo
 , videoSupport ? true
 }:
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     perl
     pkg-config
     python3
-    wafHook
+    waf.hook
   ];
 
   buildInputs = [

From 6b342ad576d0fe63c1f13846ff3251ee2449028f Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:14 -0300
Subject: [PATCH 26/95] fomp: change wafHook to waf.hook

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

diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index 8dc86cb8ccf5..14231a1b2ad4 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, lv2, pkg-config, python3, wafHook }:
+{ lib, stdenv, fetchurl, lv2, pkg-config, python3, waf }:
 
 stdenv.mkDerivation rec {
   pname = "fomp";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8=";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook ];
+  nativeBuildInputs = [ pkg-config waf.hook ];
   buildInputs = [ lv2 python3 ];
 
   meta = with lib; {

From 8dd441e6cfbef2d5413c6440845ad36153a0adcf Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:15 -0300
Subject: [PATCH 27/95] guitarix: change wafHook to waf.hook

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

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 3033888996a1..e40084ff5a1b 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -30,7 +30,7 @@
 , serd
 , sord
 , sratom
-, wafHook
+, waf
 , wrapGAppsHook
 , zita-convolver
 , zita-resampler
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     intltool
     pkg-config
     python3
-    wafHook
+    waf.hook
     wrapGAppsHook
   ];
 

From 500a456d7cda1de8d59c840f746a6941fd699151 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:15 -0300
Subject: [PATCH 28/95] ingen: change wafHook to waf.hook

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

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 81a97d5a054e..7c86d3b76fa0 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
 , lv2, pkg-config, python3, raul, serd, sord, sratom
-, wafHook
+, waf
 , suil
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation  rec {
     deepClone = true;
   };
 
-  nativeBuildInputs = [ pkg-config wafHook python3 python3.pkgs.wrapPython ];
+  nativeBuildInputs = [ pkg-config waf.hook python3 python3.pkgs.wrapPython ];
   buildInputs = [
     boost ganv glibmm gtkmm2 libjack2 lilv lv2
     python3 raul serd sord sratom suil

From a3e2ad556ea6ab1d139d2f91e57c59fc320899ee Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:15 -0300
Subject: [PATCH 29/95] jalv: change wafHook to waf.hook

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

diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index b640b55c5476..82c747c2d7a6 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3
-, serd, sord , sratom, suil, wafHook }:
+, serd, sord , sratom, suil, waf }:
 
 stdenv.mkDerivation  rec {
   pname = "jalv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation  rec {
     sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY=";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook ];
+  nativeBuildInputs = [ pkg-config waf.hook ];
   buildInputs = [
     gtk2 libjack2 lilv lv2 python3 serd sord sratom suil
   ];

From 34daee396d3f18d785de973de1e894a1832cc732 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:15 -0300
Subject: [PATCH 30/95] mda-lv2: change wafHook to waf.hook

---
 pkgs/applications/audio/mda-lv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
index 98812bec4d87..269d334fbe97 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, wafHook, python3 }:
+{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, waf, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "mda-lv2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-zWYRcCSuBJzzrKg/npBKcCdyJOI6lp9yqcXQEKSYV9s=";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook python3 ];
+  nativeBuildInputs = [ pkg-config waf.hook python3 ];
   buildInputs = [ fftwSinglePrec lv2 ];
 
   meta = with lib; {

From e1ded261e1c284052010cbbd2c1194f8185aadb6 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:15 -0300
Subject: [PATCH 31/95] non: change wafHook to waf.hook

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

diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 39b8ecf7a6af..8afcd1c02709 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, python3, cairo, libjpeg, ntk, libjack2
-, libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook
+, libsndfile, ladspaH, liblo, libsigcxx, lrdf, waf
 }:
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-iMJNMDytNXpEkUhL0RILSd25ixkm8HL/edtOZta0Pf4=";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook ];
+  nativeBuildInputs = [ pkg-config waf.hook ];
   buildInputs = [ python3 cairo libjpeg ntk libjack2 libsndfile
                   ladspaH liblo libsigcxx lrdf
   ];

From c3760fa98a6475856c435414d9aef018a14ffc70 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:16 -0300
Subject: [PATCH 32/95] patchage: change wafHook to waf.hook

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

diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
index 99bbdf693a9c..603f42886739 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -10,7 +10,7 @@
 , libjack2
 , pkg-config
 , python3
-, wafHook
+, waf
 }:
 
 stdenv.mkDerivation rec {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     gtkmm2
     libjack2
     python3
-    wafHook
+    waf.hook
   ];
 
   meta = {

From de42071988daced2449d3ddb0017851b0fcca6e3 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:16 -0300
Subject: [PATCH 33/95] hamster: change wafHook to waf.hook

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

diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix
index 925d246ba844..d727257fbec5 100644
--- a/pkgs/applications/misc/hamster/default.nix
+++ b/pkgs/applications/misc/hamster/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3
-, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }:
+, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, waf }:
 
 python3Packages.buildPythonApplication rec {
   pname = "hamster";
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     wrapGAppsHook
     intltool
     itstool
-    wafHook
+    waf.hook
     glib
     gobject-introspection
   ];

From 6437704b043cdfca7e38904d43a6725b90a05e8d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:16 -0300
Subject: [PATCH 34/95] kupfer: change wafHook to waf.hook

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

diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index fbb33c7e096f..2e6eedc0cea8 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -10,7 +10,7 @@
 , desktop-file-utils
 , shared-mime-info
 , wrapGAppsHook
-, wafHook
+, waf
 , bash
 , dbus
 }:
@@ -31,7 +31,7 @@ buildPythonApplication rec {
   nativeBuildInputs = [
     wrapGAppsHook intltool
     # For setup hook
-    gobject-introspection wafHook
+    gobject-introspection waf.hook
     itstool            # for help pages
     desktop-file-utils # for update-desktop-database
     shared-mime-info   # for update-mime-info

From 0edf0918bbdbe839ecac69ab575a85d0d344f2f6 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:16 -0300
Subject: [PATCH 35/95] semantik: change wafHook to waf.hook

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

diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix
index 5ceb37b411c1..7e240823cb42 100644
--- a/pkgs/applications/office/semantik/default.nix
+++ b/pkgs/applications/office/semantik/default.nix
@@ -3,7 +3,7 @@
 , mkDerivation
 , fetchFromGitLab
 , fetchpatch
-, wafHook
+, waf
 , pkg-config
 , cmake
 , qtbase
@@ -65,7 +65,7 @@ mkDerivation rec {
       --replace /usr/include/KF5/KDELibs4Support "${lib.getDev kdelibs4support}/include/KF5/KDELibs4Support"
   '';
 
-  nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config wafHook cmake ];
+  nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config waf.hook cmake ];
 
   buildInputs = [
     qtbase

From 46f28863df90194e75effb56e055381a3b3124c1 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:16 -0300
Subject: [PATCH 36/95] xfce.xfce4-namebar-plugin: change wafHook to waf.hook

---
 .../xfce/panel-plugins/xfce4-namebar-plugin/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
index 032b29eaef3d..6583c8b03a2e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala
-, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce
+, gtk3, libwnck, libxfce4util, xfce4-panel, waf, xfce
 , gitUpdater
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA=";
   };
 
-  nativeBuildInputs = [ pkg-config vala wafHook python3 ];
+  nativeBuildInputs = [ pkg-config vala waf.hook python3 ];
   buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ];
 
   postPatch = ''

From fb3878d323b26505844fed0aa7c8df3afae8b596 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:16 -0300
Subject: [PATCH 37/95] talloc: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index bfe38fd4719a..5fad3c1c5121 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -8,7 +8,7 @@
 , docbook-xsl-nons
 , docbook_xml_dtd_42
 , fixDarwinDylibNames
-, wafHook
+, waf
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     python3
-    wafHook
+    waf.hook
     docbook-xsl-nons
     docbook_xml_dtd_42
   ] ++ lib.optionals stdenv.isDarwin [

From ccc75bc846e38e5861c4c02ec44435e98e51235e Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:17 -0300
Subject: [PATCH 38/95] tdb: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index c166d36d5a60..bf35c5c0d910 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchurl
 , pkg-config
-, wafHook
+, waf
 , python3
 , readline
 , libxslt
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     python3
     pkg-config
-    wafHook
+    waf.hook
     libxslt
     docbook-xsl-nons
     docbook_xml_dtd_45

From 4ad2212f1993fe3c29829eb0625ee4b0546ca4a0 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:17 -0300
Subject: [PATCH 39/95] tevent: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index bdb6eb21ed42..df773c6eabf8 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -9,7 +9,7 @@
 , docbook-xsl-nons
 , docbook_xml_dtd_42
 , which
-, wafHook
+, waf
 , libxcrypt
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     libxslt
     docbook-xsl-nons
     docbook_xml_dtd_42
-    wafHook
+    waf.hook
   ];
 
   buildInputs = [

From 11b910d8c735143eb5825e690b4bf910fcbea77b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:17 -0300
Subject: [PATCH 40/95] jackaudio: change wafHook to waf.hook

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

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 21ed258e2be7..01ad92c74aee 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper
 , libsamplerate, libsndfile, readline, eigen, celt
-, wafHook
+, waf
 # Darwin Dependencies
 , aften, AudioUnit, CoreAudio, libobjc, Accelerate
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkg-config python makeWrapper wafHook ];
+  nativeBuildInputs = [ pkg-config python makeWrapper waf.hook ];
   buildInputs = [ libsamplerate libsndfile readline eigen celt
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ] ++ lib.optionals stdenv.isDarwin [

From 4da1700a02b5c379ad368002b5d88cd0378946dc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:17 -0300
Subject: [PATCH 41/95] nfd: change wafHook to waf.hook

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

diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix
index 30f1140ab50e..e790d07a8f66 100644
--- a/pkgs/servers/nfd/default.nix
+++ b/pkgs/servers/nfd/default.nix
@@ -8,7 +8,7 @@
 , pkg-config
 , sphinx
 , systemd
-, wafHook
+, waf
 , websocketpp
 , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
 , withWebSocket ? true
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ pkg-config sphinx wafHook ];
+  nativeBuildInputs = [ pkg-config sphinx waf.hook ];
   buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd;
 
   wafConfigureFlags = [

From a10cefb38abe5d069484d1fc5c386662276fe59f Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:17 -0300
Subject: [PATCH 42/95] samba4: change wafHook to waf.hook

---
 pkgs/servers/samba/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 9a5ebd9f63ec..1d4822080854 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , buildPackages
 , fetchurl
-, wafHook
+, waf
 , pkg-config
 , bison
 , flex
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     python3Packages.python
-    wafHook
+    waf.hook
     pkg-config
     bison
     flex

From 22482d879b48ae45c62ac47797d55549f0296611 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:18 -0300
Subject: [PATCH 43/95] blockhash: change wafHook to waf.hook

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

diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
index 4f63cf90a3ae..9d7b613bbe0b 100644
--- a/pkgs/tools/graphics/blockhash/default.nix
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3, pkg-config, imagemagick, wafHook }:
+{ lib, stdenv, fetchFromGitHub, python3, pkg-config, imagemagick, waf }:
 
 stdenv.mkDerivation rec {
   pname = "blockhash";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0x3lvhnkb4c3pyq6p81qnnqimz35wpippiac506dgjx3b1848v35";
   };
 
-  nativeBuildInputs = [ python3 pkg-config wafHook ];
+  nativeBuildInputs = [ python3 pkg-config waf.hook ];
   buildInputs = [ imagemagick ];
 
   strictDeps = true;

From 7bcd1ad3adcc8a728c06132db59e4aaf58760742 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:18 -0300
Subject: [PATCH 44/95] ndn-tools: change wafHook to waf.hook

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

diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix
index 1cbc6d403a9d..01c05a5d1ac7 100644
--- a/pkgs/tools/networking/ndn-tools/default.nix
+++ b/pkgs/tools/networking/ndn-tools/default.nix
@@ -7,7 +7,7 @@
 , openssl
 , pkg-config
 , sphinx
-, wafHook
+, waf
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
-  nativeBuildInputs = [ pkg-config sphinx wafHook ];
+  nativeBuildInputs = [ pkg-config sphinx waf.hook ];
   buildInputs = [ libpcap ndn-cxx openssl ];
 
   wafConfigureFlags = [

From 7bb6472b59345206db18ff5cfbca50af66397793 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 07:58:18 -0300
Subject: [PATCH 45/95] saldl: change wafHook to waf.hook

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

diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix
index d02acb3100a7..7f37e61f5117 100644
--- a/pkgs/tools/networking/saldl/default.nix
+++ b/pkgs/tools/networking/saldl/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub
 , pkg-config
-, wafHook
+, waf
 , python3
 , asciidoc
 , docbook_xml_dtd_45
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    wafHook
+    waf.hook
     python3
     asciidoc
     docbook_xml_dtd_45

From b420fedfa2b4298eb1e9c3277620d244fddb007d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:30:35 -0300
Subject: [PATCH 46/95] aubio: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 2e8bdc50ca63..673064db7a5d 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate
-, libsndfile, pkg-config, python3, wafHook
+, libsndfile, pkg-config, python3, waf
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl";
   };
 
-  nativeBuildInputs = [ pkg-config python3 wafHook ];
+  nativeBuildInputs = [ pkg-config python3 waf.hook ];
   buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ];
 
   strictDeps = true;

From b6b4958ed93580ca13e9efcb847214f29165bfba Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:31:06 -0300
Subject: [PATCH 47/95] lilv: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 14b0d4c5e46f..b51a608c9695 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook
+{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, waf
 
 # test derivations
 , pipewire
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./lilv-pkgconfig.patch ];
 
-  nativeBuildInputs = [ pkg-config python3 wafHook ];
+  nativeBuildInputs = [ pkg-config python3 waf.hook ];
   buildInputs = [ serd sord sratom ];
   propagatedBuildInputs = [ lv2 ];
   dontAddWafCrossFlags = true;

From d6af0d07defe9db1bf876e43b6ddcfa18b045888 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:31:16 -0300
Subject: [PATCH 48/95] lvtk: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 9822640f8d67..af784d80a3aa 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }:
+{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, waf }:
 
 stdenv.mkDerivation rec {
   pname = "lvtk";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw=";
   };
 
-  nativeBuildInputs = [ pkg-config python3 wafHook ];
+  nativeBuildInputs = [ pkg-config python3 waf.hook ];
   buildInputs = [ boost gtkmm2 lv2 ];
 
   enableParallelBuilding = true;

From a08164d5197bf4bad6061a0a413ba44416aadca5 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:31:28 -0300
Subject: [PATCH 49/95] ntk: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index d101e2a960c6..3b8ecb807aa6 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, wafHook }:
+{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, waf }:
 
 stdenv.mkDerivation rec {
   pname = "ntk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU=";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook ];
+  nativeBuildInputs = [ pkg-config waf.hook ];
   buildInputs = [
     cairo libjpeg libXft python3
   ];

From 1e9f0794e3e5b68d53e9bc60665fdc4c5925eb72 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:31:39 -0300
Subject: [PATCH 50/95] raul: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index c200d4ab79c5..b8e21e36bba4 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }:
+{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, waf }:
 
 stdenv.mkDerivation rec {
   pname = "raul";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook python3 ];
+  nativeBuildInputs = [ pkg-config waf.hook python3 ];
   buildInputs = [ boost gtk2 ];
 
   strictDeps = true;

From 63688a260e7a4379dd554cc95fcbfbff1bd9d3d8 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:31:47 -0300
Subject: [PATCH 51/95] suil: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 3dc3bb5dacdc..f037b61e3bcf 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom
-, wafHook
+, waf
 , withQt5 ? true, qt5 ? null
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook python3 ];
+  nativeBuildInputs = [ pkg-config waf.hook python3 ];
   buildInputs = [ gtk2 lv2 serd sord sratom ]
     ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]);
 

From 27022a9a22c43b4a85c4fb4ecca9835fd84986f8 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:31:57 -0300
Subject: [PATCH 52/95] ganv: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index d53206ca667b..9818afa9412a 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }:
+{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, waf }:
 
 stdenv.mkDerivation rec {
   pname = "ganv";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f";
   };
 
-  nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ];
+  nativeBuildInputs = [ pkg-config waf.hook python3 gtk2 ];
   buildInputs = [ graphviz gtkmm2 ];
 
   strictDeps = true;

From 4d4f70310d555ce14852c953a43ab5e82c201abc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:32:11 -0300
Subject: [PATCH 53/95] ldb: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 95547fb6382a..753dee9e3f0c 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -11,7 +11,7 @@
 , docbook-xsl-nons
 , docbook_xml_dtd_42
 , cmocka
-, wafHook
+, waf
 , libxcrypt
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     python3
-    wafHook
+    waf.hook
     libxslt
     docbook-xsl-nons
     docbook_xml_dtd_42

From 74ce9c7ef3c52555c3adac8c013209ac8563dd15 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:32:24 -0300
Subject: [PATCH 54/95] ndn-cxx: change wafHook to waf.hook

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

diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index d7b31426c4f6..7ab607b01f4e 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -5,7 +5,7 @@
 , pkg-config
 , python3
 , python3Packages
-, wafHook
+, waf
 , boost179
 , openssl
 , sqlite
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8=";
   };
 
-  nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ];
+  nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx waf.hook ];
 
   buildInputs = [ boost179 openssl sqlite ];
 

From 54a729c1b0a6a5e0bead3726ae33272f7d39990d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 08:32:35 -0300
Subject: [PATCH 55/95] pflask: change wafHook to waf.hook

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

diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index 1270a9b9494f..9d7eac8bee1e 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, wafHook }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, waf }:
 
 stdenv.mkDerivation rec {
   pname = "pflask";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ python3 wafHook ];
+  nativeBuildInputs = [ python3 waf.hook ];
 
   postInstall = ''
     mkdir -p $out/bin

From 8e93a78ef45fb8853c302a2c373fbe50f11548f3 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 25 Aug 2023 16:56:20 -0300
Subject: [PATCH 56/95] doc/hooks/waf.section.md: change wafHook to waf.hook

---
 doc/hooks/waf.section.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/hooks/waf.section.md b/doc/hooks/waf.section.md
index 8cacb30ea85f..8dc78121cd9d 100644
--- a/doc/hooks/waf.section.md
+++ b/doc/hooks/waf.section.md
@@ -1,16 +1,16 @@
-# wafHook {#wafhook}
+# waf.hook {#wafhook}
 
 [Waf](https://waf.io) is a Python-based software building system.
 
-In Nixpkgs, `wafHook` overrides the default configure, build, and install phases.
+In Nixpkgs, `waf.hook` overrides the default configure, build, and install phases.
 
-## Variables controlling wafHook {#variablesControllingWafHook}
+## Variables controlling waf.hook {#variablesControllingWafHook}
 
 ### `wafPath` {#wafPath}
 
 Location of the `waf` tool. It defaults to `./waf`, to honor software projects that include it directly inside their source trees.
 
-If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nixpkgs to it.
+If `wafPath` doesn't exist, then `waf.hook` will copy the `waf` provided from Nixpkgs to it.
 
 ### `wafConfigureFlags` {#wafConfigureFlags}
 
@@ -36,9 +36,9 @@ When set to true, don't use the predefined `wafBuildPhase`.
 
 When set to true, don't use the predefined `wafInstallPhase`.
 
-### Variables honored by wafHook {#variablesHonoredByWafHook}
+### Variables honored by waf.hook {#variablesHonoredByWafHook}
 
-The following variables commonly used by `stdenv.mkDerivation` are also honored by `wafHook`.
+The following variables commonly used by `stdenv.mkDerivation` are also honored by `waf.hook`.
 
 - `prefixKey`
 - `configureTargets`

From 5e0eb2b87fdbcf4e999f5cfac9bd6d36d641580a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 23 Aug 2023 21:56:43 -0300
Subject: [PATCH 57/95] wafHook: move to aliases.nix

---
 pkgs/top-level/aliases.nix      | 2 +-
 pkgs/top-level/all-packages.nix | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a440ec395e51..55584e36b566 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1823,7 +1823,7 @@ mapAliases ({
   inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17
 
   ### W ###
-
+  wafHook = waf.hook; # Added 2023-08-23
   wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21
   waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21
   way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd38df39e180..46ed86834a9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14765,7 +14765,6 @@ with pkgs;
   volumeicon = callPackage ../tools/audio/volumeicon { };
 
   waf = callPackage ../development/tools/build-managers/waf { };
-  wafHook = waf.hook;
 
   waf-tester = callPackage ../tools/security/waf-tester { };
 

From bac515fa9d2d9dce1746f1674bc8aad9193c5092 Mon Sep 17 00:00:00 2001
From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com>
Date: Sat, 26 Aug 2023 21:07:05 +0000
Subject: [PATCH 58/95] cargo-auditable-cargo-wrapper: don't wrap if
 cargo-auditable is meta.broken (#250615)

Recent changes to `cargo-auditable-cargo-wrapper` and `librsvg`
caused it to ignore the user's decision to opt out of `cargo-audit`
functionality, partially because `librsvg` does not use
`buildRustPackage`.

This commit restores the single-point-of-opt-out from this mis-named
functionality: `cargo-auditable.meta.broken`.

Co-authored-by: figsoda <figsoda@pm.me>
---
 .../compilers/rust/cargo-auditable-cargo-wrapper.nix           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
index d00ab4f496b3..6e982aee01a3 100644
--- a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
@@ -1,5 +1,8 @@
 { lib, runCommand, makeBinaryWrapper, rust-audit-info, cargo, cargo-auditable }:
 
+if cargo-auditable.meta.broken then
+  cargo
+else
 runCommand "auditable-${cargo.name}" {
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From 1e162f37fef709dc39de9cc4f6f094b3552f2c94 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 24 Aug 2023 09:58:27 -0400
Subject: [PATCH 59/95] rustc: 1.71.1 -> 1.72.0

https://blog.rust-lang.org/2023/08/24/Rust-1.72.0.html
https://github.com/rust-lang/rust/releases/tag/1.72.0
---
 .../compilers/rust/{1_71.nix => 1_72.nix}     | 32 +++++++++----------
 pkgs/top-level/all-packages.nix               |  8 ++---
 2 files changed, 20 insertions(+), 20 deletions(-)
 rename pkgs/development/compilers/rust/{1_71.nix => 1_72.nix} (55%)

diff --git a/pkgs/development/compilers/rust/1_71.nix b/pkgs/development/compilers/rust/1_72.nix
similarity index 55%
rename from pkgs/development/compilers/rust/1_71.nix
rename to pkgs/development/compilers/rust/1_72.nix
index 75780b55af81..077d8ac903fd 100644
--- a/pkgs/development/compilers/rust/1_71.nix
+++ b/pkgs/development/compilers/rust/1_72.nix
@@ -19,8 +19,8 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.71.1";
-  rustcSha256 = "sha256-b6kNUNHVKadfbMNJeE3lfX7AuiQZsJvefTNcJb1ORy4=";
+  rustcVersion = "1.72.0";
+  rustcSha256 = "sha256-6p1hu7UddrbqaBFW9p8OBZa1lyLwRBSwHG4QC0tb46E=";
 
   llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
   llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
@@ -34,25 +34,25 @@ import ./default.nix {
 
   # Note: the version MUST be one version prior to the version we're
   # building
-  bootstrapVersion = "1.70.0";
+  bootstrapVersion = "1.71.1";
 
   # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
   bootstrapHashes = {
-    i686-unknown-linux-gnu = "119dfd4ee3da6c8fc36444dd15a12187e1f9b34ee6792fb75a6a25d09ea7e865";
-    x86_64-unknown-linux-gnu = "8499c0b034dd881cd9a880c44021632422a28dc23d7a81ca0a97b04652245982";
-    x86_64-unknown-linux-musl = "d97c2ac1d9f17e754fa6b7d48c28531d16278547e3fa47050a01da037ddb6de3";
-    arm-unknown-linux-gnueabihf = "ac98b513c31789d0c3201dfe2bbcc81b9437f7e1a15695d09402efec7934c20e";
-    armv7-unknown-linux-gnueabihf = "23e6029c2a7363b307af539f0c81f4bb9f0ade12b588658343c8a8cfa41526ae";
-    aarch64-unknown-linux-gnu = "3aa012fc4d9d5f17ca30af41f87e1c2aacdac46b51adc5213e7614797c6fd24c";
-    aarch64-unknown-linux-musl = "6381de0b55f1741ac322bf1b56701d8aab4e509ff5302043941170f8df34228e";
-    x86_64-apple-darwin = "e5819fdbfc7f1a4d5d82cb4c3b7662250748450b45a585433bfb75648bc45547";
-    aarch64-apple-darwin = "75cbc356a06c9b2daf6b9249febda0f0c46df2a427f7cc8467c7edbd44636e53";
-    powerpc64le-unknown-linux-gnu = "ba8cb5e3078b1bc7c6b27ab53cfa3af14001728db9a047d0bdf29b8f05a4db34";
-    riscv64gc-unknown-linux-gnu = "5964f78e5fb30506101a929162a42be6260b887660b71592c5f38466753440c3";
-    mips64el-unknown-linux-gnuabi64 = "de5fd0b249fbb95b9b67928ba08d7ec49f18f0ae25cbe1b0ede3c02390d7b93a";
+    i686-unknown-linux-gnu = "ea544e213cdf65194d9650df9d521dd2ed63251e2abe89c8123e336dfe580b21";
+    x86_64-unknown-linux-gnu = "34778d1cda674990dfc0537bc600066046ae9cb5d65a07809f7e7da31d4689c4";
+    x86_64-unknown-linux-musl = "67acc1744293e52f4b49231f3c503e8ad187c477e7b567e27925ec792d946a01";
+    arm-unknown-linux-gnueabihf = "4c88b32849132504fce5b93bebf06dd0fa17988340c7fe97afa661e038dfa258";
+    armv7-unknown-linux-gnueabihf = "8f8556dbd8b0350364c7dc8fda57549934bf3c26c65498dda5842087f5c90d60";
+    aarch64-unknown-linux-gnu = "c7cf230c740a62ea1ca6a4304d955c286aea44e3c6fc960b986a8c2eeea4ec3f";
+    aarch64-unknown-linux-musl = "da87f4ca2534886f1006b2e8abb0dda8db231ce82cc67b4857233ad48a21c87c";
+    x86_64-apple-darwin = "916056603da88336aba68bbeab49711cc8fdb9cfb46a49b04850c0c09761f58c";
+    aarch64-apple-darwin = "f4061b65b31ac75b9b5384c1f518e555f3da23f93bcf64dce252461ee65e9351";
+    powerpc64le-unknown-linux-gnu = "bac57066882366e4628d1ed2bbe4ab19c0b373aaf45582c2da9f639f2f6ea537";
+    riscv64gc-unknown-linux-gnu = "fcb67647b764669f3b4e61235fbdc0eca287229adf9aed8c41ce20ffaad4a3ea";
+    mips64el-unknown-linux-gnuabi64 = "6523efea9cd48c0375bd621460d890c65457a5534fafb2d8b69a37ee1e2a39ed";
   };
 
-  selectRustPackage = pkgs: pkgs.rust_1_71;
+  selectRustPackage = pkgs: pkgs.rust_1_72;
 
   rustcPatches = [ ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59447b6cb5b7..ba3def0c0782 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17056,11 +17056,11 @@ with pkgs;
     inherit (darwin) apple_sdk;
   };
 
-  rust_1_71 = callPackage ../development/compilers/rust/1_71.nix {
+  rust_1_72 = callPackage ../development/compilers/rust/1_72.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
     llvm_16 = llvmPackages_16.libllvm;
   };
-  rust = rust_1_71;
+  rust = rust_1_72;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
@@ -17068,8 +17068,8 @@ with pkgs;
     openssl = openssl_1_1;
   };
 
-  rustPackages_1_71 = rust_1_71.packages.stable;
-  rustPackages = rustPackages_1_71;
+  rustPackages_1_72 = rust_1_72.packages.stable;
+  rustPackages = rustPackages_1_72;
 
   inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
 

From 2eeb227d778ac0b90e9cae03247b610c2ada8314 Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Sun, 27 Aug 2023 21:33:15 +0300
Subject: [PATCH 60/95] gcc: move dll to output

---
 pkgs/development/compilers/gcc/common/builder.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix
index 6df4e32ddb76..ad3dd5f9b871 100644
--- a/pkgs/development/compilers/gcc/common/builder.nix
+++ b/pkgs/development/compilers/gcc/common/builder.nix
@@ -219,6 +219,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
     moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la"  "''${!outputLib}"
     moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}"
     moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}"
+    moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll" "''${!outputLib}"
     moveToOutput "share/gcc-*/python" "''${!outputLib}"
 
     if [ -z "$enableShared" ]; then
@@ -233,6 +234,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
         moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}"
         moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la"  "''${!outputLib}"
         moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}"
+        moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}"
 
         for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do
             substituteInPlace "$i" --replace "$out" "''${!outputLib}"

From cc9ac45f18a864fc112e8fa35a617722b10f673e Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 17 Aug 2023 03:52:56 +0300
Subject: [PATCH 61/95] libxcrypt: Fix windows cross

`pkgsCross.mingwW64.libxcrypt`

`isWindows` because
> MinGW does not allow building shared libraries (DLLs) when there are still unresolved symbols, because on Windows each symbol referenced from a DLL must point to something that exists. On other platforms this is not always required.

https://stackoverflow.com/questions/69214347/libtool-error-cant-build-x86-64-w64-mingw32-shared-library-unless-no-undefin

So i presume this is needed for all windows toolchains.
---
 pkgs/development/libraries/libxcrypt/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix
index d45155e80029..067141883977 100644
--- a/pkgs/development/libraries/libxcrypt/default.nix
+++ b/pkgs/development/libraries/libxcrypt/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-werror"
   ];
 
+  # fixes: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified
+  makeFlags = lib.optionals stdenv.hostPlatform.isWindows [ "LDFLAGS=-no-undefined"] ;
+
   nativeBuildInputs = [
     perl
   ];

From 783e4dcba8384b6082220466fc4e6c631e7f2293 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 17 Aug 2023 04:17:38 +0300
Subject: [PATCH 62/95] xorg.xorgproto: Fix windows cross

`pkgsCross.mingwW64.xorg.xorgproto`

https://aur.archlinux.org/packages/mingw-w64-xorgproto
---
 pkgs/servers/x11/xorg/overrides.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index edfa0e879450..d81a52d1275e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -671,6 +671,14 @@ self: super:
     nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ];
     # adds support for printproto needed for libXp
     mesonFlags = [ "-Dlegacy=true" ];
+
+    patches = [
+      (fetchpatch {
+        url = "https://aur.archlinux.org/cgit/aur.git/plain/meson.patch?h=mingw-w64-xorgproto&id=7b817efc3144a50e6766817c4ca7242f8ce49307";
+        sha256 = "sha256-Izzz9In53W7CC++k1bLr78iSrmxpFm1cH8qcSpptoUQ=";
+      })
+    ];
+    meta = attrs.meta // { platforms = lib.platforms.unix ++ lib.platforms.windows; };
   });
 
   xorgserver = with xorg; super.xorgserver.overrideAttrs (attrs_passed:

From 13dd91e301c487e53a5c9f902d645ac273f86b90 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 17 Aug 2023 04:46:39 +0300
Subject: [PATCH 63/95] xorg.libxcb: fix mingw cross

`pkgsCross.mingwW64.xorg.libxcb`
---
 pkgs/servers/x11/xorg/overrides.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d81a52d1275e..892f1769455a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -8,7 +8,7 @@
   mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
   mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt,
   ApplicationServices, Carbon, Cocoa, Xplugin,
-  xorg
+  xorg, windows
 }:
 
 let
@@ -80,6 +80,8 @@ self: super:
   mkfontdir = xorg.mkfontscale;
 
   libxcb = super.libxcb.overrideAttrs (attrs: {
+    # $dev/include/xcb/xcb.h includes pthread.h
+    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64_pthreads;
     configureFlags = [ "--enable-xkb" "--enable-xinput" ]
       ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
     outputs = [ "out" "dev" "man" "doc" ];
@@ -110,6 +112,7 @@ self: super:
         "xcb-xvmc"
         "xcb"
       ];
+      platforms = lib.platforms.unix ++ lib.platforms.windows;
     };
   });
 

From 6ea1c15e35d36bd4924c33b98ce718335d07d0ea Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 27 Aug 2023 20:09:09 +0300
Subject: [PATCH 64/95] xorg.libpthreadstubs: add windows to platforms

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

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 892f1769455a..1ece8654d29e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -390,6 +390,11 @@ self: super:
     };
   });
 
+  libpthreadstubs = super.libpthreadstubs.overrideAttrs (attrs: {
+    # only contains a pkgconfig file on linux and windows
+    meta = attrs.meta // { platforms = lib.platforms.unix ++ lib.platforms.windows; };
+  });
+
   setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
     postInstall =
       ''

From 8f2c75b260661a8385d75499bea7efcf05a4c4ad Mon Sep 17 00:00:00 2001
From: Elliot <hack00mind@gmail.com>
Date: Mon, 28 Aug 2023 11:09:05 +0800
Subject: [PATCH 65/95] vim: 9.0.1642 -> 9.0.1811

---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 24e9ea914b78..0abb7db9d99d 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.0.1642";
+  version = "9.0.1811";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-WWj8lZZtnGrv3pxu77otBKixS3ciLcznCyPk/iGryg4=";
+    hash = "sha256-b/fATWaHcIZIvkmr/UQ4R45ii9N0kWJMb7DerF/JYIA=";
   };
 
   enableParallelBuilding = true;

From b0312f6dafdd4dd357d93ec07b3e34698dde956d Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sat, 17 Jun 2023 15:23:34 +0300
Subject: [PATCH 66/95] nodejs_18: backport v8 trap handler conditional
 compilation

---
 .../web/nodejs/trap-handler-backport.patch    | 76 +++++++++++++++++++
 pkgs/development/web/nodejs/v18.nix           |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/trap-handler-backport.patch

diff --git a/pkgs/development/web/nodejs/trap-handler-backport.patch b/pkgs/development/web/nodejs/trap-handler-backport.patch
new file mode 100644
index 000000000000..c562aea3a6e2
--- /dev/null
+++ b/pkgs/development/web/nodejs/trap-handler-backport.patch
@@ -0,0 +1,76 @@
+Backport V8_TRAP_HANDLER_SUPPORTED conditional compilation for trap
+handler implementation.
+
+See https://github.com/v8/v8/commit/e7bef8d4cc4f38cc3d5a532fbcc445dc62adc08f
+
+E.g. when cross-compiling from aarch64-linux for x86_64-linux target,
+handler-inside-posix.cc is built on aarch64-linux even though it is not
+supported; see src/trap-handler/trap-handler.h in v8 for (host, target)
+combinations where trap handler is supported.
+
+Note that handler-inside-posix.cc fails to build in the case above.
+
+diff --git a/deps/v8/src/trap-handler/handler-inside-posix.cc b/deps/v8/src/trap-handler/handler-inside-posix.cc
+index e4454c378f..17af3d75dc 100644
+--- a/deps/v8/src/trap-handler/handler-inside-posix.cc
++++ b/deps/v8/src/trap-handler/handler-inside-posix.cc
+@@ -47,6 +47,8 @@ namespace v8 {
+ namespace internal {
+ namespace trap_handler {
+ 
++#if V8_TRAP_HANDLER_SUPPORTED
++
+ #if V8_OS_LINUX
+ #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.gregs[REG_##REG]
+ #elif V8_OS_DARWIN
+@@ -181,6 +183,8 @@ void HandleSignal(int signum, siginfo_t* info, void* context) {
+   // TryHandleSignal modifies context to change where we return to.
+ }
+ 
++#endif
++
+ }  // namespace trap_handler
+ }  // namespace internal
+ }  // namespace v8
+diff --git a/deps/v8/src/trap-handler/handler-inside-win.cc b/deps/v8/src/trap-handler/handler-inside-win.cc
+index fcccc78ee5..3d7a2c416a 100644
+--- a/deps/v8/src/trap-handler/handler-inside-win.cc
++++ b/deps/v8/src/trap-handler/handler-inside-win.cc
+@@ -38,6 +38,8 @@ namespace v8 {
+ namespace internal {
+ namespace trap_handler {
+ 
++#if V8_TRAP_HANDLER_SUPPORTED
++
+ // The below struct needed to access the offset in the Thread Environment Block
+ // to see if the thread local storage for the thread has been allocated yet.
+ //
+@@ -129,6 +131,8 @@ LONG HandleWasmTrap(EXCEPTION_POINTERS* exception) {
+   return EXCEPTION_CONTINUE_SEARCH;
+ }
+ 
++#endif
++
+ }  // namespace trap_handler
+ }  // namespace internal
+ }  // namespace v8
+diff --git a/deps/v8/src/trap-handler/handler-outside-simulator.cc b/deps/v8/src/trap-handler/handler-outside-simulator.cc
+index 179eab0659..5e58719e7f 100644
+--- a/deps/v8/src/trap-handler/handler-outside-simulator.cc
++++ b/deps/v8/src/trap-handler/handler-outside-simulator.cc
+@@ -4,6 +4,9 @@
+ 
+ #include "include/v8config.h"
+ #include "src/trap-handler/trap-handler-simulator.h"
++#include "src/trap-handler/trap-handler.h"
++
++#if V8_TRAP_HANDLER_SUPPORTED
+ 
+ #if V8_OS_DARWIN
+ #define SYMBOL(name) "_" #name
+@@ -35,3 +38,5 @@ asm(
+     SYMBOL(v8_probe_memory_continuation) ":         \n"
+     // If the trap handler continues here, it wrote the landing pad in %rax.
+     "  ret                                          \n");
++
++#endif
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 213f42718188..82117b1a6467 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -16,5 +16,6 @@ buildNodejs {
     ./bypass-darwin-xcrun-node16.patch
     ./revert-arm64-pointer-auth.patch
     ./node-npm-build-npm-package-logic.patch
+    ./trap-handler-backport.patch
   ];
 }

From deb5cc6dc8a300ef9d64252445329f288869440e Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sat, 17 Jun 2023 08:34:23 +0300
Subject: [PATCH 67/95] nodejs: do not pass --without-snapshot

Building --without-snapshot is no longer possible since v14. See
https://github.com/nodejs/node/commit/0822bfaa9f52aea289abd0e15a90b0df2e12f7e1
---
 pkgs/development/web/nodejs/nodejs.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index bd90641c16f2..e9872948e47c 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -70,7 +70,6 @@ let
     ] ++ (lib.optionals isCross [
       "--cross-compiling"
       "--without-intl"
-      "--without-snapshot"
       "--dest-cpu=${let platform = stdenv.hostPlatform; in
                     if      platform.isAarch32 then "arm"
                     else if platform.isAarch64 then "arm64"

From 3751f6abb015d6141f33acd82ef7a55e76a02217 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Fri, 16 Jun 2023 08:55:13 +0300
Subject: [PATCH 68/95] nodejs_{18,20}: fix cross compilation from
 aarch64-linux

This change adds a fix for Node.js build system passing flags intended
for the target toolchain to the host toolchain.
---
 .../web/nodejs/common-gypi-cross.patch        | 84 +++++++++++++++++++
 pkgs/development/web/nodejs/v18.nix           |  1 +
 pkgs/development/web/nodejs/v20.nix           |  1 +
 3 files changed, 86 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/common-gypi-cross.patch

diff --git a/pkgs/development/web/nodejs/common-gypi-cross.patch b/pkgs/development/web/nodejs/common-gypi-cross.patch
new file mode 100644
index 000000000000..00bc7d7d2feb
--- /dev/null
+++ b/pkgs/development/web/nodejs/common-gypi-cross.patch
@@ -0,0 +1,84 @@
+Fixes target toolchain arguments being passed to the host toolchain when
+cross-compiling. For example, -m64 is not available on aarch64.
+
+diff --git a/common.gypi b/common.gypi
+index 3161adbe09..08983f589c 100644
+--- a/common.gypi
++++ b/common.gypi
+@@ -411,28 +411,56 @@
+             'cflags': [ '-I/usr/local/include' ],
+             'ldflags': [ '-Wl,-z,wxneeded' ],
+           }],
+-        ],
+-        'conditions': [
+-          [ 'target_arch=="ia32"', {
+-            'cflags': [ '-m32' ],
+-            'ldflags': [ '-m32' ],
+-          }],
+-          [ 'target_arch=="x64"', {
+-            'cflags': [ '-m64' ],
+-            'ldflags': [ '-m64' ],
+-          }],
+-          [ 'target_arch=="ppc" and OS not in "aix os400"', {
+-            'cflags': [ '-m32' ],
+-            'ldflags': [ '-m32' ],
+-          }],
+-          [ 'target_arch=="ppc64" and OS not in "aix os400"', {
+-            'cflags': [ '-m64', '-mminimal-toc' ],
+-            'ldflags': [ '-m64' ],
++          ['_toolset=="host"', {
++            'conditions': [
++              [ 'host_arch=="ia32"', {
++                'cflags': [ '-m32' ],
++                'ldflags': [ '-m32' ],
++              }],
++              [ 'host_arch=="x64"', {
++                'cflags': [ '-m64' ],
++                'ldflags': [ '-m64' ],
++              }],
++              [ 'host_arch=="ppc" and OS not in "aix os400"', {
++                'cflags': [ '-m32' ],
++                'ldflags': [ '-m32' ],
++              }],
++              [ 'host_arch=="ppc64" and OS not in "aix os400"', {
++                'cflags': [ '-m64', '-mminimal-toc' ],
++                'ldflags': [ '-m64' ],
++              }],
++              [ 'host_arch=="s390x" and OS=="linux"', {
++                'cflags': [ '-m64', '-march=z196' ],
++                'ldflags': [ '-m64', '-march=z196' ],
++              }],
++            ],
+           }],
+-          [ 'target_arch=="s390x" and OS=="linux"', {
+-            'cflags': [ '-m64', '-march=z196' ],
+-            'ldflags': [ '-m64', '-march=z196' ],
++          ['_toolset=="target"', {
++            'conditions': [
++              [ 'target_arch=="ia32"', {
++                'cflags': [ '-m32' ],
++                'ldflags': [ '-m32' ],
++              }],
++              [ 'target_arch=="x64"', {
++                'cflags': [ '-m64' ],
++                'ldflags': [ '-m64' ],
++              }],
++              [ 'target_arch=="ppc" and OS not in "aix os400"', {
++                'cflags': [ '-m32' ],
++                'ldflags': [ '-m32' ],
++              }],
++              [ 'target_arch=="ppc64" and OS not in "aix os400"', {
++                'cflags': [ '-m64', '-mminimal-toc' ],
++                'ldflags': [ '-m64' ],
++              }],
++              [ 'target_arch=="s390x" and OS=="linux"', {
++                'cflags': [ '-m64', '-march=z196' ],
++                'ldflags': [ '-m64', '-march=z196' ],
++              }],
++            ],
+           }],
++        ],
++        'conditions': [
+           [ 'OS=="solaris"', {
+             'cflags': [ '-pthreads' ],
+             'ldflags': [ '-pthreads' ],
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 82117b1a6467..622a1fcdbc2c 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -17,5 +17,6 @@ buildNodejs {
     ./revert-arm64-pointer-auth.patch
     ./node-npm-build-npm-package-logic.patch
     ./trap-handler-backport.patch
+    ./common-gypi-cross.patch
   ];
 }
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index cfb90879c05d..52e8ff76bbb8 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -16,5 +16,6 @@ buildNodejs {
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
+    ./common-gypi-cross.patch
   ];
 }

From 80e825ede84cd9b5b04db94b7173041d22156838 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sat, 17 Jun 2023 18:46:53 +0300
Subject: [PATCH 69/95] nodejs: do not run patchShebangs with build inputs

---
 pkgs/development/web/nodejs/nodejs.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index e9872948e47c..f3b0384bc250 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -14,6 +14,8 @@
 let
   inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
 
+  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
+
   majorVersion = lib.versions.major version;
   minorVersion = lib.versions.minor version;
 
@@ -63,7 +65,6 @@ let
     moveToDev = false;
 
     configureFlags = let
-      isCross = stdenv.hostPlatform != stdenv.buildPlatform;
       inherit (stdenv.hostPlatform) gcc isAarch32;
     in sharedConfigureFlags ++ lib.optionals (lib.versionOlder version "19") [
       "--without-dtrace"
@@ -115,9 +116,10 @@ let
 
     inherit patches;
 
+    # NB: be careful when running patchShebangs at patch phase. Some files are
+    # copied verbatim to the output with shabangs patched to store paths and
+    # subsequent patchShebangs at install phase would not update them.
     postPatch = ''
-      patchShebangs .
-
       # fix tests
       for a in test/parallel/test-child-process-env.js \
                test/parallel/test-child-process-exec-env.js \
@@ -136,9 +138,9 @@ let
     doCheck = false; # fails 4 out of 1453 tests
 
     postInstall = ''
-      PATH=$out/bin:$PATH patchShebangs $out
+      HOST_PATH=$out/bin''${HOST_PATH:+:$HOST_PATH} patchShebangs --host $out
 
-      ${lib.optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''
+      ${lib.optionalString (enableNpm && !isCross) ''
         mkdir -p $out/share/bash-completion/completions/
         HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm
         for dir in "$out/lib/node_modules/npm/man/"*; do

From f6b56c9136e9f60ec6befc1ea1e9b1725b8f8f33 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sat, 17 Jun 2023 19:08:10 +0300
Subject: [PATCH 70/95] nodejs: install shell completions and man pages when
 cross-compiling

---
 pkgs/development/web/nodejs/nodejs.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index f3b0384bc250..8c70513ec617 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -140,9 +140,10 @@ let
     postInstall = ''
       HOST_PATH=$out/bin''${HOST_PATH:+:$HOST_PATH} patchShebangs --host $out
 
-      ${lib.optionalString (enableNpm && !isCross) ''
-        mkdir -p $out/share/bash-completion/completions/
-        HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm
+      ${lib.optionalString (enableNpm) ''
+        mkdir -p $out/share/bash-completion/completions
+        ln -s $out/lib/node_modules/npm/lib/utils/completion.sh \
+          $out/share/bash-completion/completions/npm
         for dir in "$out/lib/node_modules/npm/man/"*; do
           mkdir -p $out/share/man/$(basename "$dir")
           for page in "$dir"/*; do

From 51d74ca18f35aafc63b44fa8bf5b65ecd8cedee5 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sat, 17 Jun 2023 23:55:22 +0300
Subject: [PATCH 71/95] nodejs: mark as broken when cross-compiling for
 different OS

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

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 8c70513ec617..dc4066593875 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -205,6 +205,14 @@ let
       platforms = platforms.linux ++ platforms.darwin;
       mainProgram = "node";
       knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";
+
+      # Node.js build system does not have separate host and target OS
+      # configurations (architectures are defined as host_arch and target_arch,
+      # but there is no such thing as host_os and target_os).
+      #
+      # We may be missing something here, but it doesn’t look like it is
+      # possible to cross-compile between different operating systems.
+      broken = stdenv.buildPlatform.parsed.kernel.name != stdenv.hostPlatform.parsed.kernel.name;
     };
 
     passthru.python = python; # to ensure nodeEnv uses the same version

From 608c96eefc876a8db5785cfb8d6fb8789f5a61f6 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sun, 18 Jun 2023 00:25:26 +0300
Subject: [PATCH 72/95] nodejs: run a subset of test suite

---
 pkgs/development/web/nodejs/nodejs.nix | 28 ++++++++++++++------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index dc4066593875..009e967c4dc9 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -119,23 +119,25 @@ let
     # NB: be careful when running patchShebangs at patch phase. Some files are
     # copied verbatim to the output with shabangs patched to store paths and
     # subsequent patchShebangs at install phase would not update them.
-    postPatch = ''
-      # fix tests
-      for a in test/parallel/test-child-process-env.js \
-               test/parallel/test-child-process-exec-env.js \
-               test/parallel/test-child-process-default-options.js \
-               test/fixtures/syntax/good_syntax_shebang.js \
-               test/fixtures/syntax/bad_syntax_shebang.js ; do
-        substituteInPlace $a \
-          --replace "/usr/bin/env" "${coreutils}/bin/env"
-      done
-    '' + lib.optionalString stdenv.isDarwin ''
+    postPatch = lib.optionalString stdenv.isDarwin ''
       sed -i -e "s|tr1/type_traits|type_traits|g" \
              -e "s|std::tr1|std|" src/util.h
     '';
 
-    nativeCheckInputs = [ procps ];
-    doCheck = false; # fails 4 out of 1453 tests
+    doCheck = lib.versionAtLeast version "16"; # some tests fail on v14
+
+    # Some dependencies required for tools/doc/node_modules (and therefore
+    # test-addons, jstest and others) target are not included in the tarball.
+    # Run test targets that do not require network access.
+    checkTarget = lib.concatStringsSep " " [
+      "build-js-native-api-tests"
+      "build-node-api-tests"
+      "tooltest"
+      "cctest"
+    ];
+
+    # Do not create __pycache__ when running tests.
+    checkFlags = [ "PYTHONDONTWRITEBYTECODE=1" ];
 
     postInstall = ''
       HOST_PATH=$out/bin''${HOST_PATH:+:$HOST_PATH} patchShebangs --host $out

From c66389c6e1d8b1f08c9c8fbda0fdcf9436088b87 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sun, 18 Jun 2023 10:20:53 +0300
Subject: [PATCH 73/95] nodejs: remove no-op postPatch phase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

tr1/type_traits replacement is only relevent for Node.js v6 that’s
reached EOL in 2019.
---
 pkgs/development/web/nodejs/nodejs.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 009e967c4dc9..7af19b39db05 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -116,14 +116,6 @@ let
 
     inherit patches;
 
-    # NB: be careful when running patchShebangs at patch phase. Some files are
-    # copied verbatim to the output with shabangs patched to store paths and
-    # subsequent patchShebangs at install phase would not update them.
-    postPatch = lib.optionalString stdenv.isDarwin ''
-      sed -i -e "s|tr1/type_traits|type_traits|g" \
-             -e "s|std::tr1|std|" src/util.h
-    '';
-
     doCheck = lib.versionAtLeast version "16"; # some tests fail on v14
 
     # Some dependencies required for tools/doc/node_modules (and therefore

From d9dc4b0a0752aa26cece191e1ca6f7ef3b01210e Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sun, 18 Jun 2023 01:20:53 +0300
Subject: [PATCH 74/95] nodejs: patch shebangs for shell scripts when
 cross-compiling

---
 pkgs/development/web/nodejs/nodejs.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 7af19b39db05..b0e032abc495 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser
+{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser, runtimeShellPackage
 , pkg-config, which, buildPackages
 # for `.pkgs` attribute
 , callPackage
@@ -55,6 +55,7 @@ let
     depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib ];
 
     buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
+      ++ lib.optional isCross runtimeShellPackage # for patchShebangs
       ++ [ zlib libuv openssl http-parser icu ];
 
     nativeBuildInputs = [ which pkg-config python ]
@@ -132,7 +133,7 @@ let
     checkFlags = [ "PYTHONDONTWRITEBYTECODE=1" ];
 
     postInstall = ''
-      HOST_PATH=$out/bin''${HOST_PATH:+:$HOST_PATH} patchShebangs --host $out
+      HOST_PATH=$out/bin patchShebangs --host $out
 
       ${lib.optionalString (enableNpm) ''
         mkdir -p $out/share/bash-completion/completions

From e4d6d1b05b39ae31db8f16a1e3e0bfb39d764771 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Mon, 19 Jun 2023 05:42:58 +0300
Subject: [PATCH 75/95] nodejs: cross-compile with icu

---
 pkgs/development/web/nodejs/nodejs.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index b0e032abc495..e392b62c87df 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -52,7 +52,7 @@ let
 
     CC_host = "cc";
     CXX_host = "c++";
-    depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib ];
+    depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ];
 
     buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
       ++ lib.optional isCross runtimeShellPackage # for patchShebangs
@@ -71,7 +71,6 @@ let
       "--without-dtrace"
     ] ++ (lib.optionals isCross [
       "--cross-compiling"
-      "--without-intl"
       "--dest-cpu=${let platform = stdenv.hostPlatform; in
                     if      platform.isAarch32 then "arm"
                     else if platform.isAarch64 then "arm64"

From e29c3309399b7d7ef8f606c300cd973da40012f2 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sat, 8 Jul 2023 04:34:48 +0300
Subject: [PATCH 76/95] nodejs: use fetchpatch for cross-compilation patches

---
 .../web/nodejs/common-gypi-cross.patch        | 84 -------------------
 pkgs/development/web/nodejs/cross-patches.nix | 10 +++
 pkgs/development/web/nodejs/v18.nix           |  4 +-
 pkgs/development/web/nodejs/v20.nix           |  4 +-
 4 files changed, 14 insertions(+), 88 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/common-gypi-cross.patch
 create mode 100644 pkgs/development/web/nodejs/cross-patches.nix

diff --git a/pkgs/development/web/nodejs/common-gypi-cross.patch b/pkgs/development/web/nodejs/common-gypi-cross.patch
deleted file mode 100644
index 00bc7d7d2feb..000000000000
--- a/pkgs/development/web/nodejs/common-gypi-cross.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Fixes target toolchain arguments being passed to the host toolchain when
-cross-compiling. For example, -m64 is not available on aarch64.
-
-diff --git a/common.gypi b/common.gypi
-index 3161adbe09..08983f589c 100644
---- a/common.gypi
-+++ b/common.gypi
-@@ -411,28 +411,56 @@
-             'cflags': [ '-I/usr/local/include' ],
-             'ldflags': [ '-Wl,-z,wxneeded' ],
-           }],
--        ],
--        'conditions': [
--          [ 'target_arch=="ia32"', {
--            'cflags': [ '-m32' ],
--            'ldflags': [ '-m32' ],
--          }],
--          [ 'target_arch=="x64"', {
--            'cflags': [ '-m64' ],
--            'ldflags': [ '-m64' ],
--          }],
--          [ 'target_arch=="ppc" and OS not in "aix os400"', {
--            'cflags': [ '-m32' ],
--            'ldflags': [ '-m32' ],
--          }],
--          [ 'target_arch=="ppc64" and OS not in "aix os400"', {
--            'cflags': [ '-m64', '-mminimal-toc' ],
--            'ldflags': [ '-m64' ],
-+          ['_toolset=="host"', {
-+            'conditions': [
-+              [ 'host_arch=="ia32"', {
-+                'cflags': [ '-m32' ],
-+                'ldflags': [ '-m32' ],
-+              }],
-+              [ 'host_arch=="x64"', {
-+                'cflags': [ '-m64' ],
-+                'ldflags': [ '-m64' ],
-+              }],
-+              [ 'host_arch=="ppc" and OS not in "aix os400"', {
-+                'cflags': [ '-m32' ],
-+                'ldflags': [ '-m32' ],
-+              }],
-+              [ 'host_arch=="ppc64" and OS not in "aix os400"', {
-+                'cflags': [ '-m64', '-mminimal-toc' ],
-+                'ldflags': [ '-m64' ],
-+              }],
-+              [ 'host_arch=="s390x" and OS=="linux"', {
-+                'cflags': [ '-m64', '-march=z196' ],
-+                'ldflags': [ '-m64', '-march=z196' ],
-+              }],
-+            ],
-           }],
--          [ 'target_arch=="s390x" and OS=="linux"', {
--            'cflags': [ '-m64', '-march=z196' ],
--            'ldflags': [ '-m64', '-march=z196' ],
-+          ['_toolset=="target"', {
-+            'conditions': [
-+              [ 'target_arch=="ia32"', {
-+                'cflags': [ '-m32' ],
-+                'ldflags': [ '-m32' ],
-+              }],
-+              [ 'target_arch=="x64"', {
-+                'cflags': [ '-m64' ],
-+                'ldflags': [ '-m64' ],
-+              }],
-+              [ 'target_arch=="ppc" and OS not in "aix os400"', {
-+                'cflags': [ '-m32' ],
-+                'ldflags': [ '-m32' ],
-+              }],
-+              [ 'target_arch=="ppc64" and OS not in "aix os400"', {
-+                'cflags': [ '-m64', '-mminimal-toc' ],
-+                'ldflags': [ '-m64' ],
-+              }],
-+              [ 'target_arch=="s390x" and OS=="linux"', {
-+                'cflags': [ '-m64', '-march=z196' ],
-+                'ldflags': [ '-m64', '-march=z196' ],
-+              }],
-+            ],
-           }],
-+        ],
-+        'conditions': [
-           [ 'OS=="solaris"', {
-             'cflags': [ '-pthreads' ],
-             'ldflags': [ '-pthreads' ],
diff --git a/pkgs/development/web/nodejs/cross-patches.nix b/pkgs/development/web/nodejs/cross-patches.nix
new file mode 100644
index 000000000000..f6169db6f549
--- /dev/null
+++ b/pkgs/development/web/nodejs/cross-patches.nix
@@ -0,0 +1,10 @@
+{ fetchpatch }:
+[
+  # Fixes target toolchain arguments being passed to the host toolchain when
+  # cross-compiling. For example, -m64 is not available on aarch64.
+  (fetchpatch {
+    name = "common-gypi-cross.patch";
+    url = "https://github.com/nodejs/node/pull/48597.patch";
+    hash = "sha256-FmHmwlTxPw5mTW6t4zuy9vr4FxopjU4Kx+F1aqabG1s=";
+  })
+]
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 622a1fcdbc2c..9af08413fcaf 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -6,6 +6,7 @@ let
     python = python3;
   };
 
+  crossPatches = callPackage ./cross-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
@@ -17,6 +18,5 @@ buildNodejs {
     ./revert-arm64-pointer-auth.patch
     ./node-npm-build-npm-package-logic.patch
     ./trap-handler-backport.patch
-    ./common-gypi-cross.patch
-  ];
+  ] ++ crossPatches;
 }
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 52e8ff76bbb8..83113140a8f3 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -6,6 +6,7 @@ let
     python = python3;
   };
 
+  crossPatches = callPackage ./cross-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
@@ -16,6 +17,5 @@ buildNodejs {
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
-    ./common-gypi-cross.patch
-  ];
+  ] ++ crossPatches;
 }

From 65ff987f802042659f9a3a1f8000182a5a9cd7ee Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Tue, 18 Jul 2023 18:47:45 +0300
Subject: [PATCH 77/95] nodejs: set strictDeps and patch bash shebangs

---
 pkgs/development/web/nodejs/nodejs.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index e392b62c87df..8b615a55dd3a 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser, runtimeShellPackage
+{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser, bash
 , pkg-config, which, buildPackages
 # for `.pkgs` attribute
 , callPackage
@@ -50,13 +50,17 @@ let
       inherit sha256;
     };
 
+    strictDeps = true;
+
     CC_host = "cc";
     CXX_host = "c++";
     depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ];
 
+    # NB: technically, we do not need bash in build inputs since all scripts are
+    # wrappers over the corresponding JS scripts. There are some packages though
+    # that use bash wrappers, e.g. polaris-web.
     buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
-      ++ lib.optional isCross runtimeShellPackage # for patchShebangs
-      ++ [ zlib libuv openssl http-parser icu ];
+      ++ [ zlib libuv openssl http-parser icu bash ];
 
     nativeBuildInputs = [ which pkg-config python ]
       ++ lib.optionals stdenv.isDarwin [ xcbuild ];

From 2c88411556d0cc612b31e2d12cd30c82bd5a996e Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Mon, 28 Aug 2023 12:20:57 +0300
Subject: [PATCH 78/95] nodejs_20: remove upstreamed patch

---
 pkgs/development/web/nodejs/cross-patches.nix | 10 ----------
 pkgs/development/web/nodejs/v18.nix           | 13 +++++++++----
 pkgs/development/web/nodejs/v20.nix           |  4 +---
 3 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/cross-patches.nix

diff --git a/pkgs/development/web/nodejs/cross-patches.nix b/pkgs/development/web/nodejs/cross-patches.nix
deleted file mode 100644
index f6169db6f549..000000000000
--- a/pkgs/development/web/nodejs/cross-patches.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ fetchpatch }:
-[
-  # Fixes target toolchain arguments being passed to the host toolchain when
-  # cross-compiling. For example, -m64 is not available on aarch64.
-  (fetchpatch {
-    name = "common-gypi-cross.patch";
-    url = "https://github.com/nodejs/node/pull/48597.patch";
-    hash = "sha256-FmHmwlTxPw5mTW6t4zuy9vr4FxopjU4Kx+F1aqabG1s=";
-  })
-]
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 9af08413fcaf..0eb1ab4ce3f6 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -1,12 +1,10 @@
-{ callPackage, openssl, python3, enableNpm ? true }:
+{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix {
     inherit openssl;
     python = python3;
   };
-
-  crossPatches = callPackage ./cross-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
@@ -18,5 +16,12 @@ buildNodejs {
     ./revert-arm64-pointer-auth.patch
     ./node-npm-build-npm-package-logic.patch
     ./trap-handler-backport.patch
-  ] ++ crossPatches;
+    # Fixes target toolchain arguments being passed to the host toolchain when
+    # cross-compiling. For example, -m64 is not available on aarch64.
+    (fetchpatch {
+      name = "common-gypi-cross.patch";
+      url = "https://github.com/nodejs/node/pull/48597.patch";
+      hash = "sha256-FmHmwlTxPw5mTW6t4zuy9vr4FxopjU4Kx+F1aqabG1s=";
+    })
+  ];
 }
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 83113140a8f3..658240e4f1c2 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -5,8 +5,6 @@ let
     inherit openssl;
     python = python3;
   };
-
-  crossPatches = callPackage ./cross-patches.nix { };
 in
 buildNodejs {
   inherit enableNpm;
@@ -17,5 +15,5 @@ buildNodejs {
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
-  ] ++ crossPatches;
+  ];
 }

From 24a612e4e3c60e56149d8d139a294fd5c9a209e4 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 20 Aug 2023 20:01:12 +0100
Subject: [PATCH 79/95] libsndfile: enable tests

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

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 7c6613873f3a..73faa5e843a0 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
   # Needed on Darwin.
   NIX_CFLAGS_LINK = "-logg -lvorbis";
 
+  doCheck = true;
+  preCheck = ''
+    patchShebangs tests/test_wrapper.sh tests/pedantic-header-test.sh
+
+    substituteInPlace tests/test_wrapper.sh \
+      --replace '/usr/bin/env' "$(type -P env)"
+  '';
+
   meta = with lib; {
     description = "A C library for reading and writing files containing sampled sound";
     homepage    = "https://libsndfile.github.io/libsndfile/";

From e371c0c30042873f5bcbc91b0a1196daab3d8f93 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 20 Aug 2023 20:01:32 +0100
Subject: [PATCH 80/95] libsndfile: add some key reverse-dependencies to
 passthru.tests

---
 .../libraries/libsndfile/default.nix          | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 73faa5e843a0..02dbd633281c 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,6 +1,15 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, autogen, pkg-config, python3
 , flac, lame, libmpg123, libogg, libopus, libvorbis
 , alsa-lib, Carbon, AudioToolbox
+
+# for passthru.tests
+, audacity
+, freeswitch
+, gst_all_1
+, libsamplerate
+, moc
+, pipewire
+, pulseaudio
 }:
 
 stdenv.mkDerivation rec {
@@ -41,6 +50,21 @@ stdenv.mkDerivation rec {
       --replace '/usr/bin/env' "$(type -P env)"
   '';
 
+  passthru.tests = {
+    inherit
+      audacity
+      freeswitch
+      libsamplerate
+      moc
+      pipewire
+      pulseaudio;
+    inherit (python3.pkgs)
+      soundfile
+      wavefile;
+    inherit (gst_all_1) gst-plugins-bad;
+    lame = (lame.override { sndfileFileIOSupport = true; });
+  };
+
   meta = with lib; {
     description = "A C library for reading and writing files containing sampled sound";
     homepage    = "https://libsndfile.github.io/libsndfile/";

From dbe7ef1d350575dab964d9dd7e3d839d3311e709 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 27 Aug 2023 13:06:11 +0100
Subject: [PATCH 81/95] fortify-headers: 1.1alpine1 -> 1.1alpine3

---
 pkgs/development/libraries/fortify-headers/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fortify-headers/default.nix b/pkgs/development/libraries/fortify-headers/default.nix
index befead87e6a1..2c24665456b7 100644
--- a/pkgs/development/libraries/fortify-headers/default.nix
+++ b/pkgs/development/libraries/fortify-headers/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation {
   pname = "fortify-headers";
-  version = "1.1alpine1";
+  version = "1.1alpine3";
 
   # upstream only accessible via git - unusable during bootstrap, hence
   # extract from the alpine package
   src = fetchurl {
-    url = "https://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/fortify-headers-1.1-r1.apk";
+    url = "https://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/fortify-headers-1.1-r3.apk";
     name = "fortify-headers.tar.gz";  # ensure it's extracted as a .tar.gz
-    hash = "sha256-A67NzUv+dldARY+MTaoVnezTg+Es8ZK/b7XOxA6KzpI=";
+    hash = "sha256-8A8JcKHIBgXpUuIP4zs3Q1yBs5jCGd5F3H2E8UN/S2g=";
   };
 
   installPhase = ''

From 4ec3ee592e7474284c657172d558a93aa1f3fae9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 28 Aug 2023 13:45:28 +0300
Subject: [PATCH 82/95] libmbim: backport Intel mutual authentication and intel
 tools patches

These patches are merged into 1.30, and were backported to at least
openSUSE, Fedora and ChromeOS.

They're used to FCC unlock various wwan modems.
---
 .../development/libraries/libmbim/default.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index c55b0876ce61..896c8b8fe4ee 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -31,6 +32,24 @@ stdenv.mkDerivation rec {
     hash = "sha256-aaYjvJ2OMTzkUyqWCyHdmsKJ3VGqBmKQzb1DWK/1cPU=";
   };
 
+  patches = [
+    # Intel Mutual Authentication - FCC lock. Part of 1.30, backported to
+    # openSUSE and Fedora and ChromeOS.
+    # https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec
+    (fetchpatch {
+      url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=910db9cb2b6fde303d3b4720890cf6dc6fc00880";
+      hash = "sha256-412sXdWb8WsSexe1scI/C57dwENgNWoREGO1GxSF4hs=";
+    })
+
+    # Intel Tools. Allows tracing various commands. Part of 1.30, backported to
+    # openSUSE, Fedora and ChromeOS.
+    # https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec
+    (fetchpatch {
+      url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=8a6dec6ed11931601e605c9537da9904b3be5bc0";
+      hash = "sha256-tU4zkUl5aZJE+g/qbnWprUHe/PmZvqVKB9qecSaUBhk=";
+    })
+  ];
+
   mesonFlags = [
     "-Dudevdir=${placeholder "out"}/lib/udev"
     (lib.mesonBool "introspection" withIntrospection)

From 097d59184b593017639cb6ccce46b584b0362e5f Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Sun, 23 Apr 2023 16:22:01 +0200
Subject: [PATCH 83/95] windows.dlfcn: init at 1.3.1

---
 pkgs/os-specific/windows/default.nix       |  2 ++
 pkgs/os-specific/windows/dlfcn/default.nix | 23 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/os-specific/windows/dlfcn/default.nix

diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 12859de8a20f..ee993cf48e8d 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -6,6 +6,8 @@ lib.makeScope newScope (self: with self; {
 
   cygwinSetup = callPackage ./cygwin-setup { };
 
+  dlfcn = callPackage ./dlfcn { };
+
   jom = callPackage ./jom { };
 
   w32api = callPackage ./w32api { };
diff --git a/pkgs/os-specific/windows/dlfcn/default.nix b/pkgs/os-specific/windows/dlfcn/default.nix
new file mode 100644
index 000000000000..d1fba98e840a
--- /dev/null
+++ b/pkgs/os-specific/windows/dlfcn/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "dlfcn";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "dlfcn-win32";
+    repo = "dlfcn-win32";
+    rev = "v${version}";
+    sha256 = "sha256-ljVTMBiGp8TPufrQcK4zQtcVH1To4zcfBAbUOb+v910=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    homepage = "https://github.com/dlfcn-win32/dlfcn-win32";
+    description = "Set of functions that allows runtime dynamic library loading";
+    license = licenses.mit;
+    platforms = platforms.windows;
+    maintainers = with maintainers; [ marius851000 ];
+  };
+}

From ac6c6c0ed4d69d2b3282ad22926ef8b64107dce6 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 16 Aug 2023 20:18:44 +0200
Subject: [PATCH 84/95] cargo-c: 0.9.22 -> 0.9.23

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index 4f5418ea4fac..73c9236306b2 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-c";
-  version = "0.9.22";
+  version = "0.9.23";
 
   src = fetchCrate {
     inherit pname;
     # this version may need to be updated along with package version
-    version = "${version}+cargo-0.72";
-    hash = "sha256-B9y8/8qms+t6LnUFes4/MGcEp8P8C2hunCouiTMt0LY=";
+    version = "${version}+cargo-0.72.2";
+    hash = "sha256-a3cD2X+tPaVoZ9L6ABnHkZWfrnXB90Lt5PKQtoStazo=";
   };
 
-  cargoHash = "sha256-7amH8qPmi531sDy3aZsZ5J/oSCnbHY47YzsFODDPcBU=";
+  cargoHash = "sha256-Hu8J4jDo0mTsNbGLaCVuot/VUwFrp3sgLr1kT86LMpA=";
 
   nativeBuildInputs = [ pkg-config (lib.getDev curl) ];
   buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [

From 72aee2374d06cba8991e7fd2a80d2f28da123514 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 28 Aug 2023 21:57:19 +0200
Subject: [PATCH 85/95] cargo-c: 0.9.23 -> 0.9.24

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-c/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix
index 73c9236306b2..7ea4f6067bec 100644
--- a/pkgs/development/tools/rust/cargo-c/default.nix
+++ b/pkgs/development/tools/rust/cargo-c/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-c";
-  version = "0.9.23";
+  version = "0.9.24";
 
   src = fetchCrate {
     inherit pname;
     # this version may need to be updated along with package version
-    version = "${version}+cargo-0.72.2";
-    hash = "sha256-a3cD2X+tPaVoZ9L6ABnHkZWfrnXB90Lt5PKQtoStazo=";
+    version = "${version}+cargo-0.73.0";
+    hash = "sha256-eNaK+SRrHz/DXkCcJP040R6bdhyFmjxkwHbXVFlHub8=";
   };
 
-  cargoHash = "sha256-Hu8J4jDo0mTsNbGLaCVuot/VUwFrp3sgLr1kT86LMpA=";
+  cargoHash = "sha256-Us50BbdNSJAx7JTKkvA4tjbGNueCJsAwGEelc1sP5pc=";
 
   nativeBuildInputs = [ pkg-config (lib.getDev curl) ];
   buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [

From 397a55ac9f0b0bfa98305d30daf09924cacc81ea Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 27 Aug 2023 17:41:50 +0200
Subject: [PATCH 86/95] audit: 3.1.1 -> 3.1.2

https://github.com/linux-audit/audit-userspace/releases/tag/v3.1.2
---
 .../000-fix-static-attribute-malloc.diff      | 12 -------
 .../audit/001-ignore-flexible-array.patch     | 35 -------------------
 pkgs/os-specific/linux/audit/default.nix      | 10 ++----
 3 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/audit/000-fix-static-attribute-malloc.diff
 delete mode 100644 pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch

diff --git a/pkgs/os-specific/linux/audit/000-fix-static-attribute-malloc.diff b/pkgs/os-specific/linux/audit/000-fix-static-attribute-malloc.diff
deleted file mode 100644
index ce76fc3b87a5..000000000000
--- a/pkgs/os-specific/linux/audit/000-fix-static-attribute-malloc.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/auparse/auparse.h
-+++ b/auparse/auparse.h
-@@ -32,6 +32,9 @@
- # define __attr_dealloc(dealloc, argno)
- # define __attr_dealloc_free
- #endif
-+#ifndef __attribute_malloc__
-+# define __attribute_malloc__ __attribute__ ((__malloc__))
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch b/pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch
deleted file mode 100644
index e072cc942cfb..000000000000
--- a/pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From beed138222421a2eb4212d83cb889404bd7efc49 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Wed, 23 Mar 2022 07:27:05 +0000
-Subject: [PATCH] auditswig.i: avoid setter generation for audit_rule_data::buf
-
-As it's a flexible array generated code was never safe to use.
-With kernel's https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ed98ea2128b6fd83bce13716edf8f5fe6c47f574
-change it's a build failure now:
-
-    audit> audit_wrap.c:5010:15: error: invalid use of flexible array member
-    audit>  5010 |     arg1->buf = (char [])(char *)memcpy(malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
-    audit>       |               ^
-
-Let's avoid setter generation entirely.
-
-Closes: https://github.com/linux-audit/audit-userspace/issues/252
----
- bindings/swig/src/auditswig.i | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i
-index 21aafca31..9a2c5661d 100644
---- a/bindings/swig/src/auditswig.i
-+++ b/bindings/swig/src/auditswig.i
-@@ -39,6 +39,10 @@ signed
- #define __attribute(X) /*nothing*/
- typedef unsigned __u32;
- typedef unsigned uid_t;
-+/* Sidestep SWIG's limitation of handling c99 Flexible arrays by not:
-+ * generating setters against them: https://github.com/swig/swig/issues/1699
-+ */
-+%ignore audit_rule_data::buf;
- %include "/usr/include/linux/audit.h"
- #define __extension__ /*nothing*/
- %include <stdint.i>
diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 0fd96892013d..1e941a13767e 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -18,20 +18,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "audit";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz";
-    hash = "sha256-RuRrN2I8zgnm7hNOeNZor8NPThyHDIU+8S5BkweM/oc=";
+    hash = "sha256-wLF5LR8KiMbxgocQUJy7mHBZ/GhxLJdmnKkOrhA9KH0=";
   };
 
-  patches = [
-    ./000-fix-static-attribute-malloc.diff
-    ./001-ignore-flexible-array.patch
-  ];
-
   postPatch = ''
-    sed -i 's,#include <sys/poll.h>,#include <poll.h>\n#include <limits.h>,' audisp/audispd.c
     substituteInPlace bindings/swig/src/auditswig.i \
       --replace "/usr/include/linux/audit.h" \
                 "${linuxHeaders}/include/linux/audit.h"

From 3d4e0708a0559fa3ff63fe45f30f2b564fceb7e1 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 29 Aug 2023 00:59:43 +0300
Subject: [PATCH 87/95] gcc: move dll.a in lib64 to lib output too

same as c304c1e7d0f5bc673c8e7626bfe09270caf5f733
---
 pkgs/development/compilers/gcc/common/builder.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix
index ad3dd5f9b871..98525b5e237e 100644
--- a/pkgs/development/compilers/gcc/common/builder.nix
+++ b/pkgs/development/compilers/gcc/common/builder.nix
@@ -234,6 +234,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
         moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}"
         moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la"  "''${!outputLib}"
         moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}"
+        moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll.a" "''${!outputLib}"
         moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}"
 
         for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do

From 5dccbfa32d5e90e283eb1a435cec358fded4fd30 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:05:14 +0200
Subject: [PATCH 88/95] systemd: add firstboot and sysusers

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index ed4204b9d11a..338f0c7463c0 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -95,6 +95,7 @@
 , withDocumentation ? true
 , withEfi ? stdenv.hostPlatform.isEfi
 , withFido2 ? true
+, withFirstboot ? false # conflicts with the NixOS /etc management
 , withHomed ? !stdenv.hostPlatform.isMusl
 , withHostnamed ? true
 , withHwdb ? true
@@ -121,6 +122,7 @@
 , withRemote ? !stdenv.hostPlatform.isMusl
 , withResolved ? true
 , withShellCompletions ? true
+, withSysusers ? false # conflicts with the NixOS user management
 , withTimedated ? true
 , withTimesyncd ? true
 , withTpm2Tss ? true
@@ -494,6 +496,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dlibcurl=${lib.boolToString wantCurl}"
     "-Dlibidn=false"
     "-Dlibidn2=${lib.boolToString withLibidn2}"
+    "-Dfirstboot=${lib.boolToString withFirstboot}"
+    "-Dsysusers=${lib.boolToString withSysusers}"
     "-Dquotacheck=false"
     "-Dldconfig=false"
     "-Dsmack=true"

From afa60f520761d2a293128e0d1b771fb203731fd8 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 29 Aug 2023 17:01:43 +0300
Subject: [PATCH 89/95] pipewire: 0.3.78 -> 0.3.79

Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/0.3.78...0.3.79

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

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 941d4da56894..fdc514c286b7 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -75,7 +75,7 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "pipewire";
-    version = "0.3.78";
+    version = "0.3.79";
 
     outputs = [
       "out"
@@ -93,7 +93,7 @@ let
       owner = "pipewire";
       repo = "pipewire";
       rev = version;
-      sha256 = "sha256-tiVuab8kugp9ZOKL/m8uZQps/pcrVihwB3rRf6SGuzc=";
+      sha256 = "sha256-pqs991pMqz3IQE+NUk0VNzZS4ExwfoZqBQDWBSGdWcs=";
     };
 
     patches = [

From 1086f093a94d57e5ce1db60407a7fdcf1ea047d2 Mon Sep 17 00:00:00 2001
From: brano543 <brano.masar@gmail.com>
Date: Thu, 31 Aug 2023 01:40:11 +0200
Subject: [PATCH 90/95] win-dll-links: also copy dll from dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes running `pkgsCross.mingwW64._7zz` in wine.

Fixes issue 38451

```
tree result/bin
result/bin
├── 7zz.exe
└── mcfgthread-12.dll -> ../../wmgj476qjfw26f9aij1d64lxrjfv6kk0-mcfgthreads-x86_64-w64-mingw32-git/bin/mcfgthread-12.dll
```

Co-authored-by: marius david <marius@mariusdavid.fr>
---
 pkgs/build-support/cc-wrapper/default.nix     |  11 +-
 .../build-support/setup-hooks/win-dll-link.sh | 124 ++++++++++++------
 2 files changed, 94 insertions(+), 41 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index f52ac48a1a87..8412aabfe5fa 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -332,7 +332,16 @@ stdenv.mkDerivation {
   setupHooks = [
     ../setup-hooks/role.bash
   ] ++ lib.optional (cc.langC or true) ./setup-hook.sh
-    ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh;
+    ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh
+    ++ lib.optional (targetPlatform.isWindows) (stdenv.mkDerivation {
+      name = "win-dll-hook.sh";
+      dontUnpack = true;
+      installPhase = ''
+        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out
+        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out
+        echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out
+      '';
+    });
 
   postFixup =
     # Ensure flags files exists, as some other programs cat them. (That these
diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh
index ca4cbb349b6c..14594bcba937 100644
--- a/pkgs/build-support/setup-hooks/win-dll-link.sh
+++ b/pkgs/build-support/setup-hooks/win-dll-link.sh
@@ -1,45 +1,89 @@
-
 fixupOutputHooks+=(_linkDLLs)
 
-# For every *.{exe,dll} in $output/bin/ we try to find all (potential)
-# transitive dependencies and symlink those DLLs into $output/bin
-# so they are found on invocation.
-# (DLLs are first searched in the directory of the running exe file.)
-# The links are relative, so relocating whole /nix/store won't break them.
-_linkDLLs() {
-(
-    if [ ! -d "$prefix/bin" ]; then exit; fi
-    cd "$prefix/bin"
+addEnvHooks "$targetOffset" linkDLLGetFolders
 
-    # Compose path list where DLLs should be located:
-    #   prefix $PATH by currently-built outputs
-    local DLLPATH=""
-    local outName
-    for outName in $(getAllOutputNames); do
-        addToSearchPath DLLPATH "${!outName}/bin"
-    done
-    DLLPATH="$DLLPATH:$PATH"
-
-    echo DLLPATH="'$DLLPATH'"
-
-    linkCount=0
-    # Iterate over any DLL that we depend on.
-    local dll
-    for dll in $($OBJDUMP -p *.{exe,dll} | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do
-        if [ -e "./$dll" ]; then continue; fi
-        # Locate the DLL - it should be an *executable* file on $DLLPATH.
-        local dllPath="$(PATH="$DLLPATH" type -P "$dll")"
-        if [ -z "$dllPath" ]; then continue; fi
-        # That DLL might have its own (transitive) dependencies,
-        # so add also all DLLs from its directory to be sure.
-        local dllPath2
-        for dllPath2 in "$dllPath" "$(dirname $(readlink "$dllPath" || echo "$dllPath"))"/*.dll; do
-            if [ -e ./"$(basename "$dllPath2")" ]; then continue; fi
-            CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath2" .
-            linkCount=$(($linkCount+1))
-        done
-    done
-    echo "Created $linkCount DLL link(s) in $prefix/bin"
-)
+linkDLLGetFolders() {
+    addToSearchPath "LINK_DLL_FOLDERS" "$1/lib"
+    addToSearchPath "LINK_DLL_FOLDERS" "$1/bin"
 }
 
+_linkDLLs() {
+    linkDLLsInfolder "$prefix/bin"
+}
+
+# Try to links every known dependency of exe/dll in the folder of the 1str input
+# into said folder, so they are found on invocation.
+# (DLLs are first searched in the directory of the running exe file.)
+# The links are relative, so relocating whole /nix/store won't break them.
+linkDLLsInfolder() {
+    (
+        local folder
+        folder="$1"
+        if [ ! -d "$folder" ]; then
+            echo "Not linking DLLs in the non-existent folder $folder"
+            return
+        fi
+        cd "$folder" || exit
+
+        # Use associative arrays as set
+        local filesToChecks
+        local filesDone
+        declare -A filesToChecks # files that still needs to have their dependancies checked
+        declare -A filesDone     # files that had their dependancies checked and who is copied to the bin folder if found
+
+        markFileAsDone() {
+            if [ ! "${filesDone[$1]+a}" ]; then filesDone[$1]=a; fi
+            if [ "${filesToChecks[$1]+a}" ]; then unset 'filesToChecks[$1]'; fi
+        }
+
+        addFileToLink() {
+            if [ "${filesDone[$1]+a}" ]; then return; fi
+            if [ ! "${filesToChecks[$1]+a}" ]; then filesToChecks[$1]=a; fi
+        }
+
+        # Compose path list where DLLs should be located:
+        #   prefix $PATH by currently-built outputs
+        local DLLPATH=""
+        local outName
+        for outName in $(getAllOutputNames); do
+            addToSearchPath DLLPATH "${!outName}/bin"
+        done
+        DLLPATH="$DLLPATH:$LINK_DLL_FOLDERS"
+
+        echo DLLPATH="'$DLLPATH'"
+
+        for peFile in *.{exe,dll}; do
+            if [ -e "./$peFile" ]; then
+                addFileToLink "$peFile"
+            fi
+        done
+
+        local searchPaths
+        readarray -td: searchPaths < <(printf -- "%s" "$DLLPATH")
+
+        local linkCount=0
+        while [ ${#filesToChecks[*]} -gt 0 ]; do
+            local listOfDlls=("${!filesToChecks[@]}")
+            local file=${listOfDlls[0]}
+            markFileAsDone "$file"
+            if [ ! -e "./$file" ]; then
+                local pathsFound
+                readarray -d '' pathsFound < <(find "${searchPaths[@]}" -name "$file" -type f -print0)
+                if [ ${#pathsFound[@]} -eq 0 ]; then continue; fi
+                local dllPath
+                dllPath="${pathsFound[0]}"
+                CYGWIN+=" winsymlinks:nativestrict" ln -sr "$dllPath" .
+                echo "linking $dllPath"
+                file="$dllPath"
+                linkCount=$((linkCount + 1))
+            fi
+            # local dep_file
+            # Look at the file’s dependancies
+            for dep_file in $($OBJDUMP -p "$file" | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do
+                addFileToLink "$dep_file"
+            done
+        done
+
+        echo "Created $linkCount DLL link(s) in $folder"
+    )
+}

From 8490868860c9a411ab2629789fb0bed0da229879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 3 Sep 2023 07:48:38 +0200
Subject: [PATCH 91/95] aardvark-dns: skip a broken test (for now)

https://hydra.nixos.org/build/233560430/nixlog/3/tail
---
 pkgs/tools/networking/aardvark-dns/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix
index 106fac53d682..57888630cd0f 100644
--- a/pkgs/tools/networking/aardvark-dns/default.nix
+++ b/pkgs/tools/networking/aardvark-dns/default.nix
@@ -17,6 +17,11 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-rrn+ZTAsFs7UTP4xQL3Cy8G6RG7vwT0wMKnXHHIkB90=";
 
+  checkFlags = [
+    # https://github.com/containers/aardvark-dns/issues/379
+    "--skip=test::test::tests::test_backend_network_scoped_custom_dns_server"
+  ];
+
   passthru.tests = { inherit (nixosTests) podman; };
 
   meta = with lib; {

From 1087417b1485d0cf7c50ca894c5624779a291db6 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 3 Sep 2023 10:53:37 -0400
Subject: [PATCH 92/95] eww: unstable-2023-06-10 -> unstable-2023-08-18

Diff: https://github.com/elkowar/eww/compare/25e50eda46379bccd8a7887c18ee35833e0460e8...a9a35c1804d72ef92e04ee71555bd9e5a08fa17e
---
 pkgs/applications/window-managers/eww/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix
index b1644f9d82c6..0479f1fe259b 100644
--- a/pkgs/applications/window-managers/eww/default.nix
+++ b/pkgs/applications/window-managers/eww/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "eww";
-  version = "unstable-2023-06-10";
+  version = "unstable-2023-08-18";
 
   src = fetchFromGitHub {
     owner = "elkowar";
     repo = "eww";
-    rev = "25e50eda46379bccd8a7887c18ee35833e0460e8";
-    hash = "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4=";
+    rev = "a9a35c1804d72ef92e04ee71555bd9e5a08fa17e";
+    hash = "sha256-GEysmNDm+olt1WXHzRwb4ZLifkXmeP5+APAN3b81/Og=";
   };
 
-  cargoHash = "sha256-dC7yVJdR7mO0n+sxWwigM1Q4tbDv5ZuOINHHlUIPdA0=";
+  cargoHash = "sha256-4yeu5AgleZMOLKNynGMd0XuyZxyyZ+RmzNtuJiNPN8g=";
 
   nativeBuildInputs = [ pkg-config wrapGAppsHook ];
 

From 884c080079bff520ed99f378799e3be05c3a8b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Mon, 4 Sep 2023 15:32:31 +0200
Subject: [PATCH 93/95] wasmtime: fix build due to cargo-auditable issue

`cargo-auditable` is not able to process the `c-api` crate
`Cargo.toml` due to the inclusion of the new `dep:` keyword in crate
features.
---
 .../interpreters/wasmtime/default.nix         |  4 +++
 ...cy-due-to-cargo-auditable-limitation.patch | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch

diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 936caafaffa7..9bc8523d7d4a 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -15,6 +15,10 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-SG/SFskr6ywCtJu2WVWTJC9GUKJJB0fUb+hZUaxag0M=";
 
   cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
+  cargoPatches = [
+    # this patch is necessary until cargo-auditable is bumped on the rust platform
+    ./patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch
+  ];
 
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch b/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch
new file mode 100644
index 000000000000..03870600e32a
--- /dev/null
+++ b/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch
@@ -0,0 +1,26 @@
+From a59bb5f9deeff156bd7bc9d22bc199e0f902b7dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
+ <ereslibre@ereslibre.es>
+Date: Mon, 4 Sep 2023 15:25:15 +0200
+Subject: [PATCH] Use `dep:` dependency due to `cargo-auditable` limitation
+
+`cargo-auditable` fails to process the current `Cargo.toml` as it
+is (cargo/rustc 1.72.0 is able to process this crate without any
+issues).
+---
+ crates/c-api/Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml
+index a464c0dbd..1e793432c 100644
+--- a/crates/c-api/Cargo.toml
++++ b/crates/c-api/Cargo.toml
+@@ -37,4 +37,4 @@ default = ['jitdump', 'wat', 'wasi', 'cache', 'parallel-compilation']
+ jitdump = ["wasmtime/jitdump"]
+ cache = ["wasmtime/cache"]
+ parallel-compilation = ['wasmtime/parallel-compilation']
+-wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std', 'wasi-common']
++wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'dep:cap-std', 'wasi-common']
+-- 
+2.40.1
+

From bcbbfd86e08623eaf33a5b9838533c841f9ca59a Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 4 Sep 2023 16:28:46 -0400
Subject: [PATCH 94/95] edge-runtime: 1.10.0 -> 1.14.0

---
 pkgs/development/web/edge-runtime/default.nix     |  8 ++++----
 pkgs/development/web/edge-runtime/librusty_v8.nix | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/web/edge-runtime/default.nix b/pkgs/development/web/edge-runtime/default.nix
index 071d16b5f8f1..a84e232bbb4c 100644
--- a/pkgs/development/web/edge-runtime/default.nix
+++ b/pkgs/development/web/edge-runtime/default.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "edge-runtime";
-  version = "1.10.0";
+  version = "1.14.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -20,16 +20,16 @@ rustPlatform.buildRustPackage {
     owner = "supabase";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-AWdgqL7Io4v3Z4XNS5JDDGuUeSqsNpF/NpJQ7h5oJZs=";
+    hash = "sha256-63XStzO4Jt6ObWuzcBf2QwCIWsStXvhQ0XaJabELhWg=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-AIwMoqbnCl4DFX0gSGblkV8DgtruwXPw8ngHeBDD6Dw=";
+  cargoHash = "sha256-JwwdvvpqgSbl0Xyb5pQ5hzZRrrCnDSjwV+ikdO2pXCk=";
 
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
 
   buildInputs = lib.optionals stdenv.isLinux [ openssl ]
-    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation ]);
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation SystemConfiguration ]);
 
   # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
   # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix
index 30f6aebc2960..6e9fc0a669fd 100644
--- a/pkgs/development/web/edge-runtime/librusty_v8.nix
+++ b/pkgs/development/web/edge-runtime/librusty_v8.nix
@@ -1,3 +1,4 @@
+# auto-generated file -- DO NOT EDIT!
 { rust, stdenv, fetchurl }:
 
 let
@@ -10,11 +11,11 @@ let
   };
 in
 fetch_librusty_v8 {
-  version = "0.68.0";
+  version = "0.74.3";
   shas = {
-    x86_64-linux = "sha256-yq7YPD2TM6Uw0EvCqIsZ/lbE1RLgIg7a42qDVrr5fX4=";
-    aarch64-linux = "sha256-uZFm3hAeyEUUXqRJFLM3OBVfglH3AecjFKVgeJZu3L0=";
-    x86_64-darwin = "sha256-YkxoggK0I4rT/KNJ30StDPLUc02Mdjwal3JH+s/YTQo=";
-    aarch64-darwin = "sha256-aXE7W3sSzbhvC661BYTTHyHlihmVVtFSv85nSjGOLkU=";
+    x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A=";
+    aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0=";
+    x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ=";
+    aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM=";
   };
 }

From 6921c5014eaa6d045f7b802c231bb9363b9b53c1 Mon Sep 17 00:00:00 2001
From: Dane Lipscombe <danelipscombe@gmail.com>
Date: Wed, 6 Sep 2023 10:18:00 +1000
Subject: [PATCH 95/95] turbo: 1.10.7 -> 1.10.13

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

diff --git a/pkgs/tools/misc/turbo/default.nix b/pkgs/tools/misc/turbo/default.nix
index 3700b5a278a2..0928348666ea 100644
--- a/pkgs/tools/misc/turbo/default.nix
+++ b/pkgs/tools/misc/turbo/default.nix
@@ -24,12 +24,12 @@
 , CoreFoundation
 }:
 let
-  version = "1.10.7";
+  version = "1.10.13";
   src = fetchFromGitHub {
     owner = "vercel";
     repo = "turbo";
     rev = "v${version}";
-    sha256 = "sha256-AkrwaaXUiFPZqOO1mX/1XBOZRFRtCdgI7glzdv8ZOfU=";
+    sha256 = "sha256-7bEHE/bHRVOXMP7+oo+4k8yn6d+LkXBi8JcDeR0ajww";
   };
 
   ffi = rustPlatform.buildRustPackage {
@@ -37,7 +37,7 @@ let
     inherit src version;
     cargoBuildFlags = [ "--package" "turborepo-ffi" ];
 
-    cargoHash = "sha256-j+r1irE0OGMfr9TAYhTOsFjBNzxjmF5/e7EebtshuG8=";
+    cargoHash = "sha256-CIKuW8qKJiqgDBPfuCIBcWUP41BHwAa1m9vmcQ9ZmAY=";
 
     RUSTC_BOOTSTRAP = 1;
     nativeBuildInputs = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage {
   ];
   RELEASE_TURBO_CLI = "true";
 
-  cargoHash = "sha256-GCo1PRB4JkHSXz7nBiKhJsC1xhMTlA136gGpUblPpVk=";
+  cargoHash = "sha256-rKdonANA6WvXPMpK8sC95hsX9Yb5zedeBezY4LWzsZE=";
 
   RUSTC_BOOTSTRAP = 1;
   nativeBuildInputs = [