From b73a0183a2eda73f549ef9b8af8c4e12c97c0eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:50:55 -0400
Subject: [PATCH 1/6] treewide: remove unused args

---
 pkgs/development/python-modules/laces/default.nix             | 1 -
 pkgs/development/python-modules/lcd-i2c/default.nix           | 1 -
 pkgs/development/python-modules/pytest-image-diff/default.nix | 1 -
 pkgs/development/python-modules/rtp/default.nix               | 1 -
 4 files changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/laces/default.nix b/pkgs/development/python-modules/laces/default.nix
index 16f104a01a69..9f5c74af8329 100644
--- a/pkgs/development/python-modules/laces/default.nix
+++ b/pkgs/development/python-modules/laces/default.nix
@@ -4,7 +4,6 @@
   django,
   fetchFromGitHub,
   flit-core,
-  python3,
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/lcd-i2c/default.nix b/pkgs/development/python-modules/lcd-i2c/default.nix
index 02008f02c2af..27d9716cd128 100644
--- a/pkgs/development/python-modules/lcd-i2c/default.nix
+++ b/pkgs/development/python-modules/lcd-i2c/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python3,
   fetchPypi,
   buildPythonPackage,
   smbus2,
diff --git a/pkgs/development/python-modules/pytest-image-diff/default.nix b/pkgs/development/python-modules/pytest-image-diff/default.nix
index 4a8b94a0c73b..59b32c8f1172 100644
--- a/pkgs/development/python-modules/pytest-image-diff/default.nix
+++ b/pkgs/development/python-modules/pytest-image-diff/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python3,
   buildPythonPackage,
   fetchFromGitHub,
   typing-extensions,
diff --git a/pkgs/development/python-modules/rtp/default.nix b/pkgs/development/python-modules/rtp/default.nix
index dbafa102ea1d..ad27d151776c 100644
--- a/pkgs/development/python-modules/rtp/default.nix
+++ b/pkgs/development/python-modules/rtp/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python3,
 
   # nativeCheckInputs
   hypothesis,

From 50d5bc7b2d7ee10d56f93af4871a789422c1965d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:21:32 -0400
Subject: [PATCH 2/6] treewide: replace python3 with python within python
 package set

---
 pkgs/development/python-modules/dbt-core/default.nix          | 4 ++--
 pkgs/development/python-modules/dbt-core/with-adapters.nix    | 4 ++--
 .../development/python-modules/django-currentuser/default.nix | 4 ++--
 pkgs/development/python-modules/kaldi-active-grammar/fork.nix | 4 ++--
 pkgs/development/python-modules/nuitka/default.nix            | 4 ++--
 pkgs/development/python-modules/pybars3/default.nix           | 4 ++--
 pkgs/development/python-modules/ssg/default.nix               | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index 0d2437e47f0b..638c5ef8a9ff 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,
-  python3,
+  python,
   pythonOlder,
   pytz,
   pyyaml,
@@ -85,7 +85,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   passthru = {
-    withAdapters = python3.pkgs.callPackage ./with-adapters.nix { };
+    withAdapters = python.pkgs.callPackage ./with-adapters.nix { };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/dbt-core/with-adapters.nix b/pkgs/development/python-modules/dbt-core/with-adapters.nix
index 92bd22dd2f9f..b5fe0a527f0e 100644
--- a/pkgs/development/python-modules/dbt-core/with-adapters.nix
+++ b/pkgs/development/python-modules/dbt-core/with-adapters.nix
@@ -1,5 +1,5 @@
 {
-  python3,
+  python,
   dbt-bigquery,
   dbt-core,
   dbt-postgres,
@@ -17,7 +17,7 @@ let
   };
 in
 adapterFun:
-(python3.buildEnv.override {
+(python.buildEnv.override {
   extraLibs = [ dbt-core ] ++ (adapterFun adapters);
   ignoreCollisions = true;
 }).overrideAttrs
diff --git a/pkgs/development/python-modules/django-currentuser/default.nix b/pkgs/development/python-modules/django-currentuser/default.nix
index 7325793966c4..4bbbe4fdb955 100644
--- a/pkgs/development/python-modules/django-currentuser/default.nix
+++ b/pkgs/development/python-modules/django-currentuser/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  python3,
+  python,
   pythonOlder,
   django,
   hatchling,
@@ -38,7 +38,7 @@ buildPythonPackage {
 
   checkPhase = ''
     runHook preCheck
-    ${python3.interpreter} manage.py test testapp
+    ${python.interpreter} manage.py test testapp
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
index a3c9ae63c784..b5c785d2b12b 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
@@ -7,7 +7,7 @@
   icu,
   pkg-config,
   fetchFromGitHub,
-  python3,
+  python,
   openblas,
   zlib,
   gfortran,
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    python3
+    python
     gfortran
   ];
 
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index e4613db87f7f..fa0842267031 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   isPyPy,
   ordered-set,
-  python3,
+  python,
   setuptools,
   zstandard,
   wheel,
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   checkPhase = ''
     runHook preCheck
 
-    ${python3.interpreter} tests/basics/run_all.py search
+    ${python.interpreter} tests/basics/run_all.py search
 
     runHook postCheck
   '';
diff --git a/pkgs/development/python-modules/pybars3/default.nix b/pkgs/development/python-modules/pybars3/default.nix
index 8bd031801137..937de513347e 100644
--- a/pkgs/development/python-modules/pybars3/default.nix
+++ b/pkgs/development/python-modules/pybars3/default.nix
@@ -1,5 +1,5 @@
 {
-  python3,
+  python,
   fetchPypi,
   lib,
   pymeta3,
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
-    ${python3.interpreter} tests.py
+    ${python.interpreter} tests.py
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/ssg/default.nix b/pkgs/development/python-modules/ssg/default.nix
index 53fbbb0f3868..a54b198a4533 100644
--- a/pkgs/development/python-modules/ssg/default.nix
+++ b/pkgs/development/python-modules/ssg/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
 
-  python3,
+  python,
   unittestCheckHook,
   setuptools,
 
@@ -45,7 +45,7 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "ssg" ];
 
-  postInstall = "rm -rf $out/${python3.sitePackages}/scripts";
+  postInstall = "rm -rf $out/${python.sitePackages}/scripts";
 
   meta = with lib; {
     description = "TCRF syllable segmenter for Thai";

From beaea78be5bb9964b4854f54e1d76e53df6dc3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:05:12 -0400
Subject: [PATCH 3/6] python311Packages.llm: fix build

---
 .../python-modules/llm/default.nix            | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 899a95ab3b26..388077b38944 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -5,10 +5,22 @@
   fetchFromGitHub,
   makeWrapper,
   pytestCheckHook,
-  python3,
+  python,
   pythonOlder,
   ruff,
   setuptools,
+  click-default-group,
+  numpy,
+  openai,
+  pip,
+  pluggy,
+  pydantic,
+  python-ulid,
+  pyyaml,
+  sqlite-migrate,
+  cogapp,
+  pytest-httpx,
+  sqlite-utils,
 }:
 let
   llm = buildPythonPackage rec {
@@ -29,7 +41,7 @@ let
 
     nativeBuildInputs = [ setuptools ];
 
-    propagatedBuildInputs = with python3.pkgs; [
+    propagatedBuildInputs = [
       click-default-group
       numpy
       openai
@@ -43,7 +55,7 @@ let
       sqlite-utils
     ];
 
-    nativeCheckInputs = with python3.pkgs; [
+    nativeCheckInputs = [
       cogapp
       numpy
       pytest-httpx
@@ -89,7 +101,7 @@ let
 
       installPhase = ''
         makeWrapper ${llm}/bin/llm $out/bin/llm \
-          --prefix PYTHONPATH : "${llm}/${python3.sitePackages}:$PYTHONPATH"
+          --prefix PYTHONPATH : "${llm}/${python.sitePackages}:$PYTHONPATH"
         ln -sfv ${llm}/lib $out/lib
       '';
 

From 19d8a7800f9b628b572d9276c52fe59e3b1d47e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:16:41 -0400
Subject: [PATCH 4/6] python311Packages.python-secp256k1-cardano: fix build

---
 .../python-secp256k1-cardano/default.nix        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
index 1328dc98ae35..ca14b00ea525 100644
--- a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
+++ b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
@@ -1,11 +1,14 @@
 {
   lib,
   fetchFromGitHub,
-  python3,
+  buildPythonPackage,
   pkg-config,
+  cffi,
+  secp256k1,
+  pytestCheckHook,
 }:
 
-python3.pkgs.buildPythonPackage {
+buildPythonPackage {
   pname = "python-secp256k1-cardano";
   version = "0.2.3";
 
@@ -20,20 +23,20 @@ python3.pkgs.buildPythonPackage {
 
   nativeBuildInputs = [ pkg-config ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     cffi
     secp256k1
   ];
 
-  nativeCheckInputs = [ python3.pkgs.pytestCheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   # Tests expect .so files and are failing
   doCheck = false;
 
   preConfigure = ''
-    cp -r ${python3.pkgs.secp256k1.src} libsecp256k1
-    export INCLUDE_DIR=${python3.pkgs.secp256k1}/include
-    export LIB_DIR=${python3.pkgs.secp256k1}/lib
+    cp -r ${secp256k1.src} libsecp256k1
+    export INCLUDE_DIR=${secp256k1}/include
+    export LIB_DIR=${secp256k1}/lib
   '';
 
   meta = {

From 3c7638a736c76dc2eb10752afe9f4de32b3d8020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:40:24 -0400
Subject: [PATCH 5/6] python311Packages.tabcmd: use correct interpreter version

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

diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix
index 7638e67378ae..6d38e8e3fe77 100644
--- a/pkgs/development/python-modules/tabcmd/default.nix
+++ b/pkgs/development/python-modules/tabcmd/default.nix
@@ -10,7 +10,7 @@
   pyinstaller-versionfile,
   pytest-order,
   pytestCheckHook,
-  python3,
+  python,
   pythonOlder,
   requests,
   setuptools,
@@ -79,7 +79,7 @@ buildPythonPackage rec {
     cp -r build/lib/tabcmd/__main__.py $out/bin/
 
     # Create a 'tabcmd' script with python3 shebang
-    echo "#!${python3}/bin/python3" > $out/bin/tabcmd
+    echo "#!${python.interpreter}" > $out/bin/tabcmd
 
     # Append __main__.py contents
     cat $out/bin/__main__.py >> $out/bin/tabcmd

From bedf04b195769f70197ebac995697bef881072f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 9 Jul 2024 20:53:48 -0400
Subject: [PATCH 6/6] python311Packages.tabcmd: mark broken

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

diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix
index 6d38e8e3fe77..994449debbba 100644
--- a/pkgs/development/python-modules/tabcmd/default.nix
+++ b/pkgs/development/python-modules/tabcmd/default.nix
@@ -91,6 +91,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "tabcmd" ];
 
   meta = with lib; {
+    broken = true;
     description = "Command line client for working with Tableau Server";
     homepage = "https://github.com/tableau/tabcmd";
     changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}";