Merge pull request #178028 from alexshpilkin/fix-calibre-chm

Fix CHM format support in Calibre

authored by Anderson Torres and committed by GitHub fe1afe8d 9226283f

+30 -2
+1 -2
pkgs/applications/misc/calibre/default.nix
··· 16 16 , hunspell 17 17 , hyphen 18 18 , unrarSupport ? false 19 - , chmlib 20 19 , python3Packages 21 20 , libusb1 22 21 , libmtp ··· 66 65 nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; 67 66 68 67 buildInputs = [ 69 - chmlib 70 68 fontconfig 71 69 hunspell 72 70 hyphen ··· 102 100 msgpack 103 101 netifaces 104 102 pillow 103 + pychm 105 104 pyqt-builder 106 105 pyqt5 107 106 python
+27
pkgs/development/python-modules/pychm/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , pythonOlder 5 + , chmlib 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "pychm"; 10 + version = "0.8.6"; 11 + 12 + src = fetchPypi { 13 + inherit pname version; 14 + sha256 = "0wpn9ijlsmrpyiwg3drmgz4dms1i1i347adgqw37bkrh3vn6yq16"; 15 + }; 16 + 17 + buildInputs = [ chmlib ]; 18 + 19 + pythonImportsCheck = [ "chm" ]; 20 + 21 + meta = with lib; { 22 + description = "Library to manipulate Microsoft HTML Help (CHM) files"; 23 + homepage = "https://github.com/dottedmag/pychm"; 24 + license = licenses.gpl2Plus; 25 + maintainers = with maintainers; [ alexshpilkin ]; 26 + }; 27 + }
+2
pkgs/top-level/python-packages.nix
··· 7149 7149 7150 7150 pychef = callPackage ../development/python-modules/pychef { }; 7151 7151 7152 + pychm = callPackage ../development/python-modules/pychm { }; 7153 + 7152 7154 PyChromecast = callPackage ../development/python-modules/pychromecast { }; 7153 7155 7154 7156 pyclimacell = callPackage ../development/python-modules/pyclimacell { };