From 5b2975fb48c4c2efc6bb71e1b509d058b3ebd1ec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 01:44:42 +0200
Subject: [PATCH 01/17] home-assistant-custom-components.mass: enable tests

---
 .../custom-components/mass/default.nix              | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/servers/home-assistant/custom-components/mass/default.nix b/pkgs/servers/home-assistant/custom-components/mass/default.nix
index 39059b4c70ff..08382d024f8e 100644
--- a/pkgs/servers/home-assistant/custom-components/mass/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/mass/default.nix
@@ -4,6 +4,9 @@
 , toPythonModule
 , async-timeout
 , music-assistant
+, pytestCheckHook
+, pytest-asyncio
+, pytest-homeassistant-custom-component
 }:
 
 buildHomeAssistantComponent rec {
@@ -18,6 +21,10 @@ buildHomeAssistantComponent rec {
     hash = "sha256-Wvc+vUYkUJmS4U34Sh/sDCVXmQA0AtEqIT8MNXd++3M=";
   };
 
+  postPatch = ''
+    sed -i "s/--cov//" pyproject.toml
+  '';
+
   dependencies = [
     async-timeout
     (toPythonModule music-assistant)
@@ -25,6 +32,12 @@ buildHomeAssistantComponent rec {
 
   dontCheckManifest = true; # expects music-assistant 2.0.6, we have 2.0.7
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-homeassistant-custom-component
+  ];
+
   meta = with lib; {
     description = "Turn your Home Assistant instance into a jukebox, hassle free streaming of your favorite media to Home Assistant media players";
     homepage = "https://github.com/music-assistant/hass-music-assistant";

From 860c9b608d4994c4ed33aab65f5b72d45f04fbad Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 01:47:44 +0200
Subject: [PATCH 02/17] python312Packages.pyindego: 3.2.1 -> 3.2.2

https://github.com/sander1988/pyIndego/blob/3.2.2/CHANGELOG.md
---
 pkgs/development/python-modules/pyindego/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyindego/default.nix b/pkgs/development/python-modules/pyindego/default.nix
index 2f2ceb9d59a1..606ced675121 100644
--- a/pkgs/development/python-modules/pyindego/default.nix
+++ b/pkgs/development/python-modules/pyindego/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "pyindego";
-  version = "3.2.1";
+  version = "3.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "jm-73";
+    owner = "sander1988";
     repo = "pyIndego";
     rev = "refs/tags/${version}";
-    hash = "sha256-wPQocacWwWjEH4boMZ33aW/NPvdD6LSmMTFXGwBwwq8=";
+    hash = "sha256-x8/MSbn+urmArQCyxZU1JEUyATJsPzp7bflymE+1rkk=";
   };
 
   postPatch = ''
@@ -60,8 +60,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python interface for Bosch API for lawnmowers";
-    homepage = "https://github.com/jm-73/pyIndego";
-    changelog = "https://github.com/jm-73/pyIndego/blob/${version}/CHANGELOG.md";
+    homepage = "https://github.com/sander1988/pyIndego";
+    changelog = "https://github.com/sander1988/pyIndego/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
   };

From 721388eccaf7d475e71b657401ffa67b4554ee0c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 01:48:17 +0200
Subject: [PATCH 03/17] home-assistant-custom-components.indego: 5.7.2 -> 5.7.4

https://github.com/sander1988/Indego/releases/tag/5.7.3
https://github.com/sander1988/Indego/releases/tag/5.7.4
---
 .../custom-components/indego/default.nix             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/indego/default.nix b/pkgs/servers/home-assistant/custom-components/indego/default.nix
index 607590e5bc3d..6f185dd718c5 100644
--- a/pkgs/servers/home-assistant/custom-components/indego/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/indego/default.nix
@@ -6,23 +6,23 @@
 }:
 
 buildHomeAssistantComponent rec {
-  owner = "jm-73";
+  owner = "sander1988";
   domain = "indego";
-  version = "5.7.2";
+  version = "5.7.4";
 
   src = fetchFromGitHub {
-    owner = "jm-73";
+    owner = "sander1988";
     repo = "Indego";
     rev = "refs/tags/${version}";
-    hash = "sha256-9q8aHbAMIA2xKhZl/CDXWSV1ylDCEVkpL8OUlELoG0Q=";
+    hash = "sha256-SiYjducy0NP5bF3STVzhBdnJraNjHywHfD7OmAnYmr0=";
   };
 
   dependencies = [ pyindego ];
 
   meta = with lib; {
     description = "Bosch Indego lawn mower component";
-    changelog = "https://github.com/jm-73/Indego/releases/tag/${version}";
-    homepage = "https://github.com/jm-73/Indego";
+    changelog = "https://github.com/sander1988/Indego/releases/tag/${version}";
+    homepage = "https://github.com/sander1988/Indego";
     license = licenses.asl20;
     maintainers = with maintainers; [ hexa ];
   };

From 5927a45d817220224650cb042edcc573976c889f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 24 Jul 2024 00:55:44 +0200
Subject: [PATCH 04/17] platformio: 6.1.11 -> 6.1.15

https://github.com/platformio/platformio-core/releases/tag/v6.1.12
https://github.com/platformio/platformio-core/releases/tag/v6.1.13
https://github.com/platformio/platformio-core/releases/tag/v6.1.14
https://github.com/platformio/platformio-core/releases/tag/v6.1.15
---
 pkgs/development/embedded/platformio/core.nix                | 5 +++--
 .../embedded/platformio/use-local-spdx-license-list.patch    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix
index f2ebeba39361..6890a2b1b35e 100644
--- a/pkgs/development/embedded/platformio/core.nix
+++ b/pkgs/development/embedded/platformio/core.nix
@@ -11,7 +11,7 @@
 
 with python3Packages; buildPythonApplication rec {
   pname = "platformio";
-  version = "6.1.11";
+  version = "6.1.15";
   pyproject = true;
 
   # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
@@ -19,7 +19,7 @@ with python3Packages; buildPythonApplication rec {
     owner = "platformio";
     repo = "platformio-core";
     rev = "v${version}";
-    hash = "sha256-NR4UyAt8q5sUGtz1Sy6E8Of7y9WrH9xpcAWzLBeDQmo=";
+    hash = "sha256-w5JUAqQRNxq8ZrX8ffny2K7xWBkGr2H3+apYqCPXw9c=";
   };
 
   outputs = [ "out" "udev" ];
@@ -132,6 +132,7 @@ with python3Packages; buildPythonApplication rec {
     # requires internet connection
     "test_api_cache"
     "test_ping_internet_ips"
+    "test_metadata_dump"
   ];
 
   pytestFlagsArray = [
diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
index ba9b55b788a1..f2b9f5015adc 100644
--- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
+++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch
@@ -1,12 +1,12 @@
 diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
-index 95e08108..6c2cfaed 100644
+index c1d22ab5..6c2cfaed 100644
 --- a/platformio/package/manifest/schema.py
 +++ b/platformio/package/manifest/schema.py
 @@ -276,9 +276,6 @@ class ManifestSchema(BaseSchema):
      @staticmethod
      @memoized(expire="1h")
      def load_spdx_licenses():
--        version = "3.21"
+-        version = "3.23"
 -        spdx_data_url = (
 -            "https://raw.githubusercontent.com/spdx/license-list-data/"
 -            f"v{version}/json/licenses.json"

From 21e8dda86eec192dec4ca9694854bd697eaaf266 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 1 Aug 2024 03:15:36 +0200
Subject: [PATCH 05/17] home-assistant-custom-components.frigate: 5.2.0 ->
 5.3.0

https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.3.0
---
 .../custom-components/frigate/default.nix     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/frigate/default.nix b/pkgs/servers/home-assistant/custom-components/frigate/default.nix
index b32706f3eaa1..e54cab3c6e4a 100644
--- a/pkgs/servers/home-assistant/custom-components/frigate/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigate/default.nix
@@ -1,24 +1,23 @@
-{ lib
-, fetchFromGitHub
-, buildHomeAssistantComponent
-, pytz
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  pytz,
 }:
 
 buildHomeAssistantComponent rec {
-  owner = "presto8";
+  owner = "blakeblackshear";
   domain = "frigate";
-  version = "5.2.0";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "blakeblackshear";
     repo = "frigate-hass-integration";
     rev = "v${version}";
-    hash = "sha256-OWpOYNVzowdn0iZfJwhdMrAYeqDpNJvSwHpsJX9fDk4=";
+    hash = "sha256-0eTEgRDgm4+Om2uqrt24Gj7dSdA6OJs/0oi5J5SHOyI=";
   };
 
-  propagatedBuildInputs = [
-    pytz
-  ];
+  dependencies = [ pytz ];
 
   dontBuild = true;
 

From 5757a3c0bb6b24e287b9285da104c87307c56c49 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 1 Aug 2024 04:16:00 +0200
Subject: [PATCH 06/17] nginxModules.vod: 1.32 -> 1.33

---
 pkgs/servers/http/nginx/modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index b167cb64da90..2be9b5f707b0 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -983,8 +983,8 @@ let self = {
       name = "vod";
       owner = "kaltura";
       repo = "nginx-vod-module";
-      rev = "1.32";
-      hash = "sha256-ZpG0oj60D3o7/7uyE8AybCiOtncVe1Jnjaz22sIFypk=";
+      rev = "1.33";
+      hash = "sha256-xcdbaogJV/vSzFfP55uK2+zw3zF5j9AHaJI0QItTSss=";
       postFetch = ''
         substituteInPlace $out/vod/media_set.h \
           --replace "MAX_CLIPS (128)" "MAX_CLIPS (1024)"

From 9853cc66869a64bb5e1687861e09d687e80a6755 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Aug 2024 17:16:03 +0000
Subject: [PATCH 07/17] python312Packages.automx2: 2024.1 -> 2024.2

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

diff --git a/pkgs/development/python-modules/automx2/default.nix b/pkgs/development/python-modules/automx2/default.nix
index 05ddb4c521a9..298dd7fb9adc 100644
--- a/pkgs/development/python-modules/automx2/default.nix
+++ b/pkgs/development/python-modules/automx2/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "automx2";
-  version = "2024.1";
+  version = "2024.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "rseichter";
     repo = "automx2";
-    rev = version;
-    hash = "sha256-s/kd9A/d3SPMZC9+B4DdcXVi77WLH/SBwXIdaKHUj34=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-7SbSKSjDHTppdqfPPKvuWbdoksHa6BMIOXOq0jDggTE=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 60b0489ee327cbbbc6432c771b5d38756b3b809b Mon Sep 17 00:00:00 2001
From: vringar <git@zabka.it>
Date: Fri, 2 Aug 2024 13:10:43 +0200
Subject: [PATCH 08/17] gradle: fix update-deps.sh to use Nix bash

This fixes an issue on non NixOS Linux distributions
where their system bash might be outside of
/tmp, /nix, and /run.

Thanks to @puckipedia for the suggestion
---
 pkgs/development/tools/build-managers/gradle/update-deps.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/update-deps.nix b/pkgs/development/tools/build-managers/gradle/update-deps.nix
index 0b19a17429bd..96e46a0d98fd 100644
--- a/pkgs/development/tools/build-managers/gradle/update-deps.nix
+++ b/pkgs/development/tools/build-managers/gradle/update-deps.nix
@@ -104,10 +104,10 @@ writeTextFile {
         --tmpfs /home --bind /tmp /tmp --ro-bind /nix /nix --ro-bind /run /run --proc /proc --dev /dev  \
         --ro-bind ${toString path} ${toString path} --bind "$MITM_CACHE_CERT_DIR" "$MITM_CACHE_CERT_DIR" \
         ${builtins.concatStringsSep " " (map (x: "--setenv ${x} \"\$${x}\"") keep)} \
-        --setenv NIX_BUILD_SHELL bash ${bwrapFlags} ''${BWRAP_FLAGS:-} \
+        --setenv NIX_BUILD_SHELL ${runtimeShell} ${bwrapFlags} ''${BWRAP_FLAGS:-} \
         -- ${nix}/bin/nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath}
     else
-      NIX_BUILD_SHELL=bash nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath}
+      NIX_BUILD_SHELL=${runtimeShell} nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath}
     fi${lib.optionalString silent " >&2"}
     kill -s SIGINT "$MITM_CACHE_PID"
     for i in {0..20}; do

From 5c354f19ea79a4bb52e29465d672a01e82c7c6d5 Mon Sep 17 00:00:00 2001
From: vringar <git@zabka.it>
Date: Fri, 2 Aug 2024 13:11:01 +0200
Subject: [PATCH 09/17] ghidra: restore configurability to buildGhidraExtension

This is required as Ghidra plugins don't have a consistent
layout and have to be widely configurable
---
 pkgs/tools/security/ghidra/build-extension.nix                | 4 +++-
 .../security/ghidra/extensions/gnudisassembler/default.nix    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ghidra/build-extension.nix b/pkgs/tools/security/ghidra/build-extension.nix
index ce84287a8bd6..49d68b2f81ee 100644
--- a/pkgs/tools/security/ghidra/build-extension.nix
+++ b/pkgs/tools/security/ghidra/build-extension.nix
@@ -26,9 +26,11 @@ let
       preBuild = ''
         # Set project name, otherwise defaults to directory name
         echo -e '\nrootProject.name = "${pname}"' >> settings.gradle
+        ${args.preBuild or ""}
       '';
 
-      gradleFlags = [ "-PGHIDRA_INSTALL_DIR=${ghidra}/lib/ghidra" ];
+      gradleBuildTask = args.gradleBuildTask or "buildExtension";
+      gradleFlags = args.gradleFlags or [] ++ [ "-PGHIDRA_INSTALL_DIR=${ghidra}/lib/ghidra" ];
 
       installPhase = args.installPhase or ''
         runHook preInstall
diff --git a/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix b/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix
index 7ca4b056842e..14b0f1df2733 100644
--- a/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/gnudisassembler/default.nix
@@ -48,6 +48,7 @@ buildGhidraExtension {
   buildInputs = [
     zlib
   ];
+  gradleBuildTask = "assemble";
 
   installPhase = ''
     runHook preInstall

From c5e72a3ce5c45281287d2828387c5afb072de6d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Aug 2024 23:03:58 +0000
Subject: [PATCH 10/17] python312Packages.pywaze: 1.0.2 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix
index ed985d23323d..081db245b8c2 100644
--- a/pkgs/development/python-modules/pywaze/default.nix
+++ b/pkgs/development/python-modules/pywaze/default.nix
@@ -12,16 +12,16 @@
 
 buildPythonPackage rec {
   pname = "pywaze";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "eifinger";
     repo = "pywaze";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fShfnfYhUtthwHSFYIFj2cWE9dZXakTrfqiR3AL2nb8=";
+    hash = "sha256-XE+VdxUjq8KBSIU6rUlBweKEkZD3gqJuy9J4u9JVy7Q=";
   };
 
   postPatch = ''

From ea6f4d5e8604ebcedd46f136f1dc93a4da86852b Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Fri, 2 Aug 2024 23:19:41 +0800
Subject: [PATCH 11/17] treewide: remove periods from lib.mkEnableOption
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
---
 nixos/modules/services/mail/dovecot.nix        | 2 +-
 nixos/modules/services/misc/blenderfarm.nix    | 4 ++--
 nixos/modules/services/monitoring/nagios.nix   | 2 +-
 nixos/modules/services/networking/wstunnel.nix | 4 ++--
 nixos/modules/services/web-apps/freshrss.nix   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index b2a6b3ab6784..1d17dd66e071 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -328,7 +328,7 @@ in
 
     createMailUser = mkEnableOption ''automatically creating the user
       given in {option}`services.dovecot.user` and the group
-      given in {option}`services.dovecot.group`.'' // { default = true; };
+      given in {option}`services.dovecot.group`'' // { default = true; };
 
     modules = mkOption {
       type = types.listOf types.package;
diff --git a/nixos/modules/services/misc/blenderfarm.nix b/nixos/modules/services/misc/blenderfarm.nix
index c13e43c7ecda..0d8ecf7af8e2 100644
--- a/nixos/modules/services/misc/blenderfarm.nix
+++ b/nixos/modules/services/misc/blenderfarm.nix
@@ -18,9 +18,9 @@ in
   meta.maintainers = with lib.maintainers; [ gador ];
 
   options.services.blendfarm = with lib.types; {
-    enable = lib.mkEnableOption "Blendfarm, a render farm management software for Blender.";
+    enable = lib.mkEnableOption "Blendfarm, a render farm management software for Blender";
     package = lib.mkPackageOption pkgs "blendfarm" { };
-    openFirewall = lib.mkEnableOption "Allow blendfarm network access through the firewall.";
+    openFirewall = lib.mkEnableOption "allowing blendfarm network access through the firewall";
 
     user = lib.mkOption {
       description = "User under which blendfarm runs.";
diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix
index b6eced134bcc..e475d41270b1 100644
--- a/nixos/modules/services/monitoring/nagios.nix
+++ b/nixos/modules/services/monitoring/nagios.nix
@@ -88,7 +88,7 @@ in
 
   options = {
     services.nagios = {
-      enable = mkEnableOption ''[Nagios](https://www.nagios.org/) to monitor your system or network.'';
+      enable = mkEnableOption ''[Nagios](https://www.nagios.org/) to monitor your system or network'';
 
       objectDefs = mkOption {
         description = ''
diff --git a/nixos/modules/services/networking/wstunnel.nix b/nixos/modules/services/networking/wstunnel.nix
index bd7536351955..439e1f8ea9b5 100644
--- a/nixos/modules/services/networking/wstunnel.nix
+++ b/nixos/modules/services/networking/wstunnel.nix
@@ -23,14 +23,14 @@ let
   };
 
   commonOptions = {
-    enable = lib.mkEnableOption "this `wstunnel` instance." // {
+    enable = lib.mkEnableOption "this `wstunnel` instance" // {
       default = true;
     };
 
     package = lib.mkPackageOption pkgs "wstunnel" { };
 
     autoStart =
-      lib.mkEnableOption "starting this wstunnel instance automatically." // {
+      lib.mkEnableOption "starting this wstunnel instance automatically" // {
         default = true;
       };
 
diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix
index 20b1e5605596..53366e2c891e 100644
--- a/nixos/modules/services/web-apps/freshrss.nix
+++ b/nixos/modules/services/web-apps/freshrss.nix
@@ -19,7 +19,7 @@ in
   meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ];
 
   options.services.freshrss = {
-    enable = mkEnableOption "FreshRSS RSS aggregator and reader with php-fpm backend.";
+    enable = mkEnableOption "FreshRSS RSS aggregator and reader with php-fpm backend";
 
     package = mkPackageOption pkgs "freshrss" { };
 

From 4c445ed4790c68e50e623cd56e70521e59addf6f Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Fri, 2 Aug 2024 23:06:19 +0200
Subject: [PATCH 12/17] nix-du: 1.2.0 -> 1.2.1

Diff: https://github.com/symphorien/nix-du/compare/v1.2.0...v1.2.1
---
 pkgs/tools/package-management/nix-du/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index bfa6959cf353..8b2463ccce4c 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-du";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nix-du";
     rev = "v${version}";
-    sha256 = "sha256-HfmMZVlsdg9hTWGUihl6OlQAp/n1XRvPLfAKJ8as8Ew=";
+    sha256 = "sha256-WImnfkBU17SFQG1DzVUdsNq3hkiISNjAVZr2xGbgwHg=";
   };
 
-  cargoHash = "sha256-oUxxuBqec4aI2h8BAn1WSA44UU7f5APkv0DIwuSun0M=";
+  cargoHash = "sha256-gE99nCJIi6fsuxzJuU80VWXIZqVbqwBhKM2aRlhmYco=";
 
   doCheck = true;
   nativeCheckInputs = [ nix graphviz ];

From e58878b8a1e796fec5bd1b75f454345974b02b9a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 2 Aug 2024 23:03:16 +0200
Subject: [PATCH 13/17] nbqa: fix by adding distutils test dependency

---
 pkgs/tools/misc/nbqa/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/nbqa/default.nix b/pkgs/tools/misc/nbqa/default.nix
index 5a05f403b641..251083be4c10 100644
--- a/pkgs/tools/misc/nbqa/default.nix
+++ b/pkgs/tools/misc/nbqa/default.nix
@@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec {
     ]
     ++ (with python3.pkgs; [
       autoflake
+      distutils
       flake8
       isort
       jupytext

From 6f0a079ba56be107075d543cf3ef260ec58d03c1 Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Fri, 2 Aug 2024 12:42:13 +0100
Subject: [PATCH 14/17] await: 1.0.1 -> 1.0.2

---
 pkgs/by-name/aw/await/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix
index 0b1d78e05095..56726df19e57 100644
--- a/pkgs/by-name/aw/await/package.nix
+++ b/pkgs/by-name/aw/await/package.nix
@@ -2,19 +2,22 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  installShellFiles,
 }:
 
 stdenv.mkDerivation rec {
   pname = "await";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "slavaGanzin";
     repo = "await";
     rev = "v${version}";
-    hash = "sha256-5lKuqxrUAHfeV0hikrDbxkKAdPtODfal5byc3L7aZmw=";
+    hash = "sha256-qvSRuRLZnUptXYknyRn4GgmYtj9BnI8flN6EhadbKMw=";
   };
 
+  nativeBuildInputs = [ installShellFiles ];
+
   buildPhase = ''
     runHook preBuild
     $CC await.c -o await -l pthread
@@ -27,6 +30,7 @@ stdenv.mkDerivation rec {
     install -Dm755 await -t $out/bin
     install -Dm444 LICENSE -t $out/share/licenses/await
     install -Dm444 README.md -t $out/share/doc/await
+    installShellCompletion --cmd await autocomplete.{bash,fish,zsh}
 
     runHook postInstall
   '';

From e0816431a23a06692d86c0b545b4522b9a9bc939 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 2 Aug 2024 23:10:35 +1200
Subject: [PATCH 15/17] treewide: Pass self when overriding Python

Otherwise references to the Python interpreter inside the set are wrong, as demonstrated by:
``` nix
with import <nixpkgs> { };
let
  python' = python3.override {
    packageOverrides = final: prev: { requests = prev.requests.overridePythonAttrs(old: { version = "1337";  }); };
  };
in python'.pkgs.python.pkgs.requests
```
which returns the _non_ overriden requests.

And the same with `self`:
```
with import <nixpkgs> { };
let
  python' = python3.override {
    self = python';
    packageOverrides = final: prev: { requests = prev.requests.overridePythonAttrs(old: { version = "1337";  }); };
  };
in python'.pkgs.python.pkgs.requests
```
which returns the overriden requests.

This can manifest itself as file collisions when constructing environments or as subtly incorrect dependency graphs.
---
 pkgs/applications/gis/qgis/unwrapped-ltr.nix               | 1 +
 pkgs/applications/gis/qgis/unwrapped.nix                   | 1 +
 pkgs/applications/graphics/textual-paint/default.nix       | 1 +
 pkgs/applications/misc/archivebox/default.nix              | 1 +
 pkgs/applications/misc/archivy/default.nix                 | 1 +
 pkgs/applications/misc/dbx/default.nix                     | 2 +-
 pkgs/applications/misc/haxor-news/default.nix              | 3 +--
 pkgs/applications/misc/pytrainer/default.nix               | 1 +
 pkgs/applications/misc/tandoor-recipes/default.nix         | 1 +
 pkgs/applications/networking/cluster/nixops/default.nix    | 1 +
 .../networking/instant-messengers/turses/default.nix       | 1 +
 .../networking/instant-messengers/zulip-term/default.nix   | 1 +
 pkgs/applications/networking/seahub/default.nix            | 1 +
 pkgs/applications/office/paperless-ngx/default.nix         | 1 +
 pkgs/applications/version-management/sourcehut/default.nix | 1 +
 pkgs/applications/video/catt/default.nix                   | 1 +
 pkgs/applications/video/frigate/default.nix                | 1 +
 pkgs/applications/video/pyca/default.nix                   | 2 +-
 pkgs/by-name/az/azure-cli/python-packages.nix              | 1 +
 pkgs/by-name/ca/calibre-web/package.nix                    | 1 +
 pkgs/by-name/ch/charmcraft/package.nix                     | 1 +
 pkgs/by-name/gd/gdtoolkit_3/package.nix                    | 1 +
 pkgs/by-name/gd/gdtoolkit_4/package.nix                    | 1 +
 pkgs/by-name/ir/irrd/package.nix                           | 2 +-
 pkgs/by-name/mu/music-assistant/package.nix                | 1 +
 pkgs/by-name/na/nanopb/package.nix                         | 2 +-
 pkgs/by-name/od/odoo/package.nix                           | 1 +
 pkgs/by-name/od/odoo15/package.nix                         | 1 +
 pkgs/by-name/od/odoo16/package.nix                         | 1 +
 pkgs/by-name/pa/pacu/package.nix                           | 1 +
 pkgs/by-name/pa/parsedmarc/package.nix                     | 1 +
 pkgs/by-name/pr/pretalx/package.nix                        | 1 +
 pkgs/by-name/pr/pretix/package.nix                         | 1 +
 pkgs/by-name/ro/rockcraft/package.nix                      | 1 +
 pkgs/by-name/sn/snapcraft/package.nix                      | 1 +
 pkgs/by-name/yt/yt-dlg/package.nix                         | 7 +++++--
 .../tools/continuous-integration/buildbot/default.nix      | 1 +
 pkgs/development/tools/dt-schema/default.nix               | 2 +-
 pkgs/servers/apache-airflow/default.nix                    | 1 +
 pkgs/servers/baserow/default.nix                           | 1 +
 pkgs/servers/etebase/default.nix                           | 1 +
 pkgs/servers/geospatial/fit-trackee/default.nix            | 1 +
 pkgs/servers/home-assistant/default.nix                    | 1 +
 pkgs/servers/mail/mailman/python.nix                       | 5 +++--
 pkgs/servers/mautrix-telegram/default.nix                  | 1 +
 pkgs/servers/samba/4.x.nix                                 | 1 +
 pkgs/servers/web-apps/healthchecks/default.nix             | 1 +
 pkgs/tools/admin/gimme-aws-creds/default.nix               | 1 +
 pkgs/tools/admin/gixy/default.nix                          | 1 +
 pkgs/tools/admin/oci-cli/default.nix                       | 1 +
 pkgs/tools/audio/piper/train.nix                           | 5 +----
 pkgs/tools/audio/tts/default.nix                           | 1 +
 pkgs/tools/filesystems/ceph/default.nix                    | 1 +
 pkgs/tools/misc/diffoscope/default.nix                     | 1 +
 pkgs/tools/misc/esphome/default.nix                        | 1 +
 pkgs/tools/misc/lektor/default.nix                         | 1 +
 pkgs/tools/misc/ntfy/default.nix                           | 1 +
 pkgs/tools/misc/tvnamer/default.nix                        | 1 +
 pkgs/tools/networking/maubot/default.nix                   | 1 +
 pkgs/tools/networking/p2p/tahoe-lafs/default.nix           | 1 +
 pkgs/tools/nix/nixos-render-docs/default.nix               | 1 +
 pkgs/tools/package-management/poetry/default.nix           | 1 +
 pkgs/tools/security/expliot/default.nix                    | 1 +
 pkgs/tools/security/ioccheck/default.nix                   | 1 +
 pkgs/tools/security/netexec/default.nix                    | 1 +
 pkgs/tools/security/ssh-mitm/default.nix                   | 1 +
 pkgs/tools/text/mrkd/default.nix                           | 1 +
 67 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 95ea7ffdfee3..5e55f8c75e3e 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -49,6 +49,7 @@
 
 let
   py = python311.override {
+    self = py;
     packageOverrides = self: super: {
       pyqt5 = super.pyqt5.override {
         withLocation = true;
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 585d664ab795..4ac26a0c804b 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -49,6 +49,7 @@
 
 let
   py = python311.override {
+    self = py;
     packageOverrides = self: super: {
       pyqt5 = super.pyqt5.override {
         withLocation = true;
diff --git a/pkgs/applications/graphics/textual-paint/default.nix b/pkgs/applications/graphics/textual-paint/default.nix
index c11a5cd632d7..c59ac7b8140e 100644
--- a/pkgs/applications/graphics/textual-paint/default.nix
+++ b/pkgs/applications/graphics/textual-paint/default.nix
@@ -7,6 +7,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = _: super: {
       pillow = super.pillow.overridePythonAttrs rec {
         version = "9.5.0";
diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix
index 996c11292ab1..4344c6e7e91d 100644
--- a/pkgs/applications/misc/archivebox/default.nix
+++ b/pkgs/applications/misc/archivebox/default.nix
@@ -15,6 +15,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       django = super.django_3.overridePythonAttrs (old: rec {
         version = "3.1.14";
diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix
index 0bb9a89325e5..902bc903bf46 100644
--- a/pkgs/applications/misc/archivy/default.nix
+++ b/pkgs/applications/misc/archivy/default.nix
@@ -5,6 +5,7 @@
 
 let
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
       wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec {
         version = "2.3.1";
diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix
index 21f9e52ff84d..294bc33a0ba7 100644
--- a/pkgs/applications/misc/dbx/default.nix
+++ b/pkgs/applications/misc/dbx/default.nix
@@ -5,7 +5,7 @@
   python3,
 }:
 let
-  python = python3.override { packageOverrides = self: super: { pydantic = super.pydantic_1; }; };
+  python = python3.override { self = python; packageOverrides = self: super: { pydantic = super.pydantic_1; }; };
 in
 python.pkgs.buildPythonApplication rec {
   pname = "dbx";
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index d5ea27c9d50b..8eedf7bc47b5 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -3,9 +3,8 @@
 
 let
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
-      self = py;
-
       # not compatible with prompt_toolkit >=2.0
       prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
         name = "${oldAttrs.pname}-${version}";
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index 296a81e075da..a1c28898311b 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -18,6 +18,7 @@
 
 let
   python = python310.override {
+    self = python;
     packageOverrides = (self: super: {
       matplotlib = super.matplotlib.override {
         enableGtk3 = true;
diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix
index 7114cbb3cf76..489c1fefc7e7 100644
--- a/pkgs/applications/misc/tandoor-recipes/default.nix
+++ b/pkgs/applications/misc/tandoor-recipes/default.nix
@@ -6,6 +6,7 @@
 let
   # python-ldap-3.4.4 does not work with python3(12)
   python = python311.override {
+    self = python;
     packageOverrides = self: super: {
       validators = super.validators.overridePythonAttrs (_: rec {
         version = "0.20.0";
diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix
index 75902de1b9f6..5cbd49e2f562 100644
--- a/pkgs/applications/networking/cluster/nixops/default.nix
+++ b/pkgs/applications/networking/cluster/nixops/default.nix
@@ -12,6 +12,7 @@ let
   nixopsContextBase = this: {
 
     python = python3.override {
+      self = this.python;
       packageOverrides = self: super: {
         nixops = self.callPackage ./unwrapped.nix { };
       } // (this.plugins self super);
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
index d6d403322c05..0df36afc3fdf 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -7,6 +7,7 @@
 
 let
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
 
       # Support for later tweepy releases is missing
diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
index 092cb3299990..7c741216df11 100644
--- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
@@ -7,6 +7,7 @@
 
 let
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
 
       # Requires "urwid~=2.1.2", otherwise some tests are failing
diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix
index 20cdf386257e..604ba4772710 100644
--- a/pkgs/applications/networking/seahub/default.nix
+++ b/pkgs/applications/networking/seahub/default.nix
@@ -7,6 +7,7 @@
 }:
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       django = super.django_3;
     };
diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix
index 0107627a72d1..1a2c11cf2023 100644
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@@ -37,6 +37,7 @@ let
   # https://github.com/NixOS/nixpkgs/issues/298719
   # https://github.com/paperless-ngx/paperless-ngx/issues/5494
   python = python3.override {
+    self = python;
     packageOverrides = final: prev: {
       # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective
       ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; };
diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix
index 050651556a72..147257dc3d5d 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -13,6 +13,7 @@
 # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       srht = self.callPackage ./core.nix { };
 
diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix
index d8aa3e44b2c3..f6bdde3577be 100644
--- a/pkgs/applications/video/catt/default.nix
+++ b/pkgs/applications/video/catt/default.nix
@@ -6,6 +6,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       pychromecast = super.pychromecast.overridePythonAttrs (_: rec {
         version = "13.1.0";
diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix
index 060046f59f03..311e585b2d47 100644
--- a/pkgs/applications/video/frigate/default.nix
+++ b/pkgs/applications/video/frigate/default.nix
@@ -24,6 +24,7 @@ let
   };
 
   python = python311.override {
+    self = python;
     packageOverrides = self: super: {
       pydantic = super.pydantic_1;
 
diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix
index 5ca1e59d107b..52463c468931 100644
--- a/pkgs/applications/video/pyca/default.nix
+++ b/pkgs/applications/video/pyca/default.nix
@@ -8,6 +8,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       # pyCA is incompatible with SQLAlchemy 2.0
       sqlalchemy = super.sqlalchemy_1_4;
@@ -80,4 +81,3 @@ python3.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [ pmiddend ];
   };
 }
-
diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix
index 48a7a6670169..fc15dc4aba24 100644
--- a/pkgs/by-name/az/azure-cli/python-packages.nix
+++ b/pkgs/by-name/az/azure-cli/python-packages.nix
@@ -23,6 +23,7 @@ let
     });
 
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
       inherit buildAzureCliPackage;
 
diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix
index 75da25427c3b..397b9e76cfc4 100644
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -7,6 +7,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       sqlalchemy = super.sqlalchemy_1_4;
     };
diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix
index fc5ef145d1bc..1f792167d740 100644
--- a/pkgs/by-name/ch/charmcraft/package.nix
+++ b/pkgs/by-name/ch/charmcraft/package.nix
@@ -8,6 +8,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
         version = "0.11.2";
diff --git a/pkgs/by-name/gd/gdtoolkit_3/package.nix b/pkgs/by-name/gd/gdtoolkit_3/package.nix
index 6b6abbfc4026..01b6a15e0e10 100644
--- a/pkgs/by-name/gd/gdtoolkit_3/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_3/package.nix
@@ -5,6 +5,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       lark = super.lark.overridePythonAttrs (old: rec {
         # gdtoolkit needs exactly this lark version
diff --git a/pkgs/by-name/gd/gdtoolkit_4/package.nix b/pkgs/by-name/gd/gdtoolkit_4/package.nix
index 6f4a25602ee2..0f54bd3385ed 100644
--- a/pkgs/by-name/gd/gdtoolkit_4/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_4/package.nix
@@ -5,6 +5,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       lark = super.lark.overridePythonAttrs (old: rec {
         # gdtoolkit needs exactly this lark version
diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix
index b6d323129abd..581576f68fb3 100644
--- a/pkgs/by-name/ir/irrd/package.nix
+++ b/pkgs/by-name/ir/irrd/package.nix
@@ -11,6 +11,7 @@
 
 let
   py = python3.override {
+    self = py;
     packageOverrides = final: prev: {
       # sqlalchemy 1.4.x or 2.x are not supported
       sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
@@ -174,4 +175,3 @@ py.pkgs.buildPythonPackage rec {
     maintainers = teams.wdz.members;
   };
 }
-
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index ba7d00824652..fcdd7277b758 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -9,6 +9,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       music-assistant-frontend = self.callPackage ./frontend.nix { };
     };
diff --git a/pkgs/by-name/na/nanopb/package.nix b/pkgs/by-name/na/nanopb/package.nix
index bd14e9d8c75b..bfd72b7214f6 100644
--- a/pkgs/by-name/na/nanopb/package.nix
+++ b/pkgs/by-name/na/nanopb/package.nix
@@ -26,6 +26,7 @@ let
     inherit (self.passthru) generator-out;
   };
   python3 = buildPackages.python3.override {
+    self = python3;
     packageOverrides = _: _: {
       nanopb-proto = self.passthru.python-module;
     };
@@ -119,4 +120,3 @@ in
     '';
   };
 })
-
diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix
index fe3a7aed3681..fd3768bcd742 100644
--- a/pkgs/by-name/od/odoo/package.nix
+++ b/pkgs/by-name/od/odoo/package.nix
@@ -11,6 +11,7 @@
 
 let
   python = python310.override {
+    self = python;
     packageOverrides = final: prev: {
       # requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions
       docutils-0_17 = prev.docutils.overridePythonAttrs (old: rec {
diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix
index ae39beb4a6d9..0ea859435e9e 100644
--- a/pkgs/by-name/od/odoo15/package.nix
+++ b/pkgs/by-name/od/odoo15/package.nix
@@ -3,6 +3,7 @@
 
 let
   python = python310.override {
+    self = python;
     packageOverrides = self: super: {
       pypdf2 = super.pypdf2.overridePythonAttrs (old: rec {
         version = "1.28.6";
diff --git a/pkgs/by-name/od/odoo16/package.nix b/pkgs/by-name/od/odoo16/package.nix
index 0dba5841035d..91e634a13b22 100644
--- a/pkgs/by-name/od/odoo16/package.nix
+++ b/pkgs/by-name/od/odoo16/package.nix
@@ -8,6 +8,7 @@
 
 let
   python = python310.override {
+    self = python;
     packageOverrides = self: super: {
       flask = super.flask.overridePythonAttrs (old: rec {
         version = "2.3.3";
diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix
index 5c87d124ee96..0ee1f4f1c8cc 100644
--- a/pkgs/by-name/pa/pacu/package.nix
+++ b/pkgs/by-name/pa/pacu/package.nix
@@ -7,6 +7,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: { sqlalchemy = super.sqlalchemy_1_4; };
   };
 in
diff --git a/pkgs/by-name/pa/parsedmarc/package.nix b/pkgs/by-name/pa/parsedmarc/package.nix
index 6c08dced6326..acc8cee9782b 100644
--- a/pkgs/by-name/pa/parsedmarc/package.nix
+++ b/pkgs/by-name/pa/parsedmarc/package.nix
@@ -4,6 +4,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       # https://github.com/domainaware/parsedmarc/issues/464
       msgraph-core = super.msgraph-core.overridePythonAttrs (old: rec {
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index 6313a6748b8d..e3838cdb7d8f 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -10,6 +10,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = final: prev: {
       django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec {
         version = "3.0.0";
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 40a51c1458d1..2b7e8676d180 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -11,6 +11,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       django = super.django_4;
 
diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix
index 48b95df85b52..7b581363ee68 100644
--- a/pkgs/by-name/ro/rockcraft/package.nix
+++ b/pkgs/by-name/ro/rockcraft/package.nix
@@ -8,6 +8,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       craft-application = super.craft-application.overridePythonAttrs (old: rec {
         version = "1.2.1";
diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index 1af08c97fd1a..7e5164eb529d 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -12,6 +12,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
         version = "0.11.2";
diff --git a/pkgs/by-name/yt/yt-dlg/package.nix b/pkgs/by-name/yt/yt-dlg/package.nix
index 8cc4d65b2a91..ee5f288b5ab1 100644
--- a/pkgs/by-name/yt/yt-dlg/package.nix
+++ b/pkgs/by-name/yt/yt-dlg/package.nix
@@ -5,7 +5,7 @@
   fetchPypi
 }:
 let
-  python3Packages =
+  python3' =
     (python3.override {
       packageOverrides = final: prev: {
         wxpython = prev.wxpython.overrideAttrs rec {
@@ -17,7 +17,10 @@ let
           };
         };
       };
-    }).pkgs;
+    });
+
+  python3Packages = python3'.pkgs;
+
 in
 python3Packages.buildPythonApplication rec {
   pname = "yt-dlg";
diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix
index b2ec827f7526..daffa9165162 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix
@@ -6,6 +6,7 @@
 # Take packages from self first, then python.pkgs (and secondarily pkgs)
 lib.makeScope (self: newScope (self.python.pkgs // self)) (self: {
   python = python3.override {
+    self = self.python;
     packageOverrides = self: super: {
       sqlalchemy = super.sqlalchemy_1_4;
       moto = super.moto.overridePythonAttrs (oldAttrs: {
diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix
index 5736d301b32d..c1a16d729bb6 100644
--- a/pkgs/development/tools/dt-schema/default.nix
+++ b/pkgs/development/tools/dt-schema/default.nix
@@ -3,6 +3,7 @@
 }:
 
 let python = python3.override {
+  self = python;
   packageOverrides = self: super: {
     # see https://github.com/devicetree-org/dt-schema/issues/108
     jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
@@ -27,4 +28,3 @@ let python = python3.override {
     });
   };
 }; in python.pkgs.toPythonApplication python.pkgs.dtschema
-
diff --git a/pkgs/servers/apache-airflow/default.nix b/pkgs/servers/apache-airflow/default.nix
index 1055f79806d4..48df7ea612b4 100644
--- a/pkgs/servers/apache-airflow/default.nix
+++ b/pkgs/servers/apache-airflow/default.nix
@@ -5,6 +5,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = pySelf: pySuper: {
       connexion = pySuper.connexion.overridePythonAttrs (o: rec {
         version = "2.14.2";
diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix
index bfc905175084..c42dc0d55a31 100644
--- a/pkgs/servers/baserow/default.nix
+++ b/pkgs/servers/baserow/default.nix
@@ -8,6 +8,7 @@
 let
 
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       antlr4-python3-runtime = super.antlr4-python3-runtime.override {
         antlr4 = antlr4_9;
diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix
index 6076bb161fa3..2d22f510b387 100644
--- a/pkgs/servers/etebase/default.nix
+++ b/pkgs/servers/etebase/default.nix
@@ -9,6 +9,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       pydantic = super.pydantic_1;
     };
diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/servers/geospatial/fit-trackee/default.nix
index 587fb24c2087..f6c4da43a8e3 100644
--- a/pkgs/servers/geospatial/fit-trackee/default.nix
+++ b/pkgs/servers/geospatial/fit-trackee/default.nix
@@ -7,6 +7,7 @@
 }:
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       sqlalchemy = super.sqlalchemy_1_4;
 
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index a57f0d32c4a6..58c20cd01fc2 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -451,6 +451,7 @@ let
   ];
 
   python = python312.override {
+    self = python;
     packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]);
   };
 
diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix
index 933b8357a33d..9eddfea2e51c 100644
--- a/pkgs/servers/mail/mailman/python.nix
+++ b/pkgs/servers/mail/mailman/python.nix
@@ -1,6 +1,7 @@
 { python3, fetchPypi, lib, overlay ? (_: _: {}) }:
 
-python3.override {
+lib.fix (self: python3.override {
+  inherit self;
   packageOverrides = lib.composeExtensions
     (self: super: {
       /*
@@ -35,4 +36,4 @@ python3.override {
     })
 
     overlay;
-}
+})
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 81997920b756..4e9d00a9534b 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -7,6 +7,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
         version = "1.37.0a1";
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 8723033346b0..a45b1bd488d2 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -55,6 +55,7 @@ with lib;
 let
   # samba-tool requires libxcrypt-legacy algorithms
   python = python3Packages.python.override {
+    self = python;
     libxcrypt = libxcrypt-legacy;
   };
   wrapPython = python3Packages.wrapPython.override {
diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix
index ee7d2122917d..5436555cd28a 100644
--- a/pkgs/servers/web-apps/healthchecks/default.nix
+++ b/pkgs/servers/web-apps/healthchecks/default.nix
@@ -6,6 +6,7 @@
 }:
 let
   py = python3.override {
+    self = py;
     packageOverrides = final: prev: {
       django = prev.django_5;
     };
diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix
index ab43e9971d8e..49a7f60e3342 100644
--- a/pkgs/tools/admin/gimme-aws-creds/default.nix
+++ b/pkgs/tools/admin/gimme-aws-creds/default.nix
@@ -10,6 +10,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       fido2 = super.fido2.overridePythonAttrs (oldAttrs: rec {
         version = "0.9.3";
diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix
index 157430dcecda..5d1bfb65d4c2 100644
--- a/pkgs/tools/admin/gixy/default.nix
+++ b/pkgs/tools/admin/gixy/default.nix
@@ -8,6 +8,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       pyparsing = super.pyparsing.overridePythonAttrs rec {
         version = "2.4.7";
diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix
index a84c62ca6330..b51d4d50b4a8 100644
--- a/pkgs/tools/admin/oci-cli/default.nix
+++ b/pkgs/tools/admin/oci-cli/default.nix
@@ -7,6 +7,7 @@
 
 let
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
 
       click = super.click.overridePythonAttrs (oldAttrs: rec {
diff --git a/pkgs/tools/audio/piper/train.nix b/pkgs/tools/audio/piper/train.nix
index 2cab1ba4ba04..476138e78837 100644
--- a/pkgs/tools/audio/piper/train.nix
+++ b/pkgs/tools/audio/piper/train.nix
@@ -3,10 +3,7 @@
 }:
 
 let
-  python = python3.override {
-    packageOverrides = self: super: {
-    };
-  };
+  python = python3;
 in
 
 python.pkgs.buildPythonPackage {
diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix
index 1d459e70c2e7..67552e99e7bf 100644
--- a/pkgs/tools/audio/tts/default.nix
+++ b/pkgs/tools/audio/tts/default.nix
@@ -7,6 +7,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       torch = super.torch-bin;
       torchvision = super.torchvision-bin;
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index e116304f07b4..5e3af349fc5a 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -169,6 +169,7 @@ let
 
   # Watch out for python <> boost compatibility
   python = python311.override {
+    self = python;
     packageOverrides = self: super: let
       cryptographyOverrideVersion = "40.0.1";
       bcryptOverrideVersion = "4.0.1";
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index a61e7329ebb1..363d32634b75 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -78,6 +78,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = final: prev: {
       # version 4 or newer would log the followng error but tests currently don't fail because radare2 is disabled
       # ValueError: argument TNULL is not a TLSH hex string
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index e495fe13650d..57f29a9d103d 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -12,6 +12,7 @@
 
 let
   python = python3Packages.python.override {
+    self = python;
     packageOverrides = self: super: {
       esphome-dashboard = self.callPackage ./dashboard.nix { };
     };
diff --git a/pkgs/tools/misc/lektor/default.nix b/pkgs/tools/misc/lektor/default.nix
index 84c4042912bd..09942bac6ca8 100644
--- a/pkgs/tools/misc/lektor/default.nix
+++ b/pkgs/tools/misc/lektor/default.nix
@@ -9,6 +9,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       mistune = super.mistune.overridePythonAttrs (old: rec {
         version = "2.0.5";
diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix
index 348c1e315253..54e232eafd9c 100644
--- a/pkgs/tools/misc/ntfy/default.nix
+++ b/pkgs/tools/misc/ntfy/default.nix
@@ -13,6 +13,7 @@
 
 let
   python = python39.override {
+    self = python;
     packageOverrides = self: super: {
       ntfy-webpush = self.callPackage ./webpush.nix { };
 
diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/tools/misc/tvnamer/default.nix
index d1ddb319dc19..5015a5e40b56 100644
--- a/pkgs/tools/misc/tvnamer/default.nix
+++ b/pkgs/tools/misc/tvnamer/default.nix
@@ -5,6 +5,7 @@
 
 let
   python' = python3.override {
+    self = python';
     packageOverrides = final: prev: rec {
       # tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6
       requests-cache = prev.requests-cache.overridePythonAttrs (oldAttrs: rec {
diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/tools/networking/maubot/default.nix
index 6ea75522701a..b66940d92390 100644
--- a/pkgs/tools/networking/maubot/default.nix
+++ b/pkgs/tools/networking/maubot/default.nix
@@ -9,6 +9,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = final: prev: {
       # aiosqlite>=0.16,<0.19
       aiosqlite = prev.aiosqlite.overridePythonAttrs (old: rec {
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index e9de0da071c6..10d21934b2c0 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -10,6 +10,7 @@ let
   # uses eliot in a way incompatible after version 1.14.0.
   # These versions should be unpinned, when updating Tahoe-LAFS to a more recent version.
   python = python311.override {
+    self = python;
     packageOverrides = self: super: {
       eliot = super.eliot.overridePythonAttrs (oldAttrs: rec {
         version = "1.14.0";
diff --git a/pkgs/tools/nix/nixos-render-docs/default.nix b/pkgs/tools/nix/nixos-render-docs/default.nix
index 94d2e9b51bde..956e0fcfc6e0 100644
--- a/pkgs/tools/nix/nixos-render-docs/default.nix
+++ b/pkgs/tools/nix/nixos-render-docs/default.nix
@@ -5,6 +5,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = final: prev: {
       markdown-it-py = prev.markdown-it-py.overridePythonAttrs (_: {
         doCheck = false;
diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix
index 415a2c0274d3..3317e785d0b8 100644
--- a/pkgs/tools/package-management/poetry/default.nix
+++ b/pkgs/tools/package-management/poetry/default.nix
@@ -22,6 +22,7 @@ let
       });
     } // (plugins self);
   python = python3.override (old: {
+    self = python;
     packageOverrides = lib.composeManyExtensions
       ((if old ? packageOverrides then [ old.packageOverrides ] else [ ]) ++ [ newPackageOverrides ]);
   });
diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix
index 9a23087aa10d..028cacb6a0ba 100644
--- a/pkgs/tools/security/expliot/default.nix
+++ b/pkgs/tools/security/expliot/default.nix
@@ -4,6 +4,7 @@
 }:
 let
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
 
       cmd2 = super.cmd2.overridePythonAttrs (oldAttrs: rec {
diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix
index 2637fea90528..2f054c6dc6a6 100644
--- a/pkgs/tools/security/ioccheck/default.nix
+++ b/pkgs/tools/security/ioccheck/default.nix
@@ -5,6 +5,7 @@
 
 let
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
       emoji = super.emoji.overridePythonAttrs rec {
         version = "1.7.0";
diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix
index 3ac0eebda954..33447f98516e 100644
--- a/pkgs/tools/security/netexec/default.nix
+++ b/pkgs/tools/security/netexec/default.nix
@@ -5,6 +5,7 @@
 }:
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       impacket = super.impacket.overridePythonAttrs {
         version = "0.12.0.dev1-unstable-2023-11-30";
diff --git a/pkgs/tools/security/ssh-mitm/default.nix b/pkgs/tools/security/ssh-mitm/default.nix
index 745090c8e9a1..6694a9edaae2 100644
--- a/pkgs/tools/security/ssh-mitm/default.nix
+++ b/pkgs/tools/security/ssh-mitm/default.nix
@@ -9,6 +9,7 @@
 
 let
   py = python3.override {
+    self = py;
     packageOverrides = self: super: {
       paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec {
         version = "3.3.1";
diff --git a/pkgs/tools/text/mrkd/default.nix b/pkgs/tools/text/mrkd/default.nix
index b43b6cfdf6ab..1c223861b486 100644
--- a/pkgs/tools/text/mrkd/default.nix
+++ b/pkgs/tools/text/mrkd/default.nix
@@ -5,6 +5,7 @@
 
 let
   python = python3.override {
+    self = python;
     packageOverrides = self: super: {
       # https://github.com/refi64/mrkd/pull/6
       mistune = super.mistune.overridePythonAttrs (old: rec {

From 9a47dadc72d6906334dbc82cdd2b9e0738c4af35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2024 03:10:27 +0000
Subject: [PATCH 16/17] wit-bindgen: 0.28.0 -> 0.29.0

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

diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index df04aee00ea0..c324d192ccac 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wit-bindgen";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wit-bindgen";
     rev = "v${version}";
-    hash = "sha256-WE+a0y97aPWEUHZT/LRjZ/WRZP7QxF4DXVjJVRjuJFU=";
+    hash = "sha256-mn51ussusBZGfgAj1JP1hjNsblXXGAt7W6D10yKTuZ8=";
   };
 
-  cargoHash = "sha256-Z6dBlYT4aYh92LZGH/+NAkkf80KZtId1emVaeOfpEjM=";
+  cargoHash = "sha256-JSsneDsbqs4DT0oMvucPVg/Jpf10xk3TWi0pDS1oOzQ=";
 
   # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
   # However, GitHub Actions ensures a proper build.

From 90d02f008685aa188baab45b75d9d722a5a26e73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2024 01:22:43 +0000
Subject: [PATCH 17/17] cloc: 2.00 -> 2.02

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

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 124e3869b721..39215caa63a5 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
 
-let version = "2.00";
+let version = "2.02";
 in stdenv.mkDerivation {
   pname = "cloc";
   inherit version;
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
     owner = "AlDanial";
     repo = "cloc";
     rev = "v${version}";
-    sha256 = "sha256-GZvrsVuPLg09yOlDmdHNZ0QLXoftgSYMFkn6PLf1/Pw=";
+    sha256 = "sha256-qTrBCCC2J8Ewt6GvYlnXU8F1iB31A1xTFXdkee8L0Os=";
   };
 
   setSourceRoot = ''