treewide: misc: use top-level fetchPypi

This commit is contained in:
Weijia Wang 2023-05-25 17:07:31 +03:00
parent 342c730a0c
commit 13600367b2
43 changed files with 93 additions and 74 deletions

View file

@ -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=";
};

View file

@ -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=";
};

View file

@ -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";
};

View file

@ -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=";
};

View file

@ -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=";
};

View file

@ -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";
};

View file

@ -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=";
};

View file

@ -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=";
};

View file

@ -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=";

View file

@ -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=";

View file

@ -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";
};

View file

@ -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=";

View file

@ -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";
};

View file

@ -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=";
};

View file

@ -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=";
};

View file

@ -1,5 +1,6 @@
{ lib
, python3Packages
, fetchPypi
}:
let
@ -9,7 +10,7 @@ in
python3Packages.buildPythonApplication {
inherit pname version;
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit version;
pname = "${lib.replaceStrings ["-"] ["_"] pname}";
hash = "sha256-retnbxjdjo+NeA1B0+jpM9kToAX/Rh0ze0yNF9AfDiU=";

View file

@ -1,10 +1,10 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonPackage rec {
pname = "doge";
version = "3.5.0";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "0lwdl06lbpnaqqjk8ap9dsags3bzma30z17v0zc7spng1gz8m6xj";
};

View file

@ -1,10 +1,10 @@
{ lib, python3, netcat-openbsd, nix-update-script }:
{ lib, python3, fetchPypi, netcat-openbsd, nix-update-script }:
python3.pkgs.buildPythonApplication rec {
pname = "flashfocus";
version = "2.3.1";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XT3CKJWn1uKnPPsJC+MWlEAd8sWdVTEXz5b3n0UUedY=";
};

View file

@ -1,10 +1,10 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "i3a";
version = "2.0.1";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
hash = "sha256-2k1HYtgJ76qXLvX6RmOSKtMMg+K722n8U9YmBANvQvE=";
};

View file

@ -1,10 +1,10 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonPackage rec {
pname = "present";
version = "0.6.0";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c=";
};

View file

@ -1,12 +1,13 @@
{ lib
, python3Packages
, fetchPypi
}:
python3Packages.buildPythonApplication rec {
pname = "addic7ed-cli";
version = "1.4.6";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "182cpwxpdybsgl1nps850ysvvjbqlnx149kri4hxhgm58nqq0qf5";
};

View file

@ -1,10 +1,10 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "colorz";
version = "1.0.3";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "0ghd90lgplf051fs5n5bb42zffd3fqpgzkbv6bhjw7r8jqwgcky0";
};

View file

@ -1,10 +1,10 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "doitlive";
version = "4.3.0";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "03qrs032x206xrl0x3z0fpvxgjivzz9rkmb11bqlk1id10707cac";
};

View file

@ -1,10 +1,10 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "edir";
version = "2.16";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "ro1GZkJ6xDZcMRaWTAW/a2qhFbZAxsduvGO3C4sOI+A=";
};

View file

@ -1,12 +1,13 @@
{ lib,
python3,
fetchPypi,
}:
python3.pkgs.buildPythonApplication rec {
pname = "gay";
version = "1.2.9";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
hash = "sha256-x+RVVgQvJwV5j7DLYS7AnXb4OMJ4v+l0awUuonQIgzY=";
};

View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, python3
, fetchPypi
, git
}:
@ -9,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
version = "1.3.0";
format = "setuptools";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
hash = "sha256-kNtybgv8j7t1tl6R5ZuC4vj5fnEcEenuNt0twA1kAh0=";
};

View file

@ -1,5 +1,6 @@
{ lib
, python3
, fetchPypi
, git
, git-lfs
}:
@ -8,7 +9,7 @@ python3.pkgs.buildPythonApplication rec {
pname = "github-backup";
version = "0.42.0";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-tFfS3Z7xrbN2QEOrYcUVd8/YwGKfmR2NaUBeXuSL+tY=";
};

View file

@ -1,10 +1,10 @@
{ lib, python3Packages, withTwitter ? false}:
{ lib, python3Packages, fetchPypi, withTwitter ? false}:
python3Packages.buildPythonApplication rec {
pname = "mailman-rss";
version = "0.2.4";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00";
};

View file

@ -1,5 +1,6 @@
{ lib
, python3
, fetchPypi
}:
python3.pkgs.buildPythonApplication rec {
@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec {
version = "1.1.1";
format = "pyproject";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
hash = "sha256-SvKjjE629OwxWsPo2egGf2K6GzlWAYYStarHhA4Ex0w=";
};

View file

@ -1,11 +1,11 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "mloader";
version = "1.1.9";
format = "setuptools";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19";
};

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, python39
, fetchPypi
, fetchFromGitHub
, fetchpatch
, withXmpp ? !stdenv.isDarwin
@ -19,7 +20,7 @@ let
# databases, on which slack-sdk depends, 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=";

