From 730527ca7a9f0ae586325663497b014f1dd21a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 12 Jul 2024 13:35:16 -0400
Subject: [PATCH] treewide: remove use of python3(Packages) in python package
 set

---
 .../python-modules/ansible-builder/default.nix      | 13 +++++++++----
 pkgs/development/python-modules/bindep/default.nix  | 13 +++++++++----
 .../python-modules/chainstream/default.nix          |  7 ++++---
 pkgs/development/python-modules/cli-ui/default.nix  |  4 ++--
 .../development/python-modules/controku/default.nix |  4 ++--
 .../development/python-modules/dbt-core/default.nix |  4 ++--
 pkgs/development/python-modules/dnf4/wrapper.nix    |  7 ++++---
 pkgs/development/python-modules/exiv2/default.nix   | 11 +++++++----
 .../invisible-watermark/tests/cli.nix               |  4 ++--
 .../invisible-watermark/tests/python/default.nix    | 12 +++++-------
 pkgs/development/python-modules/manuf/default.nix   |  4 ++--
 pkgs/development/python-modules/mlx/default.nix     |  5 +++--
 .../python-modules/onigurumacffi/default.nix        |  8 +++++---
 .../development/python-modules/orgparse/default.nix |  7 ++++---
 14 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix
index f5a67d28eddb..064de3b127ad 100644
--- a/pkgs/development/python-modules/ansible-builder/default.nix
+++ b/pkgs/development/python-modules/ansible-builder/default.nix
@@ -1,11 +1,16 @@
 {
   lib,
-  python3Packages,
+  setuptools,
+  setuptools-scm,
+  jsonschema,
+  requirements-parser,
+  pyyaml,
   podman,
   fetchPypi,
   bindep,
+  buildPythonPackage,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "ansible-builder";
   version = "3.0.1";
   format = "pyproject";
@@ -15,14 +20,14 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-rxyhgj9Cad751tPAptCTLCtXQLUXaRYv39bkoFzzjOk=";
   };
 
