Merge pull request #234041 from wegank/explicit-fetchpypi

treewide: make fetchPypi more explicit
2023-05-25 22:33:02 +03:00 · 2023-05-25 22:33:02 +03:00 · ba5d0dc56b
parent 8b829c42fa 6e7c0b97d4
commit ba5d0dc56b
40 changed files with 42 additions and 24 deletions
--- a/pkgs/applications/audio/miniplayer/default.nix
+++ b/pkgs/applications/audio/miniplayer/default.nix
@ -1,5 +1,6 @@
 { lib
 , python3Packages
+, fetchPypi
 }:

 with python3Packages;
--- a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
+++ b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
@ -1,4 +1,4 @@
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:

 with python3Packages;

--- a/pkgs/applications/misc/ablog/default.nix
+++ b/pkgs/applications/misc/ablog/default.nix
@ -1,5 +1,6 @@
 { lib
 , python3
+, fetchPypi
 }:

 with python3.pkgs;
--- a/pkgs/applications/misc/archivy/default.nix
+++ b/pkgs/applications/misc/archivy/default.nix
@ -1,6 +1,6 @@
 { lib
-, stdenv
 , python3
+, fetchPypi
 }:

 let
--- a/pkgs/applications/misc/cum/default.nix
+++ b/pkgs/applications/misc/cum/default.nix
@ -1,4 +1,4 @@
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:

 with python3Packages;

--- a/pkgs/applications/misc/pyditz/default.nix
+++ b/pkgs/applications/misc/pyditz/default.nix
@ -1,4 +1,4 @@
-{ lib, pythonPackages }:
+{ lib, pythonPackages, fetchPypi }:

 with pythonPackages;

--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@ -1,5 +1,6 @@
 { lib
 , python3
+, fetchPypi
 , alsa-utils
 , gobject-introspection
 , libappindicator-gtk3
--- a/pkgs/applications/misc/shell-genie/default.nix
+++ b/pkgs/applications/misc/shell-genie/default.nix
@ -1,6 +1,6 @@
 { lib
 , python3
-, fetchFromGitHub
+, fetchPypi
 }:

 with python3.pkgs;
--- a/pkgs/applications/misc/vit/default.nix
+++ b/pkgs/applications/misc/vit/default.nix
@ -1,5 +1,6 @@
 { lib
 , python3Packages
+, fetchPypi
 , taskwarrior
 , glibcLocales
 }:
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@ -1,6 +1,7 @@
 { lib
 , fetchpatch
 , fetchFromGitHub
+, fetchPypi
 , python3
 }:

--- a/pkgs/applications/video/catt/default.nix
+++ b/pkgs/applications/video/catt/default.nix
@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, fetchPypi
 , python3
 }:

--- a/pkgs/development/python-modules/tasklib/default.nix
+++ b/pkgs/development/python-modules/tasklib/default.nix
@ -1,5 +1,6 @@
 { lib
 , pythonPackages
+, fetchPypi
 , taskwarrior
 , writeShellScriptBin
 }:
--- a/pkgs/development/tools/agda-pkg/default.nix
+++ b/pkgs/development/tools/agda-pkg/default.nix
@ -1,5 +1,6 @@
 { lib
 , python3Packages
+, fetchPypi
 }:

 with python3Packages;
--- a/pkgs/development/tools/mbed-cli/default.nix
+++ b/pkgs/development/tools/mbed-cli/default.nix
@ -1,4 +1,4 @@
-{ lib, python3Packages, git, mercurial }:
+{ lib, python3Packages, fetchPypi, git, mercurial }:

 with python3Packages;

--- a/pkgs/development/tools/pew/default.nix
+++ b/pkgs/development/tools/pew/default.nix
@ -1,4 +1,4 @@
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:

 with python3.pkgs;

--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , python3
+, fetchPypi
 , installShellFiles
 }:

--- a/pkgs/development/tools/rdbtools/default.nix
+++ b/pkgs/development/tools/rdbtools/default.nix
@ -1,4 +1,4 @@
-{ lib, python }:
+{ lib, python, fetchPypi }:

 with python.pkgs;

--- a/pkgs/development/tools/reno/default.nix
+++ b/pkgs/development/tools/reno/default.nix
@ -2,6 +2,7 @@
 , git
 , gnupg1
 , python3Packages
