Merge pull request #115307 from SuperSandro2000/cairosvg

This commit is contained in:
Sandro 2021-03-07 03:32:23 +01:00 committed by GitHub
commit d3cd26a20c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 12 deletions

View file

@ -1,6 +1,6 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub
, qmake, pkg-config, olm, wrapQtAppsHook
, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects
, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qtgraphicaleffects
, python3Packages, pyotherside, libXScrnSaver
}:

View file

@ -1,25 +1,44 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch
, cairocffi, cssselect2, defusedxml, pillow, tinycss2
, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }:
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, cairocffi
, cssselect2
, defusedxml
, pillow
, tinycss2
, pytestCheckHook
, pytest-runner
, pytest-flake8
, pytest-isort
}:
buildPythonPackage rec {
pname = "CairoSVG";
version = "2.5.1";
version = "2.5.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "bfa0deea7fa0b9b2f29e41b747a915c249dbca731a4667c2917e47ff96e773e0";
sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w=";
};
buildInputs = [ pytest-runner ];
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ];
checkInputs = [ pytestCheckHook pytest-flake8 pytest-isort ];
pytestFlagsArray = [
"cairosvg/test_api.py"
];
pythonImportsCheck = [ "cairosvg" ];
meta = with lib; {
homepage = "https://cairosvg.org";
license = licenses.lgpl3;
license = licenses.lgpl3Plus;
description = "SVG converter based on Cairo";
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, billiard, click, click-didyoumean, click-repl, kombu, pytz, vine
, billiard, click, click-didyoumean, click-plugins, click-repl, kombu, pytz, vine
, boto3, case, moto, pytest, pytest-celery, pytest-subtests, pytest-timeout
}:
@ -17,7 +17,7 @@ buildPythonPackage rec {
--replace "moto==1.3.7" moto
'';
propagatedBuildInputs = [ billiard click click-didyoumean click-repl kombu pytz vine ];
propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ];
checkInputs = [ boto3 case moto pytest pytest-celery pytest-subtests pytest-timeout ];
@ -38,5 +38,6 @@ buildPythonPackage rec {
homepage = "https://github.com/celery/celery/";
description = "Distributed task queue";
license = licenses.bsd3;
maintainers = [ ];
};
}

View file

@ -35,11 +35,13 @@ buildPythonPackage rec {
checkInputs = [ mock ];
pythonImportsCheck = [ "flower" ];
meta = with lib; {
description = "Celery Flower";
homepage = "https://github.com/mher/flower";
license = licenses.bsdOriginal;
maintainers = [ maintainers.arnoldfarkas ];
broken = (celery.version == "5.0.2"); # currently broken with celery>=5.0 by https://github.com/mher/flower/pull/1021
broken = (celery.version >= "5.0.2"); # currently broken with celery>=5.0 by https://github.com/mher/flower/pull/1021
};
}