Kindle Comic Converter (kcc) : 5.5.1 -> 7.3.3 by adfaure · Pull Request #323382 · NixOS/nixpkgs

adfaure · 2024-06-29T14:02:38Z

Description of changes

Update of https://github.com/ciromattia/kcc (changelog is outdated).
- The pypi package has not beed updated since 2020, so I used the github repository.
This PR also adds this python package: https://github.com/wanadev/mozjpeg-lossless-optimization, which is a dependency for kcc.
I added myself as a maintainer. Since I am already involved in another PR (python3Packages.tree-sitter-grammars: init at 0.22.5 #320783) that add my profile as a contributor, I cherry-picked the commit (maybe it is a bad idea 😅 )

Fixes #219115
Fixes #396679

Things done

Add a 👍 reaction to pull requests you find important.

FliegendeWurst

Thanks for updating kcc. See below for some suggestions to improve the package definition.

diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix
index abbb9a5500c3..2103a2a1e146 100644
--- a/pkgs/applications/graphics/kcc/default.nix
+++ b/pkgs/applications/graphics/kcc/default.nix
@@ -1,33 +1,31 @@
 { lib
-, mkDerivationWith
-, python3
+, stdenv
 , python3Packages
-, fetchPypi
 , fetchFromGitHub
 , p7zip
 , archiveSupport ? true
-, cmake
 , mozjpeg
+, qt6
 }:
-mkDerivationWith python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "kcc";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "ciromattia";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-CU068e7fLPn0hW+yfm1qRp8bX8/jvAYz2g715CIHa/Q=";
+    hash = "sha256-61P4rsPRUJVrqv0xegxohRu7Yr8goSk7ElFV37GAYe8=";
   };
 
   nativeBuildInputs = with python3Packages; [
-    pip
+    qt6.wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = with python3Packages ; [
-    p7zip
+  buildInputs = lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;
+
+  propagatedBuildInputs = with python3Packages; [
     pillow
-    pyqt5
     psutil
     python-slugify
     raven
@@ -36,12 +34,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     mozjpeg_lossless_optimization
     distro
     pyside6
+    packaging
   ];
 
-  qtWrapperArgs = lib.optionals archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ];
-
-  postFixup = ''
-    wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}"
+  preFixup = lib.optionalString archiveSupport ''
+    qtWrapperArgs+=(--prefix PATH : "${ lib.makeBinPath [ p7zip ] }")
   '';
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 181ac0979518..5af125c3d7a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17804,7 +17804,7 @@ with pkgs;
 
   kcat = callPackage ../development/tools/kcat { };
 
-  kcc = libsForQt5.callPackage ../applications/graphics/kcc { };
+  kcc = callPackage ../applications/graphics/kcc { };
 
   kcgi = callPackage ../development/web/kcgi { };

FliegendeWurst · 2024-10-21T18:49:15Z

pkgs/applications/graphics/kcc/default.nix

Suggested change

version = "6.1.0";

version = "6.2.0";

pkgs/applications/graphics/kcc/default.nix

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix

FliegendeWurst · 2024-11-07T14:12:30Z

Also please squash your commits where it makes sense to do so.

adfaure · 2024-11-07T14:34:56Z

Also please squash your commits where it makes sense to do so.

Thx for the review, squashed.

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix

jwillikers

Thanks for working on this! I just wanted to play around with kcc and saw it was in sore need of an update. Much appreciated!

I don't think anything in my review is a blocker, just some improvements.

It would be nice to add auto-update passthru sections for both packages and a passthru version test for kcc, which would look like this for kcc.

  passthru = {
    tests.version = testers.testVersion {
      package = kcc;
    };
    updateScript = nix-update-script { };
  };

jwillikers · 2024-11-30T21:20:44Z

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix

+  meta = with lib; {
+    description = "Python library to optimize JPEGs losslessly using MozJPEG";
+    homepage = "https://github.com/wanadev/mozjpeg-lossless-optimization";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ adfaure ];
+  };


