diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/applications/audio/miniplayer/default.nix index bc9c88b292a0..018fd6c8b78f 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 fc6254f27e8d..c37a9e3bc73b 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 4142814cf021..c57ba4721bce 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 b146599c2b22..c89bbde6569a 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 42df68f6721a..d49987c82858 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 fe3bf0c52115..87d8deb03e61 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 9506825a2ffa..387f54e21544 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 d56caac9d212..0f4851563202 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 529c809806da..4cae8df86a9f 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 cb6e8152ca2c..240931065e6c 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 88513fc50a39..cdcb45fa5fd5 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 204bcb7df1a6..126ea75f6a51 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 498b38ec7aff..81af5e195895 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 cf6e65c46c79..cc8294fafe60 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 2d7294ec1052..f0c9d7d62b6e 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 e347f4c48e05..0e73b5ee3b60 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 e2f053c1e816..40cbce35ba3f 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 d0cb440ec400..c895deb4f34f 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 9d6fb1588a11..0350c7296fde 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 75e7f64227bb..2c56d2d96dfd 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 924accbecfa2..f0cac80bb5fd 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 a60c5c07a509..4bb9cdda1a46 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 d4040458307f..0644c18ddf86 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 ddd7d4991f42..fefffffc87c8 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 64489bc3e412..bb50586e8d56 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 f440aa17b464..ac119e7d1c31 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 d91894f00063..903bfe7f32c9 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 9b2bfe08d342..63ef42e99c8b 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 c1753fe1a563..b7ece9ed25a0 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 4a9a5866c6ec..21f137e1a832 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 cd2cac7684e8..33840f46fecd 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 16af495b9345..bab6f7865e7d 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 70a5ec69ff51..3e22fa839e14 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 7adf01316d50..73ae91c2e985 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 2b273bb65537..38f9d794abfb 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 4193690dc3d7..f56e688b4110 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 6ae81609eec8..844d692425b9 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 ec2c821f6e8c..c1b43a00f52f 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 7582a6efe624..e3ea6d4afa52 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 6727101d3fe7..04b4b8e7b85f 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;