View file

@ -1,11 +1,11 @@
{ stdenv, lib, python3Packages }:
{ stdenv, lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "piston-cli";
version = "1.4.3";
format = "pyproject";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY=";
};

View file

@ -1,5 +1,6 @@
{ lib
, python3
, fetchPypi
, pkgsCross
, avrdude
, dfu-programmer
@ -14,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
version = "1.1.2";
format = "pyproject";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
hash = "sha256-+HH4jxoMoxujGgCdcWQX5GvFOKT4347eaoAckHbCKZg=";
};

View file

@ -1,10 +1,10 @@
{ lib, python3Packages, jpegoptim, optipng }:
{ lib, python3Packages, fetchPypi, jpegoptim, optipng }:
python3Packages.buildPythonApplication rec {
pname = "sacad";
version = "2.4.0";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KLVkyiXjpqskM67W9uPl9aPKc3pYMu0nAfwI0OpOniE=";
};

View file

@ -1,11 +1,11 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "scdl";
version = "2.7.3";
format = "setuptools";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "60284b7b058040d4847f2e4b0ab906b10e959d51f976a0188641e8e10685474f";
};

View file

@ -1,12 +1,13 @@
{ lib
, python3
, fetchPypi
}:
python3.pkgs.buildPythonApplication rec {
pname = "semiphemeral";
version = "0.6";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "c90d73b14c826f262b1339d1f5926c5abc6431181090ea87177af821c0866fb7";
};

View file

@ -1,5 +1,6 @@
{ lib
, python3
, fetchPypi
, nix-update-script
}:
@ -8,7 +9,7 @@ python3.pkgs.buildPythonApplication rec {
version = "0.9.0";
format = "pyproject";
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KzW9yI1TGG2hFKeXHFqqYCLw/PB9+lJoTgyWrXxCHpo=";
};

View file

@ -1,10 +1,10 @@
{ lib, python3Packages }:
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec {
pname = "termtosvg";
version = "1.1.0";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "1vk5kn8w3zf2ymi76l8cpwmvvavkmh3b9lb18xw3x1vzbmhz2f7d";
};

View file

@ -1,4 +1,4 @@
{ lib, python3Packages, installShellFiles }:
{ lib, python3Packages, fetchPypi, installShellFiles }:
let
pypkgs = python3Packages;
@ -8,7 +8,7 @@ pypkgs.buildPythonApplication rec {
pname = "tmuxp";
version = "1.27.0";
src = pypkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QAk+rcNYjhAgkJX2fa0bl3dHrB4yyYQ/oNlUX3IQMR8=";
};

View file

@ -1,5 +1,6 @@
{ lib
, python3
, fetchPypi
}:
let
@ -8,7 +9,7 @@ let
# tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6
requests-cache = prev.requests-cache.overridePythonAttrs (oldAttrs: rec {
version = "0.5.2";
src = final.fetchPypi {
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "sha256-gTAjJpaGBF+OAeIonMHn6a5asi3dHihJqQk6s6tycOs=";
@ -32,7 +33,7 @@ pypkgs.buildPythonApplication rec {
pname = "tvnamer";
version = "3.0.4";
src = pypkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04";
};

View file

@ -1,4 +1,4 @@
{ lib, python3Packages, ffmpeg }:
{ lib, python3Packages, fetchPypi, ffmpeg }:
python3Packages.buildPythonApplication rec {
pname = "twspace-dl";
@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec {
format = "pyproject";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit version;
pname = "twspace_dl";
sha256 = "050e78b4583374351c288114e3b01ab34b0b19ad2d4971d15c5519521cf3f2f4";

View file

@ -1,5 +1,6 @@
{ lib
, python3
, fetchPypi
, substituteAll
, ffmpeg
, installShellFiles
@ -14,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
# probably aren't suitable for a build environment anyway.
doCheck = false;
src = python3.pkgs.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-s8lEz3pjzEaMzMiBbc5/wAjC5rW6Uq7+XOIIGBijrUc=";
};

View file

@ -1,5 +1,6 @@
{ lib
, python3Packages
, fetchPypi
, yt-dlp
, ffmpeg
}:
@ -8,7 +9,7 @@ python3Packages.buildPythonApplication rec {
pname = "ytmdl";
version = "2022.03.16";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
sha256 = "sha256-2lEOgwSi4fAVK+gJXvjWQDBWIb1cODFmUiq0FUfpyXA=";