lol

treewide: remove use of python3(Packages) in python package set

+60 -43
+9 -4
pkgs/development/python-modules/ansible-builder/default.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + setuptools, 4 + setuptools-scm, 5 + jsonschema, 6 + requirements-parser, 7 + pyyaml, 4 8 podman, 5 9 fetchPypi, 6 10 bindep, 11 + buildPythonPackage, 7 12 }: 8 - python3Packages.buildPythonPackage rec { 13 + buildPythonPackage rec { 9 14 pname = "ansible-builder"; 10 15 version = "3.0.1"; 11 16 format = "pyproject"; ··· 15 20 hash = "sha256-rxyhgj9Cad751tPAptCTLCtXQLUXaRYv39bkoFzzjOk="; 16 21 }; 17 22 18 - nativeBuildInputs = with python3Packages; [ 23 + nativeBuildInputs = [ 19 24 setuptools 20 25 setuptools-scm 21 26 ]; 22 27 23 28 buildInputs = [ bindep ]; 24 29 25 - propagatedBuildInputs = with python3Packages; [ 30 + propagatedBuildInputs = [ 26 31 podman 27 32 jsonschema 28 33 requirements-parser
+9 -4
pkgs/development/python-modules/bindep/default.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 4 3 fetchPypi, 4 + buildPythonPackage, 5 + distro, 6 + pbr, 7 + setuptools, 8 + packaging, 9 + parsley, 5 10 }: 6 - python3Packages.buildPythonPackage rec { 11 + buildPythonPackage rec { 7 12 pname = "bindep"; 8 13 version = "2.11.0"; 9 14 format = "pyproject"; ··· 13 18 hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8="; 14 19 }; 15 20 16 - buildInputs = with python3Packages; [ 21 + buildInputs = [ 17 22 distro 18 23 pbr 19 24 setuptools 20 25 ]; 21 26 22 - propagatedBuildInputs = with python3Packages; [ 27 + propagatedBuildInputs = [ 23 28 parsley 24 29 pbr 25 30 packaging
+4 -3
pkgs/development/python-modules/chainstream/default.nix
··· 1 1 { 2 2 lib, 3 3 fetchPypi, 4 - python3Packages, 4 + buildPythonPackage, 5 + setuptools, 5 6 }: 6 7 7 - python3Packages.buildPythonPackage rec { 8 + buildPythonPackage rec { 8 9 pname = "chainstream"; 9 10 version = "1.0.1"; 10 11 11 12 pyproject = true; 12 13 13 - nativeBuildInputs = [ python3Packages.setuptools ]; 14 + nativeBuildInputs = [ setuptools ]; 14 15 15 16 src = fetchPypi { 16 17 inherit pname version;
+2 -2
pkgs/development/python-modules/cli-ui/default.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 4 3 fetchPypi, 5 4 pytestCheckHook, 6 5 pythonOlder, ··· 8 7 colorama, 9 8 tabulate, 10 9 unidecode, 10 + buildPythonPackage, 11 11 }: 12 - python3Packages.buildPythonPackage rec { 12 + buildPythonPackage rec { 13 13 pname = "cli-ui"; 14 14 version = "0.17.2"; 15 15 pyproject = true;
+2 -2
pkgs/development/python-modules/controku/default.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 4 3 fetchFromGitHub, 5 4 setuptools, 6 5 requests, ··· 10 9 gobject-introspection, 11 10 gtk3, 12 11 wrapGAppsHook3, 12 + buildPythonPackage, 13 13 buildApplication ? false, 14 14 }: 15 15 16 - python3Packages.buildPythonPackage rec { 16 + buildPythonPackage rec { 17 17 pname = "controku"; 18 18 version = "1.1.0"; 19 19 format = "pyproject";
+2 -2
pkgs/development/python-modules/dbt-core/default.nix
··· 17 17 packaging, 18 18 pathspec, 19 19 protobuf, 20 - python, 20 + callPackage, 21 21 pythonOlder, 22 22 pytz, 23 23 pyyaml, ··· 85 85 doCheck = false; 86 86 87 87 passthru = { 88 - withAdapters = python.pkgs.callPackage ./with-adapters.nix { }; 88 + withAdapters = callPackage ./with-adapters.nix { }; 89 89 }; 90 90 91 91 meta = with lib; {
+4 -3
pkgs/development/python-modules/dnf4/wrapper.nix
··· 1 1 { 2 2 lib, 3 3 wrapPython, 4 - python3, 4 + python, 5 5 stdenv, 6 + dnf4, 6 7 dnf-plugins-core, 7 8 plugins ? [ dnf-plugins-core ], 8 9 }: 9 10 let 10 - pluginPaths = map (p: "${p}/${python3.sitePackages}/dnf-plugins") plugins; 11 + pluginPaths = map (p: "${p}/${python.sitePackages}/dnf-plugins") plugins; 11 12 12 - dnf4-unwrapped = python3.pkgs.dnf4; 13 + dnf4-unwrapped = dnf4; 13 14 in 14 15 15 16 stdenv.mkDerivation {
+7 -4
pkgs/development/python-modules/exiv2/default.nix
··· 3 3 pkg-config, 4 4 exiv2, 5 5 gettext, 6 - python3Packages, 7 6 fetchFromGitHub, 8 7 gitUpdater, 8 + buildPythonPackage, 9 + setuptools, 10 + toml, 11 + unittestCheckHook, 9 12 }: 10 - python3Packages.buildPythonPackage rec { 13 + buildPythonPackage rec { 11 14 pname = "exiv2"; 12 15 version = "0.17.0"; 13 16 pyproject = true; ··· 30 33 def test_localisation(self):" 31 34 ''; 32 35 33 - build-system = with python3Packages; [ 36 + build-system = [ 34 37 setuptools 35 38 toml 36 39 ]; ··· 42 45 ]; 43 46 44 47 pythonImportsCheck = [ "exiv2" ]; 45 - nativeCheckInputs = with python3Packages; [ unittestCheckHook ]; 48 + nativeCheckInputs = [ unittestCheckHook ]; 46 49 unittestFlagsArray = [ 47 50 "-s" 48 51 "tests"
+2 -2
pkgs/development/python-modules/invisible-watermark/tests/cli.nix
··· 1 1 { 2 2 image, 3 3 method, 4 - python3Packages, 4 + invisible-watermark, 5 5 runCommand, 6 6 testName, 7 7 withOnnx, ··· 25 25 else 26 26 "fnörd1"; 27 27 length = (builtins.stringLength message) * 8; 28 - invisible-watermark' = python3Packages.invisible-watermark.override { inherit withOnnx; }; 28 + invisible-watermark' = invisible-watermark.override { inherit withOnnx; }; 29 29 expected-exit-code = if method == "rivaGan" && !withOnnx then "1" else "0"; 30 30 in 31 31 runCommand "invisible-watermark-test-${testName}" { nativeBuildInputs = [ invisible-watermark' ]; }
+5 -7
pkgs/development/python-modules/invisible-watermark/tests/python/default.nix
··· 2 2 image, 3 3 invisible-watermark, 4 4 opencv4, 5 - python3, 5 + python, 6 6 runCommand, 7 7 stdenvNoCC, 8 8 }: ··· 13 13 message = "fnörd1"; 14 14 method = "dwtDct"; 15 15 16 - pythonWithPackages = python3.withPackages ( 17 - pp: with pp; [ 18 - invisible-watermark 19 - opencv4 20 - ] 21 - ); 16 + pythonWithPackages = python.withPackages (_: [ 17 + invisible-watermark 18 + opencv4 19 + ]); 22 20 pythonInterpreter = pythonWithPackages.interpreter; 23 21 24 22 encode = stdenvNoCC.mkDerivation {
+2 -2
pkgs/development/python-modules/manuf/default.nix
··· 3 3 buildPythonPackage, 4 4 fetchFromGitHub, 5 5 runCommand, 6 - python3, 7 6 wireshark-cli, 8 7 pytestCheckHook, 8 + manuf, # remove when buildPythonPackage supports finalAttrs 9 9 }: 10 10 11 11 buildPythonPackage rec { ··· 42 42 43 43 passthru.tests = { 44 44 testMacAddress = runCommand "${pname}-test" { } '' 45 - ${python3.pkgs.manuf}/bin/manuf BC:EE:7B:00:00:00 > $out 45 + ${lib.getExe manuf} BC:EE:7B:00:00:00 > $out 46 46 [ "$(cat $out | tr -d '\n')" = "Vendor(manuf='ASUSTekC', manuf_long='ASUSTek COMPUTER INC.', comment=None)" ] 47 47 ''; 48 48 };
+3 -2
pkgs/development/python-modules/mlx/default.nix
··· 2 2 lib, 3 3 fetchFromGitHub, 4 4 buildPythonPackage, 5 - python3Packages, 6 5 pybind11, 7 6 cmake, 8 7 xcbuild, 9 8 zsh, 10 9 blas, 11 10 lapack, 11 + setuptools, 12 12 }: 13 13 14 14 let ··· 69 69 zsh 70 70 gguf-tools 71 71 nlohmann_json 72 - ] ++ (with python3Packages; [ setuptools ]); 72 + setuptools 73 + ]; 73 74 74 75 buildInputs = [ 75 76 blas
+5 -3
pkgs/development/python-modules/onigurumacffi/default.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + buildPythonPackage, 4 4 fetchPypi, 5 5 oniguruma, 6 + setuptools, 7 + cffi, 6 8 }: 7 - python3Packages.buildPythonPackage rec { 9 + buildPythonPackage rec { 8 10 pname = "onigurumacffi"; 9 11 version = "1.3.0"; 10 12 format = "pyproject"; ··· 14 16 hash = "sha256-d0XNxWCWrOyIofOwhmCiKwnGWe040/WdtsHK12qXa+8="; 15 17 }; 16 18 17 - buildInputs = with python3Packages; [ 19 + buildInputs = [ 18 20 oniguruma 19 21 setuptools 20 22 cffi
+4 -3
pkgs/development/python-modules/orgparse/default.nix
··· 1 1 { 2 2 lib, 3 - python3Packages, 3 + setuptools-scm, 4 4 fetchPypi, 5 + buildPythonPackage, 5 6 }: 6 7 7 - python3Packages.buildPythonPackage rec { 8 + buildPythonPackage rec { 8 9 pname = "orgparse"; 9 10 version = "0.4.20231004"; 10 11 ··· 13 14 hash = "sha256-pOOK6tq/mYiw9npmrNCCedGCILy8QioSkGDCiQu6kaA="; 14 15 }; 15 16 16 - nativeBuildInputs = [ python3Packages.setuptools-scm ]; 17 + nativeBuildInputs = [ setuptools-scm ]; 17 18 18 19 pyproject = true; 19 20