b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #234041 from wegank/explicit-fetchpypi

Browse source 
treewide: make fetchPypi more explicit
This commit is contained in:
Weijia Wang 2023-05-25 22:33:02 +03:00 committed by GitHub
parent 8b829c42fa 6e7c0b97d4
commit ba5d0dc56b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/audio/miniplayer/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
}: }:
with python3Packages; with python3Packages;

2
pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
with python3Packages; with python3Packages;

1
pkgs/applications/misc/ablog/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
with python3.pkgs; with python3.pkgs;

2
pkgs/applications/misc/archivy/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, stdenv
, python3 , python3
, fetchPypi
}: }:
let let

2
pkgs/applications/misc/cum/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
with python3Packages; with python3Packages;

2
pkgs/applications/misc/pyditz/default.nix
View file

@ -1,4 +1,4 @@
{ lib, pythonPackages }: { lib, pythonPackages, fetchPypi }:
with pythonPackages; with pythonPackages;

1
pkgs/applications/misc/safeeyes/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, alsa-utils , alsa-utils
, gobject-introspection , gobject-introspection
, libappindicator-gtk3 , libappindicator-gtk3

2
pkgs/applications/misc/shell-genie/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, python3 , python3
, fetchFromGitHub , fetchPypi
}: }:
with python3.pkgs; with python3.pkgs;

1
pkgs/applications/misc/vit/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
, taskwarrior , taskwarrior
, glibcLocales , glibcLocales
}: }:

1
pkgs/applications/networking/instant-messengers/turses/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, fetchpatch , fetchpatch
, fetchFromGitHub , fetchFromGitHub
, fetchPypi
, python3 , python3
}: }:

1
pkgs/applications/video/catt/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchPypi
, python3 , python3
}: }:

1
pkgs/development/python-modules/tasklib/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, pythonPackages , pythonPackages
, fetchPypi
, taskwarrior , taskwarrior
, writeShellScriptBin , writeShellScriptBin
}: }:

1
pkgs/development/tools/agda-pkg/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
}: }:
with python3Packages; with python3Packages;

2
pkgs/development/tools/mbed-cli/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages, git, mercurial }: { lib, python3Packages, fetchPypi, git, mercurial }:
with python3Packages; with python3Packages;

2
pkgs/development/tools/pew/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
with python3.pkgs; with python3.pkgs;

1
pkgs/development/tools/pipenv/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, python3 , python3
, fetchPypi
, installShellFiles , installShellFiles
}: }:

2
pkgs/development/tools/rdbtools/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python }: { lib, python, fetchPypi }:
with python.pkgs; with python.pkgs;

1
pkgs/development/tools/reno/default.nix
View file

@ -2,6 +2,7 @@
, git , git
, gnupg1 , gnupg1
, python3Packages , python3Packages
, fetchPypi
}: }:
with python3Packages; buildPythonApplication rec { with python3Packages; buildPythonApplication rec {

2
pkgs/development/tools/vcstool/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages { lib, python3Packages, fetchPypi
, git, breezy, subversion }: , git, breezy, subversion }:
with python3Packages; with python3Packages;

2
pkgs/servers/geospatial/mapproxy/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, pkgs
, python3 , python3
, fetchPypi
}: }:
with python3.pkgs; with python3.pkgs;

1
pkgs/servers/mail/mailman/hyperkitty.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, fetchpatch , fetchpatch
}: }:

1
pkgs/servers/mail/mailman/mailman-hyperkitty.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, mailman , mailman
}: }:

1
pkgs/servers/mail/mailman/package.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, fetchpatch , fetchpatch
, python3 , python3
, fetchPypi
, docutils , docutils
, sphinx , sphinx
, postfix , postfix

2
pkgs/servers/mail/mailman/postorius.nix
View file

@ -1,4 +1,4 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
with python3.pkgs; with python3.pkgs;

2
pkgs/servers/mail/mailman/web.nix
View file

@ -1,4 +1,4 @@
{ lib, python3 { lib, python3, fetchPypi
, sassc, hyperkitty, postorius , sassc, hyperkitty, postorius
}: }:

1
pkgs/tools/admin/awscli/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, python3 , python3
, fetchFromGitHub , fetchFromGitHub
, fetchPypi
, groff , groff
, less , less
}: }:

2
pkgs/tools/admin/chkcrontab/default.nix
View file

@ -1,4 +1,4 @@
{ python3, lib }: { lib, python3, fetchPypi }:
with python3.pkgs; with python3.pkgs;

2
pkgs/tools/admin/iredis/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
with python3Packages; with python3Packages;

1
pkgs/tools/admin/mycli/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, glibcLocales , glibcLocales
}: }:

2
pkgs/tools/misc/adafruit-ampy/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
with python3.pkgs; with python3.pkgs;

5
pkgs/tools/misc/bepasty/default.nix
View file

@ -1,5 +1,6 @@
{ python3 { lib
, lib , python3
, fetchPypi
}: }:
let let

1
pkgs/tools/misc/bkyml/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
with python3.pkgs; with python3.pkgs;

2
pkgs/tools/misc/pipreqs/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
with python3.pkgs; with python3.pkgs;

1
pkgs/tools/misc/wlc/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
with python3.pkgs; with python3.pkgs;

2
pkgs/tools/misc/yutto/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, python3 , python3
, fetchPypi
, ffmpeg , ffmpeg
, makeWrapper
, nix-update-script , nix-update-script
}: }:

2
pkgs/tools/networking/mutt-ics/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
with python3.pkgs; buildPythonApplication rec { with python3.pkgs; buildPythonApplication rec {
pname = "mutt-ics"; pname = "mutt-ics";

2
pkgs/tools/networking/nyx/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
with python3Packages; with python3Packages;

2
pkgs/tools/networking/pirate-get/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
with python3Packages; with python3Packages;

2
pkgs/tools/package-management/pdm/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3, fetchFromGitHub, fetchurl }: { lib, python3, fetchFromGitHub, fetchPypi }:
let let
python = python3.override { python = python3.override {
# override resolvelib due to # override resolvelib due to

2
pkgs/tools/security/pynitrokey/default.nix
View file

@ -1,4 +1,4 @@
{ python3Packages, lib, nrfutil, libnitrokey }: { lib, python3Packages, fetchPypi, nrfutil, libnitrokey }:
with python3Packages; with python3Packages;