treewide: use top-level fetchPypi instead of inheriting from the python package set
This commit is contained in:
parent
6e6f778fe3
commit
aa500fcfda
4 changed files with 4 additions and 6 deletions
|
@ -1,7 +1,7 @@
|
||||||
{ lib, python3 }:
|
{ lib, python3, fetchPypi }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (python3.pkgs) buildPythonApplication fetchPypi requests;
|
inherit (python3.pkgs) buildPythonApplication requests;
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "tzupdate";
|
pname = "tzupdate";
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ lib
|
{ lib
|
||||||
, python3
|
, python3
|
||||||
|
, fetchPypi
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (python3.pkgs)
|
inherit (python3.pkgs)
|
||||||
buildPythonApplication
|
buildPythonApplication
|
||||||
fetchPypi
|
|
||||||
pythonOlder;
|
pythonOlder;
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
|
|
|
@ -1904,7 +1904,6 @@ with pkgs;
|
||||||
git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx {
|
git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx {
|
||||||
inherit (python3Packages)
|
inherit (python3Packages)
|
||||||
buildPythonApplication
|
buildPythonApplication
|
||||||
fetchPypi
|
|
||||||
dropbox
|
dropbox
|
||||||
annexremote
|
annexremote
|
||||||
humanfriendly;
|
humanfriendly;
|
||||||
|
@ -1913,7 +1912,6 @@ with pkgs;
|
||||||
git-annex-remote-googledrive = callPackage ../applications/version-management/git-annex-remote-googledrive {
|
git-annex-remote-googledrive = callPackage ../applications/version-management/git-annex-remote-googledrive {
|
||||||
inherit (python3Packages)
|
inherit (python3Packages)
|
||||||
buildPythonApplication
|
buildPythonApplication
|
||||||
fetchPypi
|
|
||||||
annexremote
|
annexremote
|
||||||
drivelib
|
drivelib
|
||||||
gitpython
|
gitpython
|
||||||
|
|
|
@ -6082,7 +6082,7 @@ self: super: with self; {
|
||||||
maya = callPackage ../development/python-modules/maya { };
|
maya = callPackage ../development/python-modules/maya { };
|
||||||
|
|
||||||
mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
|
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;
|
inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue