treewide/applications: use top-level fetchPypi

7 files changed, 23 insertions, 19 deletions

diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix
index fb5e0c8322886..3a1a51f83f8ea 100644
--- a/pkgs/applications/version-management/bumpver/default.nix
+++ b/pkgs/applications/version-management/bumpver/default.nix
@@ -1,10 +1,10 @@
-{ 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";
   };
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
 
   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
diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix
index 3009edcb90a38..22127c1141106 100644
--- a/pkgs/applications/version-management/git-aggregator/default.nix
+++ b/pkgs/applications/version-management/git-aggregator/default.nix
@@ -1,10 +1,10 @@
-{ 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=";
   };
diff --git a/pkgs/applications/version-management/git-big-picture/default.nix b/pkgs/applications/version-management/git-big-picture/default.nix
index decd3c51a392f..959031fad9f95 100644
--- a/pkgs/applications/version-management/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-big-picture/default.nix
@@ -1,21 +1,21 @@
-{ 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";
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index 308c04b05d603..e4bd7e3ad8c10 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -1,5 +1,6 @@
 { lib
 , pythonPackages
+, fetchPypi
 , git
 }:
 
@@ -7,7 +8,7 @@ pythonPackages.buildPythonApplication rec {
   pname = "git-up";
   version = "1.6.1";
 
-  src = pythonPackages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
   };
@@ -29,10 +30,10 @@ pythonPackages.buildPythonApplication rec {
   # 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 "nobody@example.com"
-      git config --global user.name "Nobody"
-    '';
+    export HOME=$TMPDIR
+    git config --global user.email "nobody@example.com"
+    git config --global user.name "Nobody"
+  '';
 
   postInstall = ''
     rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests
diff --git a/pkgs/applications/version-management/gomp/default.nix b/pkgs/applications/version-management/gomp/default.nix
index efdef3b967f8c..3f60ba8b7acfc 100644
--- a/pkgs/applications/version-management/gomp/default.nix
+++ b/pkgs/applications/version-management/gomp/default.nix
@@ -1,12 +1,13 @@
 { lib
 , python3Packages
- }:
+, fetchPypi
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "gomp";
   version = "1.1.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb";
   };
diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/applications/version-management/legit/default.nix
index 33efad77f9089..fd2875b13be2a 100644
--- a/pkgs/applications/version-management/legit/default.nix
+++ b/pkgs/applications/version-management/legit/default.nix
@@ -1,12 +1,13 @@
 { lib
 , python3Packages
+, fetchPypi
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "legit";
   version = "1.2.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c";
   };
diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index e88f21a85cb15..027bba16e86c9 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -1,5 +1,6 @@
 { lib
 , python3
+, fetchPypi
 , coreutils
 , git
 , mercurial
@@ -9,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
   version = "0.6.1";
   pname = "nbstripout";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-kGW83RSIs4bk88CB/8HUj0UTovjYv00NmiggjF2v6dM=";
   };