pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #234021 from figsoda/inherited

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

authored by Weijia Wang and committed by GitHub 027259f3 af5cdeb6

+4 -6
unified split
+2 -2
pkgs/applications/misc/tzupdate/default.nix
··· 1 - { lib, python3 }: 1 + { lib, python3, fetchPypi }: 2 2 3 3 let 4 - inherit (python3.pkgs) buildPythonApplication fetchPypi requests; 4 + inherit (python3.pkgs) buildPythonApplication requests; 5 5 in 6 6 buildPythonApplication rec { 7 7 pname = "tzupdate";
+1 -1
pkgs/tools/text/dfmt/default.nix
··· 1 1 { lib 2 2 , python3 3 + , fetchPypi 3 4 }: 4 5 5 6 let 6 7 inherit (python3.pkgs) 7 8 buildPythonApplication 8 - fetchPypi 9 9 pythonOlder; 10 10 in 11 11 buildPythonApplication rec {
-2
pkgs/top-level/all-packages.nix
··· 1904 1904 git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx { 1905 1905 inherit (python3Packages) 1906 1906 buildPythonApplication 1907 - fetchPypi 1908 1907 dropbox 1909 1908 annexremote 1910 1909 humanfriendly; ··· 1913 1912 git-annex-remote-googledrive = callPackage ../applications/version-management/git-annex-remote-googledrive { 1914 1913 inherit (python3Packages) 1915 1914 buildPythonApplication 1916 - fetchPypi 1917 1915 annexremote 1918 1916 drivelib 1919 1917 gitpython
+1 -1
pkgs/top-level/python-packages.nix
··· 6082 6082 maya = callPackage ../development/python-modules/maya { }; 6083 6083 6084 6084 mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { 6085 - inherit buildPythonPackage pythonOlder fetchPypi; 6085 + inherit buildPythonPackage pythonOlder; 6086 6086 inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; 6087 6087 }; 6088 6088