Commit aa500fcf authored by figsoda's avatar figsoda
Browse files

treewide: use top-level fetchPypi instead of inheriting from the python package set

parent 6e6f778f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
{ lib, python3 }:
{ lib, python3, fetchPypi }:

let
  inherit (python3.pkgs) buildPythonApplication fetchPypi requests;
  inherit (python3.pkgs) buildPythonApplication requests;
in
buildPythonApplication rec {
  pname = "tzupdate";
+1 −1
Original line number Diff line number Diff line
{ lib
, python3
, fetchPypi
}:

let
  inherit (python3.pkgs)
    buildPythonApplication
    fetchPypi
    pythonOlder;
in
buildPythonApplication rec {
+0 −2
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -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;
  };