treewide: fix python packages broken from adding throws in python-aliases.nix (#395785)

pkgs/applications/misc/bitwarden-menu/default.nix

@@ -1,8 +1,9 @@
 {
   lib,
   buildPythonApplication,
-  python3Packages,
   fetchPypi,
+  hatch-vcs,
+  hatchling,
   pynput,
   xdg-base-dirs,
 }:
@@ -18,7 +19,7 @@ buildPythonApplication rec {
     hash = "sha256-vUlNqSVdGhfN5WjDjf1ub32Y2WoBndIdFzfCNwo5+Vg=";
   };
 
-  nativeBuildInputs = with python3Packages; [
+  nativeBuildInputs = [
     hatch-vcs
     hatchling
   ];

pkgs/applications/misc/remarkable/remarkable-mouse/default.nix

@@ -2,7 +2,10 @@
   lib,
   buildPythonApplication,
   fetchPypi,
-  python3Packages,
+  libevdev,
+  paramiko,
+  pynput,
+  screeninfo,
 }:
 
 buildPythonApplication rec {
@@ -14,7 +17,7 @@ buildPythonApplication rec {
     hash = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     screeninfo
     paramiko
     pynput

pkgs/applications/science/robotics/sumorobot-manager/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  python3,
+  python,
   qt5,
   fetchFromGitHub,
   wrapPython,
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "07snhwmqqp52vdgr66vx50zxx0nmpmns5cdjgh50hzlhji2z1fl9";
   };
 
-  buildInputs = [ python3 ];
+  buildInputs = [ python ];
   pythonPath = [
     pyqt5.dev
     pyserial

pkgs/by-name/li/libmamba/package.nix

@@ -16,7 +16,7 @@
   zstd,
   nix-update-script,
   bzip2,
-  python3Packages,
+  python3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    python3Packages.python
+    python3
   ];
 
   buildInputs = [

pkgs/development/python-modules/fenics/default.nix

@@ -5,20 +5,22 @@
   fetchpatch,
   blas,
   boost186,
+  buildPythonPackage,
   cmake,
   doxygen,
   eigen,
   hdf5,
+  isPy27,
   lapack,
   mpi,
   mpi4py,
   numpy,
   pkg-config,
+  pkgconfig,
   ply,
   pybind11,
   pytest,
   python,
-  pythonPackages,
   scotch,
   setuptools,
   six,
@@ -33,7 +35,7 @@
 let
   version = "2019.1.0";
 
-  dijitso = pythonPackages.buildPythonPackage {
+  dijitso = buildPythonPackage {
     pname = "dijitso";
     inherit version;
     src = fetchurl {
@@ -61,7 +63,7 @@ let
     };
   };
 
-  fiat = pythonPackages.buildPythonPackage {
+  fiat = buildPythonPackage {
     pname = "fiat";
     inherit version;
     src = fetchurl {
@@ -101,7 +103,7 @@ let
     };
   };
 
-  ufl = pythonPackages.buildPythonPackage {
+  ufl = buildPythonPackage {
     pname = "ufl";
     inherit version;
     src = fetchurl {
@@ -126,7 +128,7 @@ let
     };
   };
 
-  ffc = pythonPackages.buildPythonPackage {
+  ffc = buildPythonPackage {
     pname = "ffc";
     inherit version;
     src = fetchurl {
@@ -257,10 +259,10 @@ let
       license = lib.licenses.lgpl3;
     };
   };
-  python-dolfin = pythonPackages.buildPythonPackage rec {
+  python-dolfin = buildPythonPackage rec {
     pname = "dolfin";
     inherit version;
-    disabled = pythonPackages.isPy27;
+    disabled = isPy27;
     src = dolfin.src;
     sourceRoot = "${pname}-${version}/python";
     nativeBuildInputs = [
@@ -286,8 +288,8 @@ let
       mpi4py
       numpy
       ufl
-      pythonPackages.pkgconfig
-      pythonPackages.pybind11
+      pkgconfig
+      pybind11
     ];
     doCheck = false; # Tries to orte_ess_init and call ssh to localhost
     passthru.tests = {

pkgs/development/python-modules/libmambapy/default.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  pythonPackages,
+  python,
   buildPythonPackage,
   cmake,
   ninja,
@@ -39,7 +39,7 @@ buildPythonPackage {
   };
 
   buildInputs = [
-    (libmamba.override { python3Packages = pythonPackages; })
+    (libmamba.override { python3 = python; })
     curl
     zstd
     bzip2

pkgs/development/python-modules/mkdocs-linkcheck/default.nix

@@ -1,9 +1,10 @@
 {
   lib,
+  aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  pythonPackages,
+  requests,
 }:
 
 buildPythonPackage {
@@ -20,7 +21,7 @@ buildPythonPackage {
     hash = "sha256-z59F7zUKZKIQSiTlE6wGbGDecPMeruNgltWUYfDf8jY=";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = [
     aiohttp
     requests
   ];

pkgs/development/python-modules/semgrep/default.nix

@@ -4,7 +4,6 @@
   fetchFromGitHub,
   semgrep-core,
   buildPythonPackage,
-  pythonPackages,
 
   pytestCheckHook,
   git,
@@ -12,27 +11,32 @@
   # python packages
   attrs,
   boltons,
-  colorama,
   click,
   click-option-group,
+  colorama,
+  defusedxml,
+  flaky,
   glom,
+  jsonschema,
+  opentelemetry-api,
+  opentelemetry-exporter-otlp-proto-http,
+  opentelemetry-instrumentation-requests,
+  opentelemetry-sdk,
+  packaging,
+  peewee,
+  pytest-freezegun,
+  pytest-mock,
+  pytest-snapshot,
+  python-lsp-jsonrpc,
   requests,
   rich,
   ruamel-yaml,
-  tqdm,
-  packaging,
-  jsonschema,
-  wcmatch,
-  peewee,
-  defusedxml,
-  urllib3,
-  typing-extensions,
-  python-lsp-jsonrpc,
   tomli,
-  opentelemetry-api,
-  opentelemetry-sdk,
-  opentelemetry-exporter-otlp-proto-http,
-  opentelemetry-instrumentation-requests,
+  tqdm,
+  types-freezegun,
+  typing-extensions,
+  urllib3,
+  wcmatch,
 }:
 
 # testing locally post build:
@@ -106,18 +110,15 @@ buildPythonPackage rec {
 
   doCheck = true;
 
-  nativeCheckInputs =
-    [
-      git
-      pytestCheckHook
-    ]
-    ++ (with pythonPackages; [
-      flaky
-      pytest-snapshot
-      pytest-mock
-      pytest-freezegun
-      types-freezegun
-    ]);
+  nativeCheckInputs = [
+    git
+    pytestCheckHook
+    flaky
+    pytest-snapshot
+    pytest-mock
+    pytest-freezegun
+    types-freezegun
+  ];
 
   disabledTestPaths = [
     "tests/default/e2e"

pkgs/games/gscrabble/default.nix

@@ -6,7 +6,8 @@
   wrapGAppsHook3,
   gst_all_1,
   gobject-introspection,
-  python3Packages,
+  gst-python,
+  pygobject3,
   adwaita-icon-theme,
 }:
 
@@ -37,7 +38,7 @@ buildPythonApplication {
     gtk3
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     gst-python
     pygobject3
   ];

pkgs/servers/persistent-evdev/default.nix

@@ -2,7 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  python3Packages,
+  evdev,
+  pyudev,
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "d0i6DL/qgDELet4ew2lyVqzd9TApivRxL3zA3dcsQXY=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     evdev
     pyudev
   ];

pkgs/tools/admin/awsume/default.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  python3,
+  python,
   installShellFiles,
   buildPythonApplication,
   fetchFromGitHub,
@@ -44,9 +44,9 @@ buildPythonApplication rec {
 
   postInstall = ''
     installShellCompletion --cmd awsume \
-      --bash <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
-      --zsh <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
-      --fish <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
+      --bash <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
+      --zsh <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
+      --fish <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
 
     rm -f $out/bin/awsume.bat
   '';

pkgs/tools/games/mymcplus/default.nix

@@ -1,11 +1,11 @@
 {
   lib,
   fetchFromSourcehut,
-  pythonPackages,
+  python3Packages,
   wrapGAppsHook3,
 }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "mymcplus";
   version = "3.0.5";
 
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
     wrapGAppsHook3
   ];
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     pyopengl
     wxpython
   ];

pkgs/tools/graphics/pixel2svg/default.nix

@@ -2,10 +2,11 @@
   lib,
   buildPythonPackage,
   fetchurl,
-  python310Packages,
+  pillow,
+  svgwrite,
 }:
 
-python310Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "pixel2svg";
   version = "0.3.0";
 
@@ -14,7 +15,7 @@ python310Packages.buildPythonPackage rec {
     sha256 = "sha256-aqcTTmZKcdRdVd8GGz5cuaQ4gjPapVJNtiiZu22TZgQ=";
   };
 
-  propagatedBuildInputs = with python310Packages; [
+  propagatedBuildInputs = [
     pillow
     svgwrite
   ];

pkgs/tools/misc/thinkpad-scripts/default.nix

@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  python3Packages,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "08adx8r5pwwazbnfahay42l5f203mmvcn2ipz5hg8myqc9jxm2ky";
   };
 
-  propagatedBuildInputs = with python3Packages; [ setuptools ];
+  propagatedBuildInputs = [ setuptools ];
 
   meta = {
     description = "Screen rotation, docking and other scripts for ThinkPad® X220 and X230 Tablet";

pkgs/tools/misc/xflux/gui.nix

@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   buildPythonApplication,
-  python3Packages,
+  python,
   wrapGAppsHook3,
   xflux,
   gtk3,
@@ -54,7 +54,7 @@ buildPythonApplication rec {
   postFixup = ''
     wrapGAppsHook
     wrapPythonPrograms
-    patchPythonScript $out/${python3Packages.python.sitePackages}/fluxgui/fluxapp.py
+    patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py
   '';
 
   meta = {

pkgs/tools/networking/maubot/default.nix

@@ -4,13 +4,17 @@
   fetchpatch,
   callPackage,
   runCommand,
-  python3,
+  python,
   encryptionSupport ? true,
   sqliteSupport ? true,
 }:
 
 let
-  python = python3.override {
+  # save for overriding it
+  python' = python;
+in
+let
+  python = python'.override {
     self = python;
     packageOverrides = final: prev: {
       # SQLAlchemy>=1,<1.4

pkgs/tools/virtualization/mkosi/default.nix

@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   stdenv,
-  python3,
   systemd,
   pandoc,
   kmod,
@@ -16,6 +15,7 @@
   replaceVars,
 
   # Python packages
+  python,
   setuptools,
   setuptools-scm,
   wheel,
@@ -46,7 +46,7 @@ let
     withKernelInstall = true;
   };
 
-  python3pefile = python3.withPackages (_: [ pefile ]);
+  python3pefile = python.withPackages (_: [ pefile ]);
 
   deps =
     [

pkgs/top-level/all-packages.nix

@@ -284,7 +284,7 @@ with pkgs;
     extraPackages = [ jdk17 ];
   };
 
-  asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { };
+  asitop = callPackage ../os-specific/darwin/asitop { };
 
   cve = with python3Packages; toPythonApplication cvelib;
 
@@ -363,7 +363,7 @@ with pkgs;
     openexr = openexr_3;
   };
 
-  databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
+  databricks-sql-cli = callPackage ../applications/misc/databricks-sql-cli { };
 
   deck = callPackage ../by-name/de/deck/package.nix {
     buildGoModule = buildGo123Module;
@@ -403,7 +403,7 @@ with pkgs;
 
   inherit (gridlock) nyarr;
 
-  html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
+  html5validator = callPackage ../applications/misc/html5validator { };
 
   inspec = callPackage ../tools/misc/inspec { };
 
@@ -1175,7 +1175,7 @@ with pkgs;
 
   mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { };
 
-  mymcplus = python3Packages.callPackage ../tools/games/mymcplus { };
+  mymcplus = callPackage ../tools/games/mymcplus { };
 
   networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify {
     systemd = pkgs.systemd;
@@ -1206,7 +1206,7 @@ with pkgs;
 
   shaperglot = with python3Packages; toPythonApplication shaperglot;
 
-  snagboot = python3.pkgs.callPackage ../applications/misc/snagboot { };
+  snagboot = callPackage ../applications/misc/snagboot { };
 
   slipstream = callPackage ../tools/games/slipstream {
     jdk = jdk8;
@@ -1850,7 +1850,7 @@ with pkgs;
 
   certipy = with python3Packages; toPythonApplication certipy-ad;
 
-  catcli = python3Packages.callPackage ../tools/filesystems/catcli { };
+  catcli = callPackage ../tools/filesystems/catcli { };
 
   chipsec = callPackage ../tools/security/chipsec {
     kernel = null;
@@ -4192,7 +4192,7 @@ with pkgs;
 
   nanoemoji = with python3Packages; toPythonApplication nanoemoji;
 
-  netexec = python3Packages.callPackage ../tools/security/netexec { };
+  netexec = callPackage ../tools/security/netexec { };
 
   netdata = callPackage ../tools/system/netdata {
     protobuf = protobuf_21;
@@ -5460,11 +5460,11 @@ with pkgs;
     python3Packages.callPackage ../applications/misc/twitch-chat-downloader
       { };
 
-  twtxt = python3Packages.callPackage ../applications/networking/twtxt { };
+  twtxt = callPackage ../applications/networking/twtxt { };
 
   twurl = callPackage ../tools/misc/twurl { };
 
-  ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { };
+  ubidump = callPackage ../tools/filesystems/ubidump { };
 
   ubpm = libsForQt5.callPackage ../applications/misc/ubpm { };
 
@@ -5959,7 +5959,7 @@ with pkgs;
     llvmPackages = crystal.llvmPackages;
   };
 
-  devpi-client = python3Packages.callPackage ../development/tools/devpi-client { };
+  devpi-client = callPackage ../development/tools/devpi-client { };
 
   devpi-server = python3Packages.callPackage ../development/tools/devpi-server { };
 
@@ -8593,7 +8593,7 @@ with pkgs;
     )
       haskellPackages.haskell-ci;
 
-  nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };
+  nimbo = callPackage ../applications/misc/nimbo { };
 
   nixbang = callPackage ../development/tools/misc/nixbang {
     pythonPackages = python3Packages;
@@ -17448,7 +17448,7 @@ with pkgs;
 
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
-  gshogi = python3Packages.callPackage ../games/gshogi { };
+  gshogi = callPackage ../games/gshogi { };
 
   qtads = qt5.callPackage ../games/qtads { };
 
@@ -17627,7 +17627,7 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  pysolfc = python3Packages.callPackage ../games/pysolfc { };
+  pysolfc = callPackage ../games/pysolfc { };
 
   quake3wrapper = callPackage ../games/quake3/wrapper { };
 
@@ -18626,7 +18626,7 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };
 
-  nextinspace = python3Packages.callPackage ../applications/science/misc/nextinspace { };
+  nextinspace = callPackage ../applications/science/misc/nextinspace { };
 
   ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
 
@@ -18679,7 +18679,7 @@ with pkgs;
   autotiling = python3Packages.callPackage ../misc/autotiling { };
 
   avell-unofficial-control-center =
-    python3Packages.callPackage ../applications/misc/avell-unofficial-control-center
+    callPackage ../applications/misc/avell-unofficial-control-center
       { };
 
   brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { };
@@ -19227,7 +19227,7 @@ with pkgs;
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { };
 
-  tftui = python3Packages.callPackage ../applications/networking/cluster/tftui { };
+  tftui = callPackage ../applications/networking/cluster/tftui { };
 
   trufflehog = callPackage ../tools/security/trufflehog {
     buildGoModule = buildGo123Module;

pkgs/top-level/python-packages.nix

@@ -7802,7 +7802,7 @@ self: super: with self; {
       p.override {
         enablePython = true;
         python3 = python;
-        python3Packages = pythonPackages;
+        python3Packages = self;
       }
     )
     (p: p.py)