From 6e7c0b97d4d9be2420bcd15dc232528c8b0433bc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 25 May 2023 21:37:59 +0300 Subject: [PATCH] treewide: make fetchPypi more explicit --- pkgs/applications/audio/miniplayer/default.nix | 1 + pkgs/applications/editors/jupyter-kernels/octave/kernel.nix | 2 +- pkgs/applications/misc/ablog/default.nix | 1 + pkgs/applications/misc/archivy/default.nix | 2 +- pkgs/applications/misc/cum/default.nix | 2 +- pkgs/applications/misc/pyditz/default.nix | 2 +- pkgs/applications/misc/safeeyes/default.nix | 1 + pkgs/applications/misc/shell-genie/default.nix | 2 +- pkgs/applications/misc/vit/default.nix | 1 + .../networking/instant-messengers/turses/default.nix | 1 + pkgs/applications/video/catt/default.nix | 1 + pkgs/development/python-modules/tasklib/default.nix | 1 + pkgs/development/tools/agda-pkg/default.nix | 1 + pkgs/development/tools/mbed-cli/default.nix | 2 +- pkgs/development/tools/pew/default.nix | 2 +- pkgs/development/tools/pipenv/default.nix | 1 + pkgs/development/tools/rdbtools/default.nix | 2 +- pkgs/development/tools/reno/default.nix | 1 + pkgs/development/tools/vcstool/default.nix | 2 +- pkgs/servers/geospatial/mapproxy/default.nix | 2 +- pkgs/servers/mail/mailman/hyperkitty.nix | 1 + pkgs/servers/mail/mailman/mailman-hyperkitty.nix | 1 + pkgs/servers/mail/mailman/package.nix | 1 + pkgs/servers/mail/mailman/postorius.nix | 2 +- pkgs/servers/mail/mailman/web.nix | 2 +- pkgs/tools/admin/awscli/default.nix | 1 + pkgs/tools/admin/chkcrontab/default.nix | 2 +- pkgs/tools/admin/iredis/default.nix | 2 +- pkgs/tools/admin/mycli/default.nix | 1 + pkgs/tools/misc/adafruit-ampy/default.nix | 2 +- pkgs/tools/misc/bepasty/default.nix | 5 +++-- pkgs/tools/misc/bkyml/default.nix | 1 + pkgs/tools/misc/pipreqs/default.nix | 2 +- pkgs/tools/misc/wlc/default.nix | 1 + pkgs/tools/misc/yutto/default.nix | 2 +- pkgs/tools/networking/mutt-ics/default.nix | 2 +- pkgs/tools/networking/nyx/default.nix | 2 +- pkgs/tools/networking/pirate-get/default.nix | 2 +- pkgs/tools/package-management/pdm/default.nix | 2 +- pkgs/tools/security/pynitrokey/default.nix | 2 +- 40 files changed, 42 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/applications/audio/miniplayer/default.nix index bc9c88b292a..018fd6c8b78 100644 --- a/pkgs/applications/audio/miniplayer/default.nix +++ b/pkgs/applications/audio/miniplayer/default.nix @@ -1,5 +1,6 @@ { lib , python3Packages +, fetchPypi }: with python3Packages; diff --git a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix index fc6254f27e8..c37a9e3bc73 100644 --- 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; diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index 4142814cf02..c57ba4721bc 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi }: with python3.pkgs; diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index b146599c2b2..c89bbde6569 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -1,6 +1,6 @@ { lib -, stdenv , python3 +, fetchPypi }: let diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index 42df68f6721..d49987c8285 100644 --- 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; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index fe3bf0c5211..87d8deb03e6 100644 --- 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; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 9506825a2ff..387f54e2154 100644 --- 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 diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index d56caac9d21..0f485156320 100644 --- 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; diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 529c809806d..4cae8df86a9 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -1,5 +1,6 @@ { lib , python3Packages +, fetchPypi , taskwarrior , glibcLocales }: diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index cb6e8152ca2..240931065e6 100644 --- 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 }: diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 88513fc50a3..cdcb45fa5fd 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchPypi , python3 }: diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 204bcb7df1a..126ea75f6a5 100644 --- 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 }: diff --git a/pkgs/development/tools/agda-pkg/default.nix b/pkgs/development/tools/agda-pkg/default.nix index 498b38ec7af..81af5e19589 100644 --- 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; diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index cf6e65c46c7..cc8294fafe6 100644 --- 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; diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index 2d7294ec105..f0c9d7d62b6 100644 --- 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; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index e347f4c48e0..0e73b5ee3b6 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , python3 +, fetchPypi , installShellFiles }: diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix index e2f053c1e81..40cbce35ba3 100644 --- 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; diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index d0cb440ec40..c895deb4f34 100644 --- 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 { diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index 9d6fb1588a1..0350c7296fd 100644 --- 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; diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/servers/geospatial/mapproxy/default.nix index 75e7f64227b..2c56d2d96df 100644 --- 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; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 924accbecfa..f0cac80bb5f 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi , fetchpatch }: diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index a60c5c07a50..4bb9cdda1a4 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi , mailman }: diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index d4040458307..0644c18ddf8 100644 --- 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 diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index ddd7d4991f4..fefffffc87c 100644 --- 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; diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 64489bc3e41..bb50586e8d5 100644 --- 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 }: diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index f440aa17b46..ac119e7d1c3 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchPypi , groff , less }: diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index d91894f0006..903bfe7f32c 100644 --- 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; diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/tools/admin/iredis/default.nix index 9b2bfe08d34..63ef42e99c8 100644 --- 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; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index c1753fe1a56..b7ece9ed25a 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi , glibcLocales }: diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index 4a9a5866c6e..21f137e1a83 100644 --- 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; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index cd2cac7684e..33840f46fec 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -1,5 +1,6 @@ -{ python3 -, lib +{ lib +, python3 +, fetchPypi }: let diff --git a/pkgs/tools/misc/bkyml/default.nix b/pkgs/tools/misc/bkyml/default.nix index 16af495b934..bab6f7865e7 100644 --- a/pkgs/tools/misc/bkyml/default.nix +++ b/pkgs/tools/misc/bkyml/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi }: with python3.pkgs; diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix index 70a5ec69ff5..3e22fa839e1 100644 --- 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; diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 7adf01316d5..73ae91c2e98 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi }: with python3.pkgs; diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix index 2b273bb6553..38f9d794abf 100644 --- 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 }: diff --git a/pkgs/tools/networking/mutt-ics/default.nix b/pkgs/tools/networking/mutt-ics/default.nix index 4193690dc3d..f56e688b411 100644 --- 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"; diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/tools/networking/nyx/default.nix index 6ae81609eec..844d692425b 100644 --- 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; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index ec2c821f6e8..c1b43a00f52 100644 --- 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; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 7582a6efe62..e3ea6d4afa5 100644 --- 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 diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index dfd9454400f..2703b7b1b0e 100644 --- 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;