Merge pull request #49841 from makefu/pkgs/hovercraft/update

hovercraft: 2.0 -> 2.6
This commit is contained in:
Jörg Thalheim 2018-11-10 21:37:53 +00:00 committed by GitHub
commit 0c9b49dfe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 38 deletions

View File

@ -0,0 +1,35 @@
{ lib
, buildPythonApplication
, isPy3k
, fetchFromGitHub
, manuel
, setuptools
, docutils
, lxml
, svg-path
, pygments
, watchdog
}:
buildPythonApplication rec {
pname = "hovercraft";
version = "2.6";
disabled = ! isPy3k;
src = fetchFromGitHub {
owner = "regebro";
repo = "hovercraft";
rev = version;
sha256 = "150sn6kvqi2s89di1akl5i0g81fasji2ipr12zq5s4dcnhw4r5wp";
};
checkInputs = [ manuel ];
propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ];
meta = with lib; {
description = "Makes impress.js presentations from reStructuredText";
homepage = https://github.com/regebro/hovercraft;
license = licenses.mit;
maintainers = with maintainers; [ goibhniu makefu ];
};
}

View File

@ -1,36 +0,0 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, docutils
, lxml
, manuel
, pygments
, svg-path
, watchdog
, isPy3k
}:
buildPythonPackage rec {
pname = "hovercraft";
version = "2.0";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0lqxr816lymgnywln8bbv9nrmkyahjjcjkm9kjyny9bflayz4f1g";
};
propagatedBuildInputs = [ docutils lxml manuel pygments svg-path watchdog ];
# one test assumes we have docutils 0.12
# TODO: enable tests after upgrading docutils to 0.12
doCheck = false;
meta = with stdenv.lib; {
description = "A tool to make impress.js presentations from reStructuredText";
homepage = https://github.com/regebro/hovercraft;
license = licenses.mit;
maintainers = with maintainers; [ goibhniu ];
};
}

View File

@ -17268,6 +17268,8 @@ with pkgs;
gtk = gtk3;
};
hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { };
howl = callPackage ../applications/editors/howl { };
ht = callPackage ../applications/editors/ht { };

View File

@ -1696,8 +1696,6 @@ in {
hupper = callPackage ../development/python-modules/hupper {};
hovercraft = callPackage ../development/python-modules/hovercraft { };
hsaudiotag = callPackage ../development/python-modules/hsaudiotag { };
hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };