kcc: 7.5.1 -> 8.0.4, fix wrapping, use pyproject = true, remove leftover files (#426382)

authored by

Bruno Bigras and committed by
GitHub
ba6ce53a cca77928

+27 -61
-48
pkgs/applications/graphics/kcc/default.nix
··· 1 - { 2 - lib, 3 - python3Packages, 4 - fetchPypi, 5 - libsForQt5, 6 - p7zip, 7 - archiveSupport ? true, 8 - }: 9 - 10 - python3Packages.buildPythonApplication rec { 11 - pname = "kcc"; 12 - version = "5.5.1"; 13 - format = "setuptools"; 14 - 15 - src = fetchPypi { 16 - inherit version; 17 - pname = "KindleComicConverter"; 18 - sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; 19 - }; 20 - 21 - nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; 22 - 23 - propagatedBuildInputs = with python3Packages; [ 24 - pillow 25 - pyqt5 26 - psutil 27 - python-slugify 28 - raven 29 - ]; 30 - 31 - qtWrapperArgs = lib.optionals archiveSupport [ 32 - "--prefix" 33 - "PATH" 34 - ":" 35 - "${lib.makeBinPath [ p7zip ]}" 36 - ]; 37 - 38 - postFixup = '' 39 - wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}" 40 - ''; 41 - 42 - meta = with lib; { 43 - description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ"; 44 - homepage = "https://github.com/ciromattia/kcc"; 45 - license = licenses.isc; 46 - maintainers = with maintainers; [ dawidsowa ]; 47 - }; 48 - }
+27 -13
pkgs/by-name/kc/kcc/package.nix
··· 1 1 { 2 - stdenv, 3 2 lib, 3 + python3, 4 + fetchFromGitHub, 5 + 4 6 qt6, 5 - fetchFromGitHub, 7 + archiveSupport ? true, 6 8 p7zip, 9 + 7 10 versionCheckHook, 8 11 nix-update-script, 9 - python3, 10 - archiveSupport ? true, 11 12 }: 13 + 12 14 python3.pkgs.buildPythonApplication rec { 13 15 pname = "kcc"; 14 - version = "7.5.1"; 15 - format = "setuptools"; 16 + version = "8.0.4"; 17 + pyproject = true; 16 18 17 19 src = fetchFromGitHub { 18 20 owner = "ciromattia"; 19 21 repo = "kcc"; 20 22 tag = "v${version}"; 21 - hash = "sha256-XB+xss/QiZuo6gWphyjFh9DO74O5tNqfX5LUzsa4gqo="; 23 + hash = "sha256-8rnuSGlfwH5AVp8GQn3RTtiTYFdTNp7Wqq+ATibpkNA="; 22 24 }; 23 25 24 26 nativeBuildInputs = [ qt6.wrapQtAppsHook ]; 25 27 26 - buildInputs = [ qt6.qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; 27 - propagatedBuildInputs = with python3.pkgs; [ 28 - packaging 28 + buildInputs = [ qt6.qtbase ]; 29 + 30 + build-system = with python3.pkgs; [ setuptools ]; 31 + 32 + dependencies = with python3.pkgs; [ 33 + packaging # undeclared dependency 34 + pyside6 29 35 pillow 30 36 psutil 31 37 python-slugify 32 38 raven 33 39 requests 34 - natsort 35 40 mozjpeg_lossless_optimization 41 + natsort 36 42 distro 37 - pyside6 38 43 numpy 39 44 ]; 40 45 41 - qtWrapperArgs = lib.optionals archiveSupport [ ''--prefix PATH : ${lib.makeBinPath [ p7zip ]}'' ]; 46 + # Note: python scripts wouldn't get wrapped anyway, but let's be explicit about it 47 + dontWrapQtApps = true; 48 + 49 + makeWrapperArgs = 50 + [ 51 + "\${qtWrapperArgs[@]}" 52 + ] 53 + ++ lib.optionals archiveSupport [ 54 + ''--prefix PATH : ${lib.makeBinPath [ p7zip ]}'' 55 + ]; 42 56 43 57 nativeInstallCheckInputs = [ versionCheckHook ]; 44 58 versionCheckProgram = "${placeholder "out"}/bin/kcc-c2e";