From bf314e68f771a1d5b95df91080b0b3c01dd2c748 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Tue, 18 Jun 2024 13:26:26 +0000
Subject: [PATCH 1/3] maintainers: add adfaure

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1ab4d24ca8b0fed..98ecc5526354337 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -503,6 +503,13 @@
     githubId = 1773511;
     name = "Adrien Devresse";
   };
+  adfaure = {
+    email = "adfaure@pm.me";
+    matrix = "@adfaure:matrix.org";
+    github = "adfaure";
+    githubId = 8026586;
+    name = "Adrien Faure";
+  };
   adisbladis = {
     email = "adisbladis@gmail.com";
     matrix = "@adis:blad.is";

From 13b54c83708a4e1875e291ffa30d37f2987098f3 Mon Sep 17 00:00:00 2001
From: Adrien Faure <adrien.faure@protonmail.com>
Date: Sat, 29 Jun 2024 15:24:28 +0200
Subject: [PATCH 2/3] mozjpeg_lossless_optimization: init at 1.1.3

---
 .../mozjpeg_lossless_optimization/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix

diff --git a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
new file mode 100644
index 000000000000000..6100608d3b052d6
--- /dev/null
+++ b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, python3Packages
+, fetchPypi
+, mailman
+, nixosTests
+, buildPythonPackage
+, mozjpeg
+, cmake
+}:
+buildPythonPackage rec {
+  pname = "mozjpeg_lossless_optimization";
+  version = "1.1.3";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "mozjpeg-lossless-optimization";
+    sha256 = "sha256-cl2Ydy6UP8oYsIAcuU5kXEd/9S5WrQsnvdt23fCRyj4=";
+  };
+
+  # This package needs cmake, but it is not the default builder
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [ mozjpeg cmake ];
+  propagatedBuildInputs = [ python3Packages.cffi ];
+
+  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 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 17bc295d63f019d..5a790a96ca116be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7813,6 +7813,8 @@ self: super: with self; {
 
   mozilla-django-oidc = callPackage ../development/python-modules/mozilla-django-oidc { };
 
+  mozjpeg_lossless_optimization = callPackage ../development/python-modules/mozjpeg_lossless_optimization {};
+
   mpd2 = callPackage ../development/python-modules/mpd2 { };
 
   mpegdash = callPackage ../development/python-modules/mpegdash { };

From dd5b6693469fbe4a380012d0871c999a52f47068 Mon Sep 17 00:00:00 2001
From: Adrien Faure <adrien.faure@protonmail.com>
Date: Sat, 29 Jun 2024 15:25:32 +0200
Subject: [PATCH 3/3] kcc: 5.5.1 -> 6.1.0

---
 pkgs/applications/graphics/kcc/default.nix | 28 ++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix
index 136d0fe12836154..abbb9a5500c39ad 100644
--- a/pkgs/applications/graphics/kcc/default.nix
+++ b/pkgs/applications/graphics/kcc/default.nix
@@ -1,27 +1,41 @@
 { lib
 , mkDerivationWith
+, python3
 , python3Packages
 , fetchPypi
+, fetchFromGitHub
 , p7zip
 , archiveSupport ? true
+, cmake
+, mozjpeg
 }:
-
 mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "kcc";
-  version = "5.5.1";
+  version = "6.1.0";
 
-  src = fetchPypi {
-    inherit version;
-    pname = "KindleComicConverter";
-    sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";
+  src = fetchFromGitHub {
+    owner = "ciromattia";
+    repo = "${pname}";
+    rev = "v${version}";
+    hash = "sha256-CU068e7fLPn0hW+yfm1qRp8bX8/jvAYz2g715CIHa/Q=";
   };
 
+  nativeBuildInputs = with python3Packages; [
+    pip
+  ];
+
   propagatedBuildInputs = with python3Packages ; [
+    p7zip
     pillow
     pyqt5
     psutil
     python-slugify
     raven
+    requests
+    natsort
+    mozjpeg_lossless_optimization
+    distro
+    pyside6
   ];
 
   qtWrapperArgs = lib.optionals archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ];
@@ -34,6 +48,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ";
     homepage = "https://kcc.iosphe.re";
     license = licenses.isc;
-    maintainers = with maintainers; [ dawidsowa ];
+    maintainers = with maintainers; [ dawidsowa adfaure ];
   };
 }