diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-25 20:19:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-25 20:19:51 +0300 |
commit | 027259f359ac7cbbe46f4b645b0fbdb4065a6355 (patch) | |
tree | 05a1483c4edc35b99b6a5a5153c11afac55f50fe /pkgs | |
parent | af5cdeb6a6dc9cd24e7e6e527ac8ae80a9b62f52 (diff) | |
parent | aa500fcfda80cbc0a3209f24b0227485bb81b100 (diff) |
Merge pull request #234021 from figsoda/inherited
treewide: use top-level fetchPypi instead of inheriting from the python package set
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/tzupdate/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/dfmt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index f6416f0f35220..7c49696141c65 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -1,7 +1,7 @@ -{ lib, python3 }: +{ lib, python3, fetchPypi }: let - inherit (python3.pkgs) buildPythonApplication fetchPypi requests; + inherit (python3.pkgs) buildPythonApplication requests; in buildPythonApplication rec { pname = "tzupdate"; diff --git a/pkgs/tools/text/dfmt/default.nix b/pkgs/tools/text/dfmt/default.nix index 16702bb696634..f09ce0b452563 100644 --- a/pkgs/tools/text/dfmt/default.nix +++ b/pkgs/tools/text/dfmt/default.nix @@ -1,11 +1,11 @@ { lib , python3 +, fetchPypi }: let inherit (python3.pkgs) buildPythonApplication - fetchPypi pythonOlder; in buildPythonApplication rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1788f9e6cd733..1ad00e45c4f32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1904,7 +1904,6 @@ with pkgs; git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx { inherit (python3Packages) buildPythonApplication - fetchPypi dropbox annexremote humanfriendly; @@ -1913,7 +1912,6 @@ with pkgs; git-annex-remote-googledrive = callPackage ../applications/version-management/git-annex-remote-googledrive { inherit (python3Packages) buildPythonApplication - fetchPypi annexremote drivelib gitpython diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8c2fd729ad1d..e663e10f2660c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6082,7 +6082,7 @@ self: super: with self; { maya = callPackage ../development/python-modules/maya { }; mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { - inherit buildPythonPackage pythonOlder fetchPypi; + inherit buildPythonPackage pythonOlder; inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; }; |