From 75f5fbe94578af9a1c5f4da245fc483864f8a891 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 6 Nov 2018 22:51:32 +0100 Subject: [PATCH] hovercraft: 2.0 -> 2.6 move to top-level, use buildPythonApplication --- pkgs/applications/misc/hovercraft/default.nix | 35 ++++++++++++++++++ .../python-modules/hovercraft/default.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 37 insertions(+), 38 deletions(-) create mode 100644 pkgs/applications/misc/hovercraft/default.nix delete mode 100644 pkgs/development/python-modules/hovercraft/default.nix diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix new file mode 100644 index 00000000000..dd0ed8511f6 --- /dev/null +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/python-modules/hovercraft/default.nix b/pkgs/development/python-modules/hovercraft/default.nix deleted file mode 100644 index e598fd41bab..00000000000 --- a/pkgs/development/python-modules/hovercraft/default.nix +++ /dev/null @@ -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 ]; - }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a1b72ff1b3..53068276627 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17209,6 +17209,8 @@ with pkgs; gtk = gtk3; }; + hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; + howl = callPackage ../applications/editors/howl { }; ht = callPackage ../applications/editors/ht { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05ac04a22bc..ee054871380 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1686,8 +1686,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 { };