You can remove with lib here. Not a blocker. See #208242.

Suggested change

meta = with lib; {

description = "Python library to optimize JPEGs losslessly using MozJPEG";

homepage = "https://github.com/wanadev/mozjpeg-lossless-optimization";

license = licenses.bsd3;

maintainers = with maintainers; [ adfaure ];

};

meta = {

description = "Python library to optimize JPEGs losslessly using MozJPEG";

homepage = "https://github.com/wanadev/mozjpeg-lossless-optimization";

license = lib.licenses.bsd3;

maintainers = with lib.maintainers; [ adfaure ];

};

jwillikers · 2024-11-30T21:24:28Z

pkgs/applications/graphics/kcc/default.nix

  };

-  propagatedBuildInputs = with python3Packages ; [
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];


I think you can update the call to libsForQt5.callPackage to just be callPAckage for kcc in all-packages.nix now that you've added this.

You could just drop that line in all-packages.nix and move the package to pkgs/by-name/kc/kcc/package.nix, which is something that should probably be done eventually anyways.

jwillikers · 2024-11-30T21:25:05Z

pkgs/applications/graphics/kcc/default.nix

-}:
-
-mkDerivationWith python3Packages.buildPythonApplication rec {
+{ stdenv, lib, qt6, python3Packages, fetchFromGitHub, p7zip


It would be nice to have this file formatted.

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix

pkgs/applications/graphics/kcc/default.nix

mksafavi · 2025-04-05T15:45:02Z

Hi.
Is there anything needed for this to get merged?

The current version (5.5.1) doesn't run.
Although it works by adding the missing dependency on a shell: nix-shell -p kcc python3Packages.distutils

5.5.1 crash log:

Traceback (most recent call last):
  File "/nix/store/5kzl31yvagrbljvqxbqy1ywbqcs8a9f5-kcc-5.5.1/bin/.kcc-wrapped", line 6, in <module>
    from kindlecomicconverter.startup import start
  File "/nix/store/5kzl31yvagrbljvqxbqy1ywbqcs8a9f5-kcc-5.5.1/lib/python3.12/site-packages/kindlecomicconverter/startup.py", line 24, in <module>
    from .shared import dependencyCheck
  File "/nix/store/5kzl31yvagrbljvqxbqy1ywbqcs8a9f5-kcc-5.5.1/lib/python3.12/site-packages/kindlecomicconverter/shared.py", line 24, in <module>
    from distutils.version import StrictVersion
ModuleNotFoundError: No module named 'distutils'

FliegendeWurst · 2025-04-05T16:48:09Z

The merge conflict needs to be resolved (#395247), and the commits squashed. That's all I think

adfaure · 2025-04-06T15:46:20Z

Hi, I am resolving the conflicts now.

But now I have the following error. I am trying to fix it, but we can expect a bit of delay.

❯ nix-build . -A kcc                                                                                                                                                                                                                                                              nix-shell
error:
       … while evaluating the attribute 'drvPath'
         at /home/adfaure/Code/nixpkgs/lib/customisation.nix:418:7:
          417|     // {
          418|       drvPath =
             |       ^
          419|         assert condition;

       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:34:12:
           33|
           34|   strict = derivationStrict drvAttrs;
             |            ^
           35|

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: do not use python3Packages when building Python packages, specify each used package as a separate argument

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix

pkgs/by-name/kc/kcc/package.nix

Co-authored-by: Arne Keller <[email protected]>

adfaure · 2025-05-16T08:21:11Z

Hi @FliegendeWurst, I lost track of what the next step is.
Are there still any requested changes on your side?

FliegendeWurst · 2025-05-16T09:17:00Z

I think the PR is in good shape. You can un-draft it, if you believe it is ready.

FliegendeWurst · 2025-05-16T10:01:45Z

Yeah it is a bit weird that the button to mark it as ready is somewhere completely different than the 'mark draft' button

teto · 2025-06-10T14:29:59Z

a bit sad this wont work on wayland but it has been a year, let's keep the contributor sane and merge.

➜ kcc
qt.qpa.plugin: Could not find the Qt platform plugin "wayland" in ""
This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

Available platform plugins are: xcb, vnc, vkkhrdisplay, minimalegl, linuxfb, minimal, eglfs, offscreen.

Aborted (core dumped)

adfaure · 2025-06-10T15:19:11Z

a bit sad this wont work on wayland but it has been a year, let's keep the contributor sane and merge.

➜ kcc
qt.qpa.plugin: Could not find the Qt platform plugin "wayland" in ""
This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

Available platform plugins are: xcb, vnc, vkkhrdisplay, minimalegl, linuxfb, minimal, eglfs, offscreen.

Aborted (core dumped)

Indeed, I didn't notice since despite using wayland, kcc runs on my laptop.

❯ ./result/bin/kcc
qt.qpa.plugin: Could not find the Qt platform plugin "wayland" in ""
qt.gui.imageio: libpng warning: iCCP: known incorrect sRGB profile
QSystemTrayIcon::setVisible: No Icon set

It is maybe worth opening an issue.

And thank you for the merge :)

teto · 2025-06-10T15:27:43Z

thanks for your patience and the bump. Thanks to you, I could use my remarkable on an especially long trip.
The wayland issue is a classical one, usually solved by adding qtwayland. Not a big issue.

adfaure · 2025-06-10T15:36:15Z

thanks for your patience and the bump. Thanks to you, I could use my remarkable on an especially long trip. The wayland issue is a classical one, usually solved by adding qtwayland. Not a big issue.

Thank you, have a nice trip!

Okay, thank you for the tip. I will fix that when I have a bit of time.

TomaSajt · 2025-07-18T13:21:54Z

I noticed that this PR forgot to remove the old kcc package, the one in pkgs/applications/graphics/kcc/default.nix.

I'll open a PR that removes it.

Also, for whatever reason, wrapQtAppsHook doesn't try to wrap executables that are not binaries.
See:

nixpkgs/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh

Lines 84 to 85 in f6e9250

    
           # Skip the file if it is not a binary (ELF or Mach-O) 
        
           isELF "$file" || isMachO "$file" || continue

So by taking out the explicit wrapping logic, wrapQtAppsHook no longer does anything (because the python scripts are just text)

(Maybe this is why the wayland problem was showing up)

And also because of this p7zip no longer gets added to the PATH.

I'll open a version bump PR in which I'll try to fix these things.

TomaSajt · 2025-07-18T13:34:29Z

Opened #426382

github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels Jun 29, 2024

NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 29, 2024

ofborg bot added the 8.has: package (new) This PR adds a new package label Jun 29, 2024

ofborg bot requested a review from dawidsowa June 29, 2024 14:33

FliegendeWurst requested changes Oct 21, 2024

View reviewed changes

adfaure force-pushed the update-kcc branch from dd5b669 to 3a7f791 Compare October 22, 2024 10:18

nix-owners bot requested a review from natsukium October 22, 2024 10:19

adfaure force-pushed the update-kcc branch 2 times, most recently from 10e2167 to d37a166 Compare October 22, 2024 10:42

FliegendeWurst requested changes Oct 22, 2024

View reviewed changes

FliegendeWurst requested changes Nov 6, 2024

View reviewed changes

adfaure force-pushed the update-kcc branch from 73b59b9 to 99dfd02 Compare November 7, 2024 08:28

FliegendeWurst requested changes Nov 7, 2024

View reviewed changes

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix Outdated Show resolved Hide resolved

adfaure force-pushed the update-kcc branch from 99dfd02 to 360f3c9 Compare November 7, 2024 14:34

adfaure changed the title ~~Kindle Comic Converter (kcc) : 5.5.1 -> 6.1.0~~ Kindle Comic Converter (kcc) : 5.5.1 -> 6.2.2 Nov 7, 2024

FliegendeWurst reviewed Nov 7, 2024

View reviewed changes

adfaure force-pushed the update-kcc branch 5 times, most recently from 503c3a3 to 203553a Compare November 8, 2024 11:16

FliegendeWurst approved these changes Nov 9, 2024

View reviewed changes

FliegendeWurst added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 9, 2024

jwillikers approved these changes Nov 30, 2024

View reviewed changes

FliegendeWurst reviewed Apr 6, 2025

View reviewed changes

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix Outdated Show resolved Hide resolved

adfaure force-pushed the update-kcc branch from 812f566 to c79367f Compare April 6, 2025 16:09

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 6, 2025

adfaure force-pushed the update-kcc branch from c79367f to a33a777 Compare April 6, 2025 16:31

ghost mentioned this pull request Apr 6, 2025

kcc: kcc fails to launch #396679

Closed

3 tasks

FliegendeWurst reviewed Apr 7, 2025

View reviewed changes

pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix Outdated Show resolved Hide resolved

pkgs/by-name/kc/kcc/package.nix Outdated Show resolved Hide resolved

pkgs/by-name/kc/kcc/package.nix Outdated Show resolved Hide resolved

adfaure force-pushed the update-kcc branch 2 times, most recently from 4a02104 to f490aae Compare April 14, 2025 07:45

jwillikers approved these changes May 9, 2025

View reviewed changes

adfaure and others added 2 commits May 16, 2025 10:05

mozjpeg_lossless_optimization: init at 1.1.3

3dac6fb

Co-authored-by: Arne Keller <[email protected]>

kcc: 5.5.1 -> 7.3.3

8afcd39

Co-authored-by: Arne Keller <[email protected]>

adfaure force-pushed the update-kcc branch from f490aae to 8afcd39 Compare May 16, 2025 08:09

github-actions bot removed the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label May 16, 2025

adfaure marked this pull request as ready for review May 16, 2025 09:58

FliegendeWurst approved these changes May 16, 2025

View reviewed changes

wegank added the 12.approvals: 2 This PR was reviewed and approved by two persons. label May 16, 2025

teto merged commit 99c220e into NixOS:master Jun 10, 2025
31 of 32 checks passed

TomaSajt mentioned this pull request Jul 18, 2025

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

Merged

13 tasks

Uh oh!

Conversation

adfaure commented Jun 29, 2024 • edited by FliegendeWurst Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of changes

Things done

Uh oh!

FliegendeWurst left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FliegendeWurst Oct 21, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

FliegendeWurst commented Nov 7, 2024

Uh oh!

adfaure commented Nov 7, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jwillikers left a comment

Choose a reason for hiding this comment

Uh oh!

jwillikers Nov 30, 2024

Choose a reason for hiding this comment

Uh oh!

jwillikers Nov 30, 2024

Choose a reason for hiding this comment

Uh oh!

jwillikers Nov 30, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mksafavi commented Apr 5, 2025

Uh oh!

FliegendeWurst commented Apr 5, 2025

Uh oh!

adfaure commented Apr 6, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adfaure commented May 16, 2025

Uh oh!

FliegendeWurst commented May 16, 2025

Uh oh!

FliegendeWurst commented May 16, 2025

Uh oh!

teto commented Jun 10, 2025

Uh oh!

Uh oh!

adfaure commented Jun 10, 2025

Uh oh!

teto commented Jun 10, 2025

Uh oh!

adfaure commented Jun 10, 2025

Uh oh!

TomaSajt commented Jul 18, 2025

Uh oh!

TomaSajt commented Jul 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

adfaure commented Jun 29, 2024 •

edited by FliegendeWurst

Loading

FliegendeWurst left a comment •

edited

Loading