Merge pull request #202969 from dotlambda/svg2tikz-python3

This commit is contained in:
Martin Weinelt 2022-11-26 19:07:07 +01:00 committed by GitHub
commit 0a2798e49e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 13 deletions

View File

@ -2,29 +2,39 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, lxml , lxml
, isPy27 , pytestCheckHook
}: }:
buildPythonPackage { buildPythonPackage {
pname = "svg2tikz"; pname = "svg2tikz";
version = "1.0.0"; version = "unstable-2021-01-12";
disabled = ! isPy27;
propagatedBuildInputs = [ lxml ]; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kjellmf"; owner = "xyz2tex";
repo = "svg2tikz"; repo = "svg2tikz";
rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; rev = "7a9959c295e1ed73e543474c6f3679d04cebc9e9";
sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8="; hash = "sha256-OLMFtEEdcY8ARI+hUSOhMwwcrtOAsbKRJRdDJcuaIBg=";
fetchSubmodules = true;
}; };
propagatedBuildInputs = [
lxml
];
checkInputs = [
pytestCheckHook
];
# upstream hasn't updated the tests in a while
doCheck = false;
pythonImportsCheck = [ "svg2tikz" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/kjellmf/svg2tikz"; homepage = "https://github.com/xyz2tex/svg2tikz";
description = "An SVG to TikZ converter"; description = "Set of tools for converting SVG graphics to TikZ/PGF code";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ gal_bolle ]; maintainers = with maintainers; [ dotlambda gal_bolle ];
}; };
} }

View File

@ -15949,7 +15949,7 @@ with pkgs;
pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
svg2tikz = python27Packages.svg2tikz; svg2tikz = with python3.pkgs; toPythonApplication svg2tikz;
svg2pdf = callPackage ../tools/graphics/svg2pdf { }; svg2pdf = callPackage ../tools/graphics/svg2pdf { };