diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-08 18:00:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-08 18:00:58 +0000 |
commit | 6bf0bf35bb3fb134c6b233879dee90d3238a496b (patch) | |
tree | feea4f5017653393a75dfd2b46695a39acd1545d /pkgs/applications/graphics | |
parent | dddfe17b163d04cc619b53ad7d1a4ffa98d8cc46 (diff) | |
parent | bc85b737c58974e2ea1bf3cacaee205cb521f0d1 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/mcomix/default.nix | 60 | ||||
-rw-r--r-- | pkgs/applications/graphics/vipsdisp/default.nix | 4 |
2 files changed, 2 insertions, 62 deletions
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix deleted file mode 100644 index aa022cf232ab1..0000000000000 --- a/pkgs/applications/graphics/mcomix/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ 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 ]; - }; -} diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix index 4c516e3ac82c0..9d0a757672890 100644 --- a/pkgs/applications/graphics/vipsdisp/default.nix +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vipsdisp"; - version = "2.6.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - hash = "sha256-vY3BTbCLf3JOB+eILMvaFUIgG3UBkSdckFAdC4W0OnU="; + hash = "sha256-a8wqDTVZnhqk0zHAuGvwjtJTM0irN2tkRIjx6sIteV0="; }; postPatch = '' |