From 13600367b2e10cd4cb7cefc618e338a2e715bac3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 25 May 2023 17:07:31 +0300 Subject: treewide: misc: use top-level fetchPypi --- pkgs/applications/misc/archivebox/default.nix | 3 ++- pkgs/applications/misc/chatblade/default.nix | 4 ++-- pkgs/applications/misc/dotfiles/default.nix | 4 ++-- pkgs/applications/misc/etesync-dav/default.nix | 3 ++- pkgs/applications/misc/keepmenu/default.nix | 4 ++-- pkgs/applications/misc/khard/default.nix | 4 ++-- pkgs/applications/misc/meerk40t/camera.nix | 5 +++-- pkgs/applications/misc/nhentai/default.nix | 4 ++-- pkgs/applications/misc/octoprint/default.nix | 5 +++-- pkgs/applications/misc/privacyidea/default.nix | 12 ++++++------ pkgs/applications/misc/pydf/default.nix | 4 ++-- pkgs/applications/misc/pytrainer/default.nix | 3 ++- pkgs/applications/misc/raiseorlaunch/default.nix | 4 ++-- pkgs/applications/misc/seashells/default.nix | 4 ++-- pkgs/applications/misc/sigal/default.nix | 3 ++- 15 files changed, 36 insertions(+), 30 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index c9f0a6d0a6d77..13d1554dcdb27 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi }: let @@ -31,7 +32,7 @@ python.pkgs.buildPythonApplication rec { pname = "archivebox"; version = "0.6.2"; - src = python.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY="; }; diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index a96f68c571379..ede64d0faaa78 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -1,11 +1,11 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "chatblade"; version = "0.2.3"; format = "setuptools"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk="; }; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 86a6cebc27c0e..52d5016200f99 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "dotfiles"; version = "0.6.4"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit version pname; sha256 = "03qis6m9r2qh00sqbgwsm883s4bj1ibwpgk86yh4l235mdw8jywv"; }; diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index abf01ff839506..301a5eb09b222 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -3,6 +3,7 @@ , fetchpatch , nixosTests , python3 +, fetchPypi , radicale3 }: @@ -44,7 +45,7 @@ in python.pkgs.buildPythonApplication rec { pname = "etesync-dav"; version = "0.32.1"; - src = python.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA="; }; diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/applications/misc/keepmenu/default.nix index 8cdbd69912d02..b448ebb06793c 100644 --- a/pkgs/applications/misc/keepmenu/default.nix +++ b/pkgs/applications/misc/keepmenu/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages, python3, xvfb-run }: +{ lib, python3Packages, fetchPypi, xvfb-run }: python3Packages.buildPythonApplication rec { pname = "keepmenu"; version = "1.2.2"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "SeVNtONH1bn2hb2pBOVM3Oafrb+jARgfvRe7vUu6Gto="; }; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index d4e6e8a472019..f80164026beb8 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,10 +1,10 @@ -{ lib, python3, khard, testers }: +{ lib, python3, fetchPypi, khard, testers }: python3.pkgs.buildPythonApplication rec { version = "0.18.0"; pname = "khard"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "05860fdayqap128l7i6bcmi9kdyi2gx02g2pmh88d56xgysd927y"; }; diff --git a/pkgs/applications/misc/meerk40t/camera.nix b/pkgs/applications/misc/meerk40t/camera.nix index 9d262488a67e3..ab2a70ad8eb27 100644 --- a/pkgs/applications/misc/meerk40t/camera.nix +++ b/pkgs/applications/misc/meerk40t/camera.nix @@ -1,16 +1,17 @@ { lib , python3 +, fetchPypi }: let - inherit (python3.pkgs) buildPythonPackage fetchPypi; + inherit (python3.pkgs) buildPythonPackage; in buildPythonPackage rec { pname = "meerk40t-camera"; version = "0.1.9"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-uGCBHdgWoorVX2XqMCg0YBweb00sQ9ZSbJe8rlGeovs="; }; diff --git a/pkgs/applications/misc/nhentai/default.nix b/pkgs/applications/misc/nhentai/default.nix index 6357389776d9b..f5284c1ad74de 100644 --- a/pkgs/applications/misc/nhentai/default.nix +++ b/pkgs/applications/misc/nhentai/default.nix @@ -1,9 +1,9 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "nhentai"; version = "0.4.16"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M="; }; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index e3c67137243b1..1af2571e48a24 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -4,6 +4,7 @@ , lib , fetchFromGitHub , python3 +, fetchPypi , substituteAll , nix-update-script , nixosTests @@ -31,7 +32,7 @@ let }); flask-babel = super.flask-babel.overridePythonAttrs (oldAttrs: rec { version = "2.0.0"; - src = super.fetchPypi { + src = fetchPypi { pname = "Flask-Babel"; inherit version; sha256 = "sha256-+fr0XNsuGjLqLsFEA1h9QpUQjzUBenghorGsuM/ZJX0="; @@ -44,7 +45,7 @@ let # downgrade needed for flask-babel 2.0.0 babel = super.babel.overridePythonAttrs (oldAttrs: rec { version = "2.11.0"; - src = super.fetchPypi { + src = fetchPypi { pname = "Babel"; inherit version; hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d9c44d4a5d78f..768729ad3034c 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cacert, openssl, nixosTests -, python310, fetchpatch +, python310, fetchPypi, fetchpatch }: let @@ -11,7 +11,7 @@ let 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="; @@ -24,7 +24,7 @@ let }); flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { version = "2.7.0"; - src = self.fetchPypi { + src = fetchPypi { pname = "Flask-Migrate"; inherit version; hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg="; @@ -33,7 +33,7 @@ let flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { version = "2.5.1"; format = "setuptools"; - src = self.fetchPypi { + src = fetchPypi { pname = "Flask-SQLAlchemy"; inherit version; hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; @@ -123,7 +123,7 @@ let pname = "Flask-Babel"; version = "2.0.0"; format = "setuptools"; - src = self.fetchPypi { + src = fetchPypi { inherit pname; inherit version; hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; @@ -155,7 +155,7 @@ let sphinx-rtd-theme = null; }).overridePythonAttrs (old: rec { version = "5.1.0"; - src = self.fetchPypi { + src = fetchPypi { inherit (old) pname; inherit version; hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU="; diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix index afec377e9b660..f02b97461a148 100644 --- a/pkgs/applications/misc/pydf/default.nix +++ b/pkgs/applications/misc/pydf/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonPackage rec { pname = "pydf"; version = "12"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "7f47a7c3abfceb1ac04fc009ded538df1ae449c31203962a1471a4eb3bf21439"; }; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 86aaae625c3e9..e283f0d46620a 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,5 +1,6 @@ { lib , python310 +, fetchPypi , fetchFromGitHub , gdk-pixbuf , gnome @@ -24,7 +25,7 @@ let }; sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { version = "1.4.46"; - src = self.fetchPypi { + src = fetchPypi { pname = "SQLAlchemy"; inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 88b215acdfa95..4eb924544be82 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "raiseorlaunch"; version = "2.3.3"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "3d694015d020a888b42564d56559213b94981ca2b32b952a49b2de4d029d2e59"; }; diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/applications/misc/seashells/default.nix index bc4d3cfdbfc3f..4ece0036c5304 100644 --- a/pkgs/applications/misc/seashells/default.nix +++ b/pkgs/applications/misc/seashells/default.nix @@ -1,11 +1,11 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "seashells"; version = "0.1.2"; format = "setuptools"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; }; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 5bf957ec7c1b8..7a3988a4cda33 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , python3 +, fetchPypi , ffmpeg }: @@ -9,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { version = "2.3"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit version pname; hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q="; }; -- cgit 1.4.1