Unverified Commit 027259f3 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234021 from figsoda/inherited 

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

pkgs/applications/misc/tzupdate/default.nix

+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";

pkgs/tools/text/dfmt/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib

, python3

, fetchPypi

}:



let

  inherit (python3.pkgs)

    buildPythonApplication

    fetchPypi

    pythonOlder;

in

buildPythonApplication rec {

pkgs/top-level/all-packages.nix

+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

pkgs/top-level/python-packages.nix

+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;

  };