+, fetchPypi
 }:

 with python3Packages; buildPythonApplication rec {
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@ -1,4 +1,4 @@
-{ lib, python3Packages
+{ lib, python3Packages, fetchPypi
 , git, breezy, subversion }:

 with python3Packages;
--- a/pkgs/servers/geospatial/mapproxy/default.nix
+++ b/pkgs/servers/geospatial/mapproxy/default.nix
@ -1,6 +1,6 @@
 { lib
-, pkgs
 , python3
+, fetchPypi
 }:

 with python3.pkgs;
--- a/pkgs/servers/mail/mailman/hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/hyperkitty.nix
@ -1,5 +1,6 @@
 { lib
 , python3
+, fetchPypi
 , fetchpatch
 }:

--- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix
+++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix
@ -1,5 +1,6 @@
 { lib
 , python3
+, fetchPypi
 , mailman
 }:

--- a/pkgs/servers/mail/mailman/package.nix
+++ b/pkgs/servers/mail/mailman/package.nix
@ -1,6 +1,7 @@
 { lib
 , fetchpatch
 , python3
+, fetchPypi
 , docutils
 , sphinx
 , postfix
--- a/pkgs/servers/mail/mailman/postorius.nix
+++ b/pkgs/servers/mail/mailman/postorius.nix
@ -1,4 +1,4 @@
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:

 with python3.pkgs;

--- a/pkgs/servers/mail/mailman/web.nix
+++ b/pkgs/servers/mail/mailman/web.nix
@ -1,4 +1,4 @@
-{ lib, python3
+{ lib, python3, fetchPypi
 , sassc, hyperkitty, postorius
 }:

--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@ -1,6 +1,7 @@
 { lib
 , python3
 , fetchFromGitHub
+, fetchPypi
 , groff
 , less
 }:
--- a/pkgs/tools/admin/chkcrontab/default.nix
+++ b/pkgs/tools/admin/chkcrontab/default.nix
@ -1,4 +1,4 @@
-{ python3, lib }:
+{ lib, python3, fetchPypi }:

 with python3.pkgs;

--- a/pkgs/tools/admin/iredis/default.nix
+++ b/pkgs/tools/admin/iredis/default.nix
@ -1,4 +1,4 @@
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:

 with python3Packages;

--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@ -1,5 +1,6 @@
 { lib
 , python3
+, fetchPypi
 , glibcLocales
 }:

--- a/pkgs/tools/misc/adafruit-ampy/default.nix
+++ b/pkgs/tools/misc/adafruit-ampy/default.nix
@ -1,4 +1,4 @@
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:

 with python3.pkgs;

--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@ -1,5 +1,6 @@
-{ python3
-, lib
+{ lib
+, python3
+, fetchPypi
 }:

 let
--- a/pkgs/tools/misc/bkyml/default.nix
+++ b/pkgs/tools/misc/bkyml/default.nix
@ -1,5 +1,6 @@
 { lib
 , python3
+, fetchPypi
 }:

 with python3.pkgs;
--- a/pkgs/tools/misc/pipreqs/default.nix
+++ b/pkgs/tools/misc/pipreqs/default.nix
@ -1,4 +1,4 @@
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:

 with python3.pkgs;

--- a/pkgs/tools/misc/wlc/default.nix
+++ b/pkgs/tools/misc/wlc/default.nix
@ -1,5 +1,6 @@
 { lib
 , python3
+, fetchPypi
 }:

 with python3.pkgs;
--- a/pkgs/tools/misc/yutto/default.nix
+++ b/pkgs/tools/misc/yutto/default.nix
@ -1,7 +1,7 @@
 { lib
 , python3
+, fetchPypi
 , ffmpeg
-, makeWrapper
 , nix-update-script
 }:

--- a/pkgs/tools/networking/mutt-ics/default.nix
+++ b/pkgs/tools/networking/mutt-ics/default.nix
@ -1,4 +1,4 @@
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:

 with python3.pkgs; buildPythonApplication rec {
  pname = "mutt-ics";
--- a/pkgs/tools/networking/nyx/default.nix
+++ b/pkgs/tools/networking/nyx/default.nix
@ -1,4 +1,4 @@
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:

 with python3Packages;

--- a/pkgs/tools/networking/pirate-get/default.nix
+++ b/pkgs/tools/networking/pirate-get/default.nix
@ -1,4 +1,4 @@
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:

 with python3Packages;

--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@ -1,4 +1,4 @@
-{ lib, python3, fetchFromGitHub, fetchurl }:
+{ lib, python3, fetchFromGitHub, fetchPypi }:
 let
  python = python3.override {
    # override resolvelib due to
--- a/pkgs/tools/security/pynitrokey/default.nix
+++ b/pkgs/tools/security/pynitrokey/default.nix
@ -1,4 +1,4 @@
-{ python3Packages, lib, nrfutil, libnitrokey }:
+{ lib, python3Packages, fetchPypi, nrfutil, libnitrokey }:

 with python3Packages;