Merge pull request #234006 from figsoda/pypi

treewide/applications: use top-level fetchPypi

pkgs/applications/graphics/displaycal/default.nix

···
 { lib
 , python3
-, xorg
-, argyllcms
+, fetchPypi
 , wrapGAppsHook
 , gtk3
 , librsvg
+, xorg
+, argyllcms
 }:
 
 python3.pkgs.buildPythonApplication rec {
···
   version = "3.9.10";
   format = "setuptools";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     pname = "DisplayCAL";
     inherit version;
     hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs=";

pkgs/applications/graphics/dosage/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "dosage";
   version = "2.17";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0";
   };

pkgs/applications/graphics/kcc/default.nix

···
 { lib
 , mkDerivationWith
 , python3Packages
+, fetchPypi
 , p7zip
 , archiveSupport ? true
 }:
···
   pname = "kcc";
   version = "5.5.1";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit version;
     pname = "KindleComicConverter";
     sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";
···
 
   qtWrapperArgs = lib.optionals archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ];
 
-  postFixup =  ''
+  postFixup = ''
     wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}"
   '';
 

pkgs/applications/graphics/veusz/default.nix

···
-{ python3Packages
+{ lib
+, python3Packages
+, fetchPypi
+, wrapQtAppsHook
 , qtbase
-, wrapQtAppsHook
-, lib
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "veusz";
   version = "3.6.2";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "whcaxF5LMEJNj8NSYeLpnb5uJboRl+vCQ1WxBrJjldE=";
   };

pkgs/applications/misc/meerk40t/default.nix

···
 , wrapGAppsHook
 }:
 
-let
-  inherit (python3.pkgs) buildPythonApplication buildPythonPackage fetchPypi;
-in
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "MeerK40t";
   version = "0.8.1000";
   format = "setuptools";

pkgs/applications/networking/cluster/luigi/default.nix

···
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "luigi";
   version = "3.0.2";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb";
   };
···
   doCheck = false;
 
   # This enables accessing modules stored in cwd
-  makeWrapperArgs = ["--prefix PYTHONPATH . :"];
+  makeWrapperArgs = [ "--prefix PYTHONPATH . :" ];
 
   meta = with lib; {
     description = "Python package that helps you build complex pipelines of batch jobs";
···
     '';
     homepage = "https://github.com/spotify/luigi";
     changelog = "https://github.com/spotify/luigi/releases/tag/${version}";
-    license =  [ licenses.asl20 ];
+    license = [ licenses.asl20 ];
     maintainers = [ maintainers.bhipple ];
   };
 }

pkgs/applications/networking/dyndns/dyndnsc/default.nix

···
-{ stdenv, lib, python3Packages }:
+{ lib, python3Packages, fetchPypi, stdenv }:
 
 python3Packages.buildPythonApplication rec {
   pname = "dyndnsc";
   version = "0.6.1";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "13078d29eea2f9a4ca01f05676c3309ead5e341dab047e0d51c46f23d4b7fbb4";
   };

pkgs/applications/networking/feedreaders/gnome-feeds/listparser.nix

···
 { lib
 , python3
+, fetchPypi
 }:
+
 python3.pkgs.buildPythonPackage rec {
   pname = "listparser";
   version = "0.18";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b";
   };

pkgs/applications/networking/flexget/default.nix

···
 { lib
 , python3
+, fetchPypi
 , fetchFromGitHub
 }:
 
···
     packageOverrides = self: super: {
       sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
         version = "1.4.48";
-        src = self.fetchPypi {
+        src = fetchPypi {
           pname = "SQLAlchemy";
           inherit version;
           hash = "sha256-tHvChwltmJoIOM6W99jpZpFKJNqHftQadTHUS1XNuN8=";

pkgs/applications/networking/mailreaders/afew/default.nix

···
-{ lib, python3Packages, notmuch }:
+{ lib, python3Packages, fetchPypi, notmuch }:
 
 python3Packages.buildPythonApplication rec {
   pname = "afew";
   version = "3.0.1";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff";
   };

pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix

···
-{ lib, python3, notmuch }:
+{ lib, python3, fetchPypi }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "mlarchive2maildir";
   version = "0.0.9";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs";
   };

pkgs/applications/office/fava/default.nix

···
-{ lib, python3 }:
+{ lib, python3, fetchPypi }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fava";
   version = "1.24.4";
   format = "pyproject";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-klRPe6NQMn3HVayfCGc05mB0afi3x4Wlj3EI0XdSkMc=";
   };

pkgs/applications/office/pympress/default.nix

···
 { lib
 , stdenv
 , python3Packages
+, fetchPypi
 , wrapGAppsHook
 , gtk3
 , gobject-introspection
···
 , poppler_gi
 , withGstreamer ? stdenv.isLinux
 , withVLC ? stdenv.isLinux
- }:
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "pympress";
   version = "1.7.2";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "LFUzrGHr8jmUqoIcKokC0gNDVmW1EUZlj9eI+GDycvI=";
   };

pkgs/applications/office/pyspread/default.nix

···
 { lib
+, python3
+, fetchPypi
 , copyDesktopItems
+, wrapQtAppsHook
+, qtsvg
 , makeDesktopItem
-, python3
-, qtsvg
-, wrapQtAppsHook
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pyspread";
   version = "2.0.2";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-rg2T9Y9FU2a+aWg0XM8jyQB9t8zDVlpad3TjUcx4//8=";
   };

pkgs/applications/office/tryton/default.nix

···
 { lib
 , python3Packages
+, fetchPypi
 , pkg-config
 , librsvg
 , gobject-introspection
···
 
   disabled = !python3Packages.isPy3k;
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "1rca19krvmycdhmi1vb4ixwq0cagmrkhbqry4f19b725nlp8cv0q";
   };

pkgs/applications/science/biology/MACS2/default.nix

···
-{ lib, python3, fetchurl }:
+{ lib, python3, fetchPypi }:
 
 python3.pkgs.buildPythonPackage rec {
   pname = "MACS2";
   version = "2.2.7.1";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "1rcxj943kgzs746f5jrb72x1cp4v50rk3qmad0m99a02vndscb5d";
   };

pkgs/applications/science/electronics/flatcam/default.nix

···
 { lib
 , stdenv
 , python3
+, fetchPypi
 , fetchFromBitbucket
 , fetchpatch
 , substituteAll
···
     packageOverrides = self: super: {
       shapely = super.shapely.overridePythonAttrs (old: rec {
         version = "1.8.4";
-        src = self.fetchPypi {
+        src = fetchPypi {
           pname = "Shapely";
           inherit version;
           hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw=";
···
       });
     };
   };
-in python.pkgs.buildPythonApplication rec {
+in
+python.pkgs.buildPythonApplication rec {
   pname = "flatcam";
   version = "8.5";
 

pkgs/applications/search/xlsxgrep/default.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "xlsxgrep";
   version = "0.0.23";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm";
   };

pkgs/applications/version-management/bumpver/default.nix

···
-{ lib, python3, git, mercurial}:
+{ lib, python3, fetchPypi, git, mercurial }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "bumpver";
   version = "2021.1110";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03";
   };
···
 
   propagatedBuildInputs = with python3.pkgs; [ pathlib2 click toml lexid colorama setuptools ];
 
-  nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial];
+  nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial ];
 
   disabledTests = [
     # fails due to more aggressive setuptools version specifier validation

pkgs/applications/version-management/git-aggregator/default.nix

···
-{ lib, git, python3Packages }:
+{ lib, python3Packages, fetchPypi, git }:
 
 python3Packages.buildPythonApplication rec {
   pname = "git-aggregator";
   version = "2.1.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw=";
   };

pkgs/applications/version-management/git-big-picture/default.nix

···
-{ python3Packages, lib, git, graphviz }:
+{ lib, python3Packages, fetchPypi, git, graphviz }:
 
 python3Packages.buildPythonApplication rec {
   pname = "git-big-picture";
   version = "1.1.1";
   format = "wheel";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit format version;
-    pname = "git_big_picture";  # underscores needed for working download URL
-    python = "py3";  # i.e. no Python 2.7
+    pname = "git_big_picture"; # underscores needed for working download URL
+    python = "py3"; # i.e. no Python 2.7
     sha256 = "a20a480057ced1585c4c38497d27a5012f12dd29697313f0bb8fa6ddbb5c17d8";
   };
 
   postFixup = ''
     wrapProgram $out/bin/git-big-picture \
       --prefix PATH ":" ${ lib.makeBinPath [ git graphviz ]  }
-    '';
+  '';
 
   meta = {
     description = "Tool for visualization of Git repositories";

pkgs/applications/version-management/git-up/default.nix

···
 { lib
 , pythonPackages
+, fetchPypi
 , git
 }:
 
···
   pname = "git-up";
   version = "1.6.1";
 
-  src = pythonPackages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
   };
···
   # 2. $HOME is by default not a valid dir, so we have to set that too
   # https://github.com/NixOS/nixpkgs/issues/12591
   preCheck = ''
-      export HOME=$TMPDIR
-      git config --global user.email "[e-mail]"
-      git config --global user.name "Nobody"
-    '';
+    export HOME=$TMPDIR
+    git config --global user.email "[e-mail]"
+    git config --global user.name "Nobody"
+  '';
 
   postInstall = ''
     rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests

pkgs/applications/version-management/gomp/default.nix

···
 { lib
 , python3Packages
- }:
+, fetchPypi
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "gomp";
   version = "1.1.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb";
   };

pkgs/applications/version-management/legit/default.nix

···
 { lib
 , python3Packages
+, fetchPypi
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "legit";
   version = "1.2.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c";
   };

pkgs/applications/version-management/nbstripout/default.nix

···
 { lib
 , python3
+, fetchPypi
 , coreutils
 , git
 , mercurial
···
   version = "0.6.1";
   pname = "nbstripout";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM=";
   };

pkgs/applications/video/pyca/default.nix

···
-{ stdenv, lib, python3, fetchFromGitHub, buildNpmPackage, jq }:
+{ lib
+, python3
+, fetchPypi
+, buildNpmPackage
+, fetchFromGitHub
+, jq
+, stdenv
+}:
 
 let
   python = python3.override {
···
       # pyCA is incompatible with SQLAlchemy 2.0
       sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
         version = "1.4.46";
-        src = self.fetchPypi {
+        src = fetchPypi {
           pname = "SQLAlchemy";
           inherit version;
           hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";

pkgs/applications/video/streamlink/default.nix

···
 { lib
 , python3Packages
+, fetchPypi
 , ffmpeg
-, fetchpatch
 }:
 
 python3Packages.buildPythonApplication rec {
···
   version = "5.3.0";
   format = "pyproject";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-+9MSSzPYZ8gwOeQLehR41SklfdcUn8Pa6TI//lh9twE=";
   };

pkgs/applications/window-managers/i3/altlayout.nix

···
-{ lib, python3Packages }:
+{ lib, python3Packages, fetchPypi }:
 
 python3Packages.buildPythonApplication rec {
   pname = "i3altlayout";
   version = "0.3";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf";
   };