Merge pull request #279598 from thiagokokada/bump-mcomix

mcomix: 2.2.1 -> 3.0.0

pkgs/applications/graphics/mcomix/default.nix

···
-{ lib
-, fetchurl
-, gdk-pixbuf
-, gobject-introspection
-, gtk3
-, mcomix
-, python3
-, testers
-, wrapGAppsHook
-
-# Recommended Dependencies:
-, lhasa
-, mupdf
-, p7zip
-, unrar
-, unrarSupport ? false  # unfree software
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "mcomix";
-  version = "2.2.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz";
-    hash = "sha256-fmnlPhNCN6YR3lW2YCMEAbEiWVigcfFDq1tDQ1eTNkA=";
-  };
-
-  buildInputs = [ gtk3 gdk-pixbuf ];
-  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
-  propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);
-
-  # Tests are broken
-  doCheck = false;
-
-  # prevent double wrapping
-  dontWrapGApps = true;
-
-  preFixup = ''
-    makeWrapperArgs+=(
-      "''${gappsWrapperArgs[@]}"
-      "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}"
-    )
-  '';
-
-  passthru.tests.version = testers.testVersion {
-    package = mcomix;
-  };
-
-  meta = with lib; {
-    description = "Comic book reader and image viewer";
-    longDescription = ''
-      User-friendly, customizable image viewer, specifically designed to handle
-      comic books and manga supporting a variety of container formats
-      (including CBR, CBZ, CB7, CBT, LHA and PDF)
-    '';
-    homepage = "https://sourceforge.net/projects/mcomix/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ thiagokokada ];
-  };
-}

pkgs/by-name/mc/mcomix/package.nix

···
+{ lib
+, fetchurl
+, gdk-pixbuf
+, gobject-introspection
+, gtk3
+, mcomix
+, python3
+, testers
+, wrapGAppsHook
+
+  # Recommended Dependencies:
+, p7zip
+, unrar
+, chardetSupport ? true
+, pdfSupport ? true
+, unrarSupport ? false  # unfree software
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "mcomix";
+  version = "3.0.0";
+  pyproject = true;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mcomix/mcomix-${version}.tar.gz";
+    hash = "sha256-InDEPXXih49k5MiG1bATElxCiUs2RZTV7JeRVMTeoAQ=";
+  };
+
+  buildInputs = [
+    gtk3
+    gdk-pixbuf
+  ];
+
+  nativeBuildInputs = [
+    gobject-introspection
+    python3.pkgs.setuptools
+    wrapGAppsHook
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pillow
+    pycairo
+    pygobject3
+  ]
+  ++ lib.optionals chardetSupport [ chardet ]
+  ++ lib.optionals pdfSupport [ pymupdf ];
+
+  # No tests included in .tar.gz
+  doCheck = false;
+
+  # Prevent double wrapping
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip ] ++ lib.optional unrarSupport unrar)}"
+    )
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = mcomix;
+  };
+
+  meta = with lib; {
+    description = "Comic book reader and image viewer";
+    longDescription = ''
+      User-friendly, customizable image viewer, specifically designed to handle
+      comic books and manga supporting a variety of container formats
+      (including CBR, CBZ, CB7, CBT, LHA and PDF)
+    '';
+    homepage = "https://sourceforge.net/projects/mcomix/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ thiagokokada ];
+  };
+}

pkgs/top-level/all-packages.nix

···
 
   mbrola = callPackage ../applications/audio/mbrola { };
 
-  mcomix = callPackage ../applications/graphics/mcomix { };
-
   mcpp = callPackage ../development/compilers/mcpp { };
 
   mda_lv2 = callPackage ../applications/audio/mda-lv2 { };