Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-03-05 20:39:38 +01:00
31 changed files with 254 additions and 55 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.14.2)
html-proofer (3.18.6)
html-proofer (3.18.8)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
+4 -2
View File
@@ -1,4 +1,4 @@
{ bundlerEnv, ruby, lib }:
{ bundlerEnv, ruby, lib, bundlerUpdateScript }:
bundlerEnv rec {
name = "${pname}-${version}";
@@ -8,11 +8,13 @@ bundlerEnv rec {
inherit ruby;
gemdir = ./.;
passthru.updateScript = bundlerUpdateScript pname;
meta = with lib; {
description = "A tool to validate HTML files";
homepage = "https://github.com/gjtorikian/html-proofer";
license = licenses.mit;
maintainers = with maintainers; [ primeos ];
maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
+2 -2
View File
@@ -37,10 +37,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x8yq7hiv5wd44a0d0xhrqkjgaz3i1zjr2p6c0i7fbhq1wi8zy07";
sha256 = "0i5anzj9lp2m6bvghcbz16dlv5ww2mcwgkfj878mamgvb2pfk2m9";
type = "gem";
};
version = "3.18.6";
version = "3.18.8";
};
mercenary = {
groups = ["default"];
+39
View File
@@ -0,0 +1,39 @@
{ lib, python3Packages, jpegoptim, optipng }:
python3Packages.buildPythonApplication rec {
pname = "sacad";
version = "2.3.4";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1qv2mrz6vy2sl7zhrj9vw016pjd7hmjr2ls0w8bbv1hgrddicn9r";
};
propagatedBuildInputs = with python3Packages; [
aiohttp
appdirs
bitarray
cssselect
fake-useragent
lxml
mutagen
pillow
tqdm
unidecode
web-cache
jpegoptim
optipng
];
# tests require internet connection
doCheck = false;
pythonImportsCheck = [ "sacad" ];
meta = with lib; {
description = "Smart Automatic Cover Art Downloader";
homepage = "https://github.com/desbma/sacad";
license = licenses.mpl20;
maintainers = with maintainers; [ fortuneteller2k ];
};
}