From a07a6083423962a27c936940e6f6c75be9fac469 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 16 Jun 2022 07:17:33 +0300 Subject: [PATCH 1/2] pythonPackages.pychm,python3Packages.pychm: init at 0.8.6 --- .../python-modules/pychm/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pychm/default.nix diff --git a/pkgs/development/python-modules/pychm/default.nix b/pkgs/development/python-modules/pychm/default.nix new file mode 100644 index 000000000000..e9cc2c319fff --- /dev/null +++ b/pkgs/development/python-modules/pychm/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, chmlib +}: + +buildPythonPackage rec { + pname = "pychm"; + version = "0.8.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wpn9ijlsmrpyiwg3drmgz4dms1i1i347adgqw37bkrh3vn6yq16"; + }; + + buildInputs = [ chmlib ]; + + pythonImportsCheck = [ "chm" ]; + + meta = with lib; { + description = "Library to manipulate Microsoft HTML Help (CHM) files"; + homepage = "https://github.com/dottedmag/pychm"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ alexshpilkin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e4ab0660afb..d6108a7ffa29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7084,6 +7084,8 @@ in { pychef = callPackage ../development/python-modules/pychef { }; + pychm = callPackage ../development/python-modules/pychm { }; + PyChromecast = callPackage ../development/python-modules/pychromecast { }; pyclimacell = callPackage ../development/python-modules/pyclimacell { }; From 7d883da22ad7c804fbc138652f868abfe60b0300 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 16 Jun 2022 07:19:21 +0300 Subject: [PATCH 2/2] calibre: fix chm processing dependency --- pkgs/applications/misc/calibre/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 753be1eb88cf..d25998cb17b1 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -16,7 +16,6 @@ , hunspell , hyphen , unrarSupport ? false -, chmlib , python3Packages , libusb1 , libmtp @@ -66,7 +65,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ - chmlib fontconfig hunspell hyphen @@ -102,6 +100,7 @@ mkDerivation rec { msgpack netifaces pillow + pychm pyqt-builder pyqt5 python