From a5c909c24cab028651559a7c0708fa885f1e000b Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 19 Nov 2024 06:48:15 -0500 Subject: [PATCH] morphosis: 1.3 -> 1.4.1 (cherry picked from commit 66d5ae1b3ebb81019536912c6b5d75726caff24d) --- pkgs/by-name/mo/morphosis/package.nix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mo/morphosis/package.nix b/pkgs/by-name/mo/morphosis/package.nix index fc611305df08..7a9271d4dcd5 100644 --- a/pkgs/by-name/mo/morphosis/package.nix +++ b/pkgs/by-name/mo/morphosis/package.nix @@ -1,37 +1,45 @@ { lib, - python3Packages, - fetchFromGitLab, appstream, blueprint-compiler, desktop-file-utils, + fetchFromGitLab, + glib, gobject-introspection, + gtk4, libadwaita, meson, ninja, + nix-update-script, pandoc, pkg-config, + python3Packages, webkitgtk_6_0, wrapGAppsHook4, }: + python3Packages.buildPythonApplication rec { pname = "morphosis"; - version = "1.3"; + version = "1.4.1"; pyproject = false; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "morphosis"; - rev = "v${version}"; - hash = "sha256-JEZFgON4QkxHDbWSZbDNLpIFctt8mDHdGVVu3Q+WH4U="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZpxenBqC5qr7yNwjld0u7gSBQfL7Kpa4FWE9gkzG0hg="; }; + strictDeps = true; + nativeBuildInputs = [ appstream blueprint-compiler desktop-file-utils + glib # For `glib-compile-schemas` gobject-introspection + gtk4 # For `gtk-update-icon-cache` meson ninja pkg-config @@ -47,13 +55,17 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; makeWrapperArgs = [ - ''''${gappsWrapperArgs[@]}'' + "\${gappsWrapperArgs[@]}" "--prefix PATH : ${lib.makeBinPath [ pandoc ]}" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Convert your documents"; - homepage = "https://gitlab.gnome.org/Monster/morphosis"; + homepage = "https://gitlab.gnome.org/World/morphosis"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "morphosis";