Merge pull request #234016 from wegank/tools-fetchpypi

treewide/tools: use top-level fetchPypi

pkgs/tools/audio/patray/default.nix

···
 { lib
 , python3
+, fetchPypi
 , qt5
 }:
 
···
   pname = "patray";
   version = "0.1.1";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit version pname;
     sha256 = "0vaapn2p4257m1d5nbnwnh252b7lhl00560gr9pqh2b7xqm1bh6g";
   };

pkgs/tools/audio/spotdl/default.nix

···
 { lib
 , python3
+, fetchPypi
 , fetchFromGitHub
 , ffmpeg
 }:
···
     packageOverrides = self: super: {
       ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec {
         version = "0.25.1";
-        src = self.fetchPypi {
+        src = fetchPypi {
           inherit (old) pname;
           inherit version;
           hash = "sha256-uc/fgDetSYaCRzff0SzfbRhs3TaKrfE2h6roWkkj8yQ=";

pkgs/tools/backup/borgbackup/default.nix

···
 , installShellFiles
 , nixosTests
 , fetchpatch
+, fetchPypi
 }:
 
 python3.pkgs.buildPythonApplication rec {
···
   version = "1.2.3";
   format = "pyproject";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-4yQY+GM8lvqWgTUqVutjuY4pQgNHLBFKUkJwnTaWZ4U=";
   };

pkgs/tools/backup/borgmatic/default.nix

···
 , borgbackup
 , coreutils
 , python3Packages
+, fetchPypi
 , systemd
 , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
 , installShellFiles
···
   pname = "borgmatic";
   version = "1.7.9";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-v3Qxwy7V6rqX90G4/Xp6mVTUkrqDXmudgh3th0GCjuk=";
   };

pkgs/tools/backup/gh2md/default.nix

···
 { lib
 , python3Packages
+, fetchPypi
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "gh2md";
   version = "2.0.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "7a277939d4781f4ca741eccb74fc70f0aa85811185da52219878129cba7f1d77";
   };

pkgs/tools/backup/grab-site/default.nix

···
-{ lib, python38, fetchFromGitHub }:
+{ lib, python38, fetchPypi, fetchFromGitHub }:
 let
   python = python38.override {
     self = python;
     packageOverrides = self: super: {
       sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
         version = "1.3.24";
-        src = super.fetchPypi {
+        src = fetchPypi {
           inherit (oldAttrs) pname;
           inherit version;
           hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";

pkgs/tools/backup/rdiff-backup/default.nix

···
-{ lib, python3Packages, librsync }:
+{ lib, python3Packages, fetchPypi, librsync }:
 
 let
   pypkgs = python3Packages;
···
   pname = "rdiff-backup";
   version = "2.0.5";
 
-  src = pypkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s=";
   };

pkgs/tools/backup/zfs-autobackup/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 let
   pythonPackages = python3Packages;
···
   pname = "zfs_autobackup";
   version = "3.1";
 
-  src = pythonPackages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "42c22001717b3d7cfdae6297fedc11b2dd1eb2a4bd25b6bb1c9232dd3b70ad67";
   };

pkgs/tools/filesystems/ceph/default.nix

···
 , runCommand
 , fetchurl
 , fetchFromGitHub
+, fetchPypi
 
 # Build time
 , cmake
···
     packageOverrides = self: super: {
       sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
         version = "1.4.46";
-        src = super.fetchPypi {
+        src = fetchPypi {
           pname = "SQLAlchemy";
           inherit version;
           hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";

pkgs/tools/graphics/graph-cli/default.nix

···
 { lib
 , python3Packages
+, fetchPypi
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "graph-cli";
   version = "0.1.18";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit version;
     pname = "graph_cli";
     sha256 = "sha256-0mxOc8RJ3GNgSbppLylIViqfYf6zwJ49pltnsyQUpSA=";

pkgs/tools/graphics/shot-scraper/default.nix

···
 { lib
 , python3
+, fetchPypi
 }:
 
 python3.pkgs.buildPythonApplication rec {
···
 
   disabled = python3.pkgs.pythonOlder "3.6";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-YfWiy44rCRXK5xVkmA9X7pAlDhZrk6nS9vbC2eYvjbg=";
   };

pkgs/tools/networking/circus/default.nix

···
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:
 
 let
   python = python3.override {
···
     };
   };
 
-  inherit (python.pkgs) buildPythonApplication fetchPypi iowait psutil pyzmq tornado mock six;
+  inherit (python.pkgs) buildPythonApplication iowait psutil pyzmq tornado mock six;
 in
 
 buildPythonApplication rec {

pkgs/tools/networking/moodle-dl/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "moodle-dl";
   version = "2.2.2.4";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-76JU/uYJH7nVWCR+d8vvjYCCSMfe/8R9l756AmzZPHU=";
   };

pkgs/tools/networking/picosnitch/default.nix

···
 { lib
 , python3
+, fetchPypi
 , bcc
 }:
 
···
   pname = "picosnitch";
   version = "0.12.0";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "b87654b4b92e28cf5418388ba1d3165b9fa9b17ba91af2a1a942f059128f68bc";
   };

pkgs/tools/networking/s4cmd/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "s4cmd";
   version = "2.1.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0d4mx98i3qhvlmr9x898mjvf827smzx6x5ji6daiwgjdlxc60mj2";
   };

pkgs/tools/networking/updog/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "updog";
   version = "1.4";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "7n/ddjF6eJklo+T79+/zBxSHryebc2W9gxwxsb2BbF4=";
   };

pkgs/tools/package-management/auditwheel/default.nix

···
 , bzip2
 , patchelf
 , python3
+, fetchPypi
 , gnutar
 , unzip
 }:
···
   version = "5.1.2";
   format = "setuptools";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-PuWDABSTHqhK9c0GXGN7ZhTvoD2biL2Pv8kk5+0B1ro=";
   };

pkgs/tools/security/ghdorker/default.nix

···
 { lib
 , python3
+, fetchPypi
 }:
 
 python3.pkgs.buildPythonApplication rec {
···
   version = "0.3.2";
   format = "setuptools";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU=";
   };

pkgs/tools/security/kerbrute/default.nix

···
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "kerbrute";
   version = "0.0.2";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-ok/yttRSkCaEdV4aM2670qERjgDBll6Oi3L5TV5YEEA=";
   };

pkgs/tools/security/onlykey-agent/default.nix

···
 { lib
 , python3Packages
+, fetchPypi
 , onlykey-cli
 }:
 
···
   pname = "onlykey-agent";
   version = "1.1.13";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-GAb6crtW6rLAbFtdi6fAGCPjXpKFhravguoGjuNcIxc=";
   };