-  nativeBuildInputs = with python3Packages; [
+  nativeBuildInputs = [
     setuptools
     setuptools-scm
   ];
 
   buildInputs = [ bindep ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     podman
     jsonschema
     requirements-parser
diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix
index 8acd7ecf7cf0..8153354843a4 100644
--- a/pkgs/development/python-modules/bindep/default.nix
+++ b/pkgs/development/python-modules/bindep/default.nix
@@ -1,9 +1,14 @@
 {
   lib,
-  python3Packages,
   fetchPypi,
+  buildPythonPackage,
+  distro,
+  pbr,
+  setuptools,
+  packaging,
+  parsley,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "bindep";
   version = "2.11.0";
   format = "pyproject";
@@ -13,13 +18,13 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8=";
   };
 
-  buildInputs = with python3Packages; [
+  buildInputs = [
     distro
     pbr
     setuptools
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     parsley
     pbr
     packaging
diff --git a/pkgs/development/python-modules/chainstream/default.nix b/pkgs/development/python-modules/chainstream/default.nix
index d5ee7775ac82..8d247e234d2d 100644
--- a/pkgs/development/python-modules/chainstream/default.nix
+++ b/pkgs/development/python-modules/chainstream/default.nix
@@ -1,16 +1,17 @@
 {
   lib,
   fetchPypi,
-  python3Packages,
+  buildPythonPackage,
+  setuptools,
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "chainstream";
   version = "1.0.1";
 
   pyproject = true;
 
-  nativeBuildInputs = [ python3Packages.setuptools ];
+  nativeBuildInputs = [ setuptools ];
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix
index ecd30ce3fc07..3b93c3eb7be8 100644
--- a/pkgs/development/python-modules/cli-ui/default.nix
+++ b/pkgs/development/python-modules/cli-ui/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python3Packages,
   fetchPypi,
   pytestCheckHook,
   pythonOlder,
@@ -8,8 +7,9 @@
   colorama,
   tabulate,
   unidecode,
+  buildPythonPackage,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "cli-ui";
   version = "0.17.2";
   pyproject = true;
diff --git a/pkgs/development/python-modules/controku/default.nix b/pkgs/development/python-modules/controku/default.nix
index e41e38b8ccd4..9aff50bfc087 100644
--- a/pkgs/development/python-modules/controku/default.nix
+++ b/pkgs/development/python-modules/controku/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python3Packages,
   fetchFromGitHub,
   setuptools,
   requests,
@@ -10,10 +9,11 @@
   gobject-introspection,
   gtk3,
   wrapGAppsHook3,
+  buildPythonPackage,
   buildApplication ? false,
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "controku";
   version = "1.1.0";
   format = "pyproject";
diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index 20d45f74723c..1f06cf0faf12 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -17,7 +17,7 @@
   packaging,
   pathspec,
   protobuf,
-  python,
+  callPackage,
   pythonOlder,
   pytz,
   pyyaml,
@@ -85,7 +85,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   passthru = {
-    withAdapters = python.pkgs.callPackage ./with-adapters.nix { };
+    withAdapters = callPackage ./with-adapters.nix { };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/dnf4/wrapper.nix b/pkgs/development/python-modules/dnf4/wrapper.nix
index b84584f52fad..c8cd1c1c261d 100644
--- a/pkgs/development/python-modules/dnf4/wrapper.nix
+++ b/pkgs/development/python-modules/dnf4/wrapper.nix
@@ -1,15 +1,16 @@
 {
   lib,
   wrapPython,
-  python3,
+  python,
   stdenv,
+  dnf4,
   dnf-plugins-core,
   plugins ? [ dnf-plugins-core ],
 }:
 let
-  pluginPaths = map (p: "${p}/${python3.sitePackages}/dnf-plugins") plugins;
+  pluginPaths = map (p: "${p}/${python.sitePackages}/dnf-plugins") plugins;
 
-  dnf4-unwrapped = python3.pkgs.dnf4;
+  dnf4-unwrapped = dnf4;
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/python-modules/exiv2/default.nix b/pkgs/development/python-modules/exiv2/default.nix
index d533e4f58c6f..c1c9715f5a3f 100644
--- a/pkgs/development/python-modules/exiv2/default.nix
+++ b/pkgs/development/python-modules/exiv2/default.nix
@@ -3,11 +3,14 @@
   pkg-config,
   exiv2,
   gettext,
-  python3Packages,
   fetchFromGitHub,
   gitUpdater,
+  buildPythonPackage,
+  setuptools,
+  toml,
+  unittestCheckHook,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "exiv2";
   version = "0.17.0";
   pyproject = true;
@@ -30,7 +33,7 @@ python3Packages.buildPythonPackage rec {
         def test_localisation(self):"
   '';
 
-  build-system = with python3Packages; [
+  build-system = [
     setuptools
     toml
   ];
@@ -42,7 +45,7 @@ python3Packages.buildPythonPackage rec {
   ];
 
   pythonImportsCheck = [ "exiv2" ];
-  nativeCheckInputs = with python3Packages; [ unittestCheckHook ];
+  nativeCheckInputs = [ unittestCheckHook ];
   unittestFlagsArray = [
     "-s"
     "tests"
diff --git a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix
index 89de1174384a..a1563d67c716 100644
--- a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix
+++ b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix
@@ -1,7 +1,7 @@
 {
   image,
   method,
-  python3Packages,
+  invisible-watermark,
   runCommand,
   testName,
   withOnnx,
@@ -25,7 +25,7 @@ let
     else
       "fnörd1";
   length = (builtins.stringLength message) * 8;
-  invisible-watermark' = python3Packages.invisible-watermark.override { inherit withOnnx; };
+  invisible-watermark' = invisible-watermark.override { inherit withOnnx; };
   expected-exit-code = if method == "rivaGan" && !withOnnx then "1" else "0";
 in
 runCommand "invisible-watermark-test-${testName}" { nativeBuildInputs = [ invisible-watermark' ]; }
diff --git a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix
index e713f9bfe20c..617dd0bb13cb 100644
--- a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix
+++ b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix
@@ -2,7 +2,7 @@
   image,
   invisible-watermark,
   opencv4,
-  python3,
+  python,
   runCommand,
   stdenvNoCC,
 }:
@@ -13,12 +13,10 @@ let
   message = "fnörd1";
   method = "dwtDct";
 
-  pythonWithPackages = python3.withPackages (
-    pp: with pp; [
-      invisible-watermark
-      opencv4
-    ]
-  );
+  pythonWithPackages = python.withPackages (_: [
+    invisible-watermark
+    opencv4
+  ]);
   pythonInterpreter = pythonWithPackages.interpreter;
 
   encode = stdenvNoCC.mkDerivation {
diff --git a/pkgs/development/python-modules/manuf/default.nix b/pkgs/development/python-modules/manuf/default.nix
index 20961a139682..2210f4a40fae 100644
--- a/pkgs/development/python-modules/manuf/default.nix
+++ b/pkgs/development/python-modules/manuf/default.nix
@@ -3,9 +3,9 @@
   buildPythonPackage,
   fetchFromGitHub,
   runCommand,
-  python3,
   wireshark-cli,
   pytestCheckHook,
+  manuf, # remove when buildPythonPackage supports finalAttrs
 }:
 
 buildPythonPackage rec {
@@ -42,7 +42,7 @@ buildPythonPackage rec {
 
   passthru.tests = {
     testMacAddress = runCommand "${pname}-test" { } ''
-      ${python3.pkgs.manuf}/bin/manuf BC:EE:7B:00:00:00 > $out
+      ${lib.getExe manuf} BC:EE:7B:00:00:00 > $out
       [ "$(cat $out | tr -d '\n')" = "Vendor(manuf='ASUSTekC', manuf_long='ASUSTek COMPUTER INC.', comment=None)" ]
     '';
   };
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index 2084b8c19f75..614aed274ba0 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -2,13 +2,13 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  python3Packages,
   pybind11,
   cmake,
   xcbuild,
   zsh,
   blas,
   lapack,
+  setuptools,
 }:
 
 let
@@ -69,7 +69,8 @@ buildPythonPackage rec {
     zsh
     gguf-tools
     nlohmann_json
-  ] ++ (with python3Packages; [ setuptools ]);
+    setuptools
+  ];
 
   buildInputs = [
     blas
diff --git a/pkgs/development/python-modules/onigurumacffi/default.nix b/pkgs/development/python-modules/onigurumacffi/default.nix
index 09be23993652..2d2faef572fd 100644
--- a/pkgs/development/python-modules/onigurumacffi/default.nix
+++ b/pkgs/development/python-modules/onigurumacffi/default.nix
@@ -1,10 +1,12 @@
 {
   lib,
-  python3Packages,
+  buildPythonPackage,
   fetchPypi,
   oniguruma,
+  setuptools,
+  cffi,
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "onigurumacffi";
   version = "1.3.0";
   format = "pyproject";
@@ -14,7 +16,7 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-d0XNxWCWrOyIofOwhmCiKwnGWe040/WdtsHK12qXa+8=";
   };
 
-  buildInputs = with python3Packages; [
+  buildInputs = [
     oniguruma
     setuptools
     cffi
diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix
index 488a0e6e4d98..0ad3b30aaeba 100644
--- a/pkgs/development/python-modules/orgparse/default.nix
+++ b/pkgs/development/python-modules/orgparse/default.nix
@@ -1,10 +1,11 @@
 {
   lib,
-  python3Packages,
+  setuptools-scm,
   fetchPypi,
+  buildPythonPackage,
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "orgparse";
   version = "0.4.20231004";
 
@@ -13,7 +14,7 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA=";
   };
 
-  nativeBuildInputs = [ python3Packages.setuptools-scm ];
+  nativeBuildInputs = [ setuptools-scm ];
 
   pyproject = true;