Skip to content

mcomix: 2.2.1 -> 3.0.0 #279598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thiagokokada merged 3 commits into from
Jan 8, 2024
Merged

mcomix: 2.2.1 -> 3.0.0 #279598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2d520b
mcomix: migrate to by-name
thiagokokada Jan 8, 2024
eb32f20
mcomix: 2.2.1 -> 3.0.0
thiagokokada Jan 8, 2024
42a3cb8
mcomix: make chardet/pdf optional
thiagokokada Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 28 additions & 12 deletions .../applications/graphics/mcomix/default.nix → pkgs/by-name/mc/mcomix/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,53 @@
, testers
, wrapGAppsHook

# Recommended Dependencies:
, lhasa
, mupdf
# Recommended Dependencies:
, p7zip
, unrar
, chardetSupport ? true
, pdfSupport ? true
, unrarSupport ? false # unfree software
}:

python3.pkgs.buildPythonApplication rec {
pname = "mcomix";
version = "2.2.1";
version = "3.0.0";
pyproject = true;

src = fetchurl {
url = "mirror://sourceforge/mcomix/${pname}-${version}.tar.gz";
hash = "sha256-fmnlPhNCN6YR3lW2YCMEAbEiWVigcfFDq1tDQ1eTNkA=";
url = "mirror://sourceforge/mcomix/mcomix-${version}.tar.gz";
Copy link
Contributor

@otavio otavio Jan 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why pname has been removed?

Copy link
Contributor Author

@thiagokokada thiagokokada Jan 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#279598 (comment)

This is really something that depends on the person, but in general it is arguably easier to read an URL that does not parametrize unnecessary things like pname.

Copy link
Member

@AndersonTorres AndersonTorres Jan 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also
#277994

hash = "sha256-InDEPXXih49k5MiG1bATElxCiUs2RZTV7JeRVMTeoAQ=";
};

buildInputs = [ gtk3 gdk-pixbuf ];
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);
buildInputs = [
gtk3
gdk-pixbuf
];

# Tests are broken
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
# Prevent double wrapping
dontWrapGApps = true;

preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
"--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}"
"--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip ] ++ lib.optional unrarSupport unrar)}"
)
'';

Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33548,8 +33548,6 @@ with pkgs;

mbrola = callPackage ../applications/audio/mbrola { };

mcomix = callPackage ../applications/graphics/mcomix { };

mcpp = callPackage ../development/compilers/mcpp { };

mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
Expand Down