pkgs/tools/security/onlykey-cli/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "onlykey-cli";
   version = "1.2.9";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit version;
     pname = "onlykey";
     sha256 = "sha256-92CzDZgtmww0eABtjeBo6HNQ00sijWakjXLPJiOXY/A=";

pkgs/tools/security/sshuttle/default.nix

···
 { lib
 , stdenv
 , python3Packages
+, fetchPypi
 , makeWrapper
 , coreutils
 , iptables
···
   pname = "sshuttle";
   version = "1.1.1";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-9aPtHlqxITx6bfhgr0HxqQOrLK+/73Hzcazc/yHmnuY=";
   };

pkgs/tools/security/vulnix/default.nix

···
 { lib
 , python3Packages
+, fetchPypi
 , nix
 , ronn
 }:
···
   pname = "vulnix";
   version = "1.10.1";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "07v3ddvvhi3bslwrlin45kz48i3va2lzd6ny0blj5i2z8z40qcfm";
   };

pkgs/tools/system/krakenx/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "krakenx";
   version = "0.0.3";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "1khw1rxra5hn7hwp16i6kgj89znq8vjsyly3r2dxx2z2bddil000";
   };

pkgs/tools/system/s-tui/default.nix

···
 { lib
 , stdenv
 , python3Packages
+, fetchPypi
 , nix-update-script
 , s-tui
 , testers
···
   pname = "s-tui";
   version = "1.1.4";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-soVrmzlVy0zrqvOclR7SfPphp4xAEHv+xdr0NN19ye0=";
   };

pkgs/tools/text/csvkit/default.nix

···
 { lib
 , python3
+, fetchPypi
 }:
 
 let
···
     packageOverrides = self: super: {
       sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
         version = "1.4.46";
-        src = super.fetchPypi {
+        src = fetchPypi {
           pname = "SQLAlchemy";
           inherit version;
           hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
···
   version = "1.1.1";
   format = "setuptools";
 
-  src = python.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-vt23t49rIq2+1urVrV3kv7Md0sVfMhGyorO2VSkEkiM=";
   };

pkgs/tools/text/fanficfare/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "FanFicFare";
   version = "4.8.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0h20cw9z6k3z42fhl48pfxcqrk3i45zp4f4xm6pz7jqjzi17h9fk";
   };

pkgs/tools/text/rst2html5/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonPackage rec {
   pname = "rst2html5";
   version = "2.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-Ejjja/fm6wXTf9YtjCYZsNDB8X5oAtyPoUIsYFDuZfc=";
   };

pkgs/tools/video/vcsi/default.nix

···
-{ lib, python3Packages, ffmpeg }:
+{ lib, python3Packages, fetchPypi, ffmpeg }:
 
 python3Packages.buildPythonApplication rec {
   pname = "vcsi";
   version = "7.0.13";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "01qwbb2l8gwf622zzhh0kzdzw3njvsdwmndwn01i9bn4qm5cas8r";
   };

pkgs/tools/virtualization/awsebcli/default.nix

···
-{ lib, python3, glibcLocales, docker-compose_1 }:
+{ lib, python3, fetchPypi, glibcLocales, docker-compose_1 }:
 let
   docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override {
     inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko;
···
             PYTHONPATH="tests/lib3:$PYTHONPATH" ${localPython.interpreter} -m test_all
             runHook postCheck
           '';
-          src = localPython.pkgs.fetchPypi {
+          src = fetchPypi {
             pname = "PyYAML";
             inherit version;
             hash = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4=";