From e3deb787db6156ef7e73d585ac633c761db487b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 5 Jan 2025 09:38:55 +0100 Subject: [PATCH 1/4] gromit-mpx: remove with lib --- pkgs/by-name/gr/gromit-mpx/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 48c2e0aead13..612dc80fc72f 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { lz4 ]; - meta = with lib; { + meta = { description = "Desktop annotation tool"; longDescription = '' Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool @@ -59,12 +59,12 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/bk138/gromit-mpx"; changelog = "https://github.com/bk138/gromit-mpx/blob/${finalAttrs.version}/NEWS.md"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ pjones gepbird ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; mainProgram = "gromit-mpx"; }; }) From 7d10a7c56f3b72b821f42ef86737db6b770330ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 5 Jan 2025 09:39:23 +0100 Subject: [PATCH 2/4] gromit-mpx: fetchFromGitHub rev -> tag --- pkgs/by-name/gr/gromit-mpx/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 612dc80fc72f..93e5cbfc5f91 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-jHw4V2ZvfpT3PUihe/O+9BPsv+udFg5seMbYmxOz8Yk="; }; From 253a102b13a5961a1e077e7e372573c36091ef3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 5 Jan 2025 09:40:06 +0100 Subject: [PATCH 3/4] gromit-mpx: add update script --- pkgs/by-name/gr/gromit-mpx/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 93e5cbfc5f91..8058d7e92880 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -17,6 +17,7 @@ libdbusmenu, lz4, wrapGAppsHook3, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -51,6 +52,8 @@ stdenv.mkDerivation (finalAttrs: { lz4 ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Desktop annotation tool"; longDescription = '' From 4aca1de283fe9749f9c24929c446416a401737b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 5 Jan 2025 09:51:15 +0100 Subject: [PATCH 4/4] gromit-mpx: remove unneeded pcre --- pkgs/by-name/gr/gromit-mpx/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 8058d7e92880..26ffbe98473e 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -6,7 +6,6 @@ pkg-config, gtk3, glib, - pcre, libappindicator-gtk3, libpthreadstubs, xorg, @@ -40,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 glib - pcre libappindicator-gtk3 libpthreadstubs xorg.libXdmcp