From f1ea391568911c59f9e52e9b3cd77f3860e6bd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Sep 2024 18:28:52 +0200 Subject: [PATCH 1/8] gromit-mpx: format --- pkgs/tools/graphics/gromit-mpx/default.nix | 45 +++++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 433c11d95628..d5f7bb3ab7c3 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,7 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, gtk, glib, pcre, libappindicator, libpthreadstubs, xorg -, libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + gtk, + glib, + pcre, + libappindicator, + libpthreadstubs, + xorg, + libxkbcommon, + libepoxy, + at-spi2-core, + dbus, + libdbusmenu, + wrapGAppsHook3, }: stdenv.mkDerivation rec { @@ -15,21 +29,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-olDQGw0qDWwXpqRopVoEPDXLRpFiiBo+/jiVeL7R6QA="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook3 + ]; + buildInputs = [ - gtk glib pcre libappindicator libpthreadstubs - xorg.libXdmcp libxkbcommon libepoxy at-spi2-core - dbus libdbusmenu + gtk + glib + pcre + libappindicator + libpthreadstubs + xorg.libXdmcp + libxkbcommon + libepoxy + at-spi2-core + dbus + libdbusmenu ]; meta = with lib; { description = "Desktop annotation tool"; - longDescription = '' Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool to make annotations on the screen. ''; - homepage = "https://github.com/bk138/gromit-mpx"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; From 72856321d7b1e810d679067cf5ce1c39e200eb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Sep 2024 18:35:31 +0200 Subject: [PATCH 2/8] gromit-mpx: use specific dependencies directly in package definition --- pkgs/tools/graphics/gromit-mpx/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index d5f7bb3ab7c3..9512275d6a7e 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -4,10 +4,10 @@ fetchFromGitHub, cmake, pkg-config, - gtk, + gtk3, glib, pcre, - libappindicator, + libappindicator-gtk3, libpthreadstubs, xorg, libxkbcommon, @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk + gtk3 glib pcre - libappindicator + libappindicator-gtk3 libpthreadstubs xorg.libXdmcp libxkbcommon diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72a2be0f2dff..77fe94b6cce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8253,10 +8253,7 @@ with pkgs; groff = callPackage ../tools/text/groff { }; - gromit-mpx = callPackage ../tools/graphics/gromit-mpx { - gtk = gtk3; - libappindicator = libappindicator-gtk3; - }; + gromit-mpx = callPackage ../tools/graphics/gromit-mpx { }; gron = callPackage ../development/tools/gron { }; From e12990f31e931f27156189db90d439e477eb9fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Sep 2024 18:37:20 +0200 Subject: [PATCH 3/8] gromit-mpx: move to pkgs/by-name --- .../default.nix => by-name/gr/gromit-mpx/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/graphics/gromit-mpx/default.nix => by-name/gr/gromit-mpx/package.nix} (100%) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/by-name/gr/gromit-mpx/package.nix similarity index 100% rename from pkgs/tools/graphics/gromit-mpx/default.nix rename to pkgs/by-name/gr/gromit-mpx/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77fe94b6cce0..d5b981d447a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8253,8 +8253,6 @@ with pkgs; groff = callPackage ../tools/text/groff { }; - gromit-mpx = callPackage ../tools/graphics/gromit-mpx { }; - gron = callPackage ../development/tools/gron { }; groonga = callPackage ../servers/search/groonga { }; From 0809e3567c1230b7e1af3228c071e0d313e46539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Sep 2024 18:38:58 +0200 Subject: [PATCH 4/8] gromit-mpx: move to finalAttrs --- pkgs/by-name/gr/gromit-mpx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 9512275d6a7e..17bf6fe5ba1e 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -18,14 +18,14 @@ wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gromit-mpx"; version = "1.6.0"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-olDQGw0qDWwXpqRopVoEPDXLRpFiiBo+/jiVeL7R6QA="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; mainProgram = "gromit-mpx"; }; -} +}) From e4104ba247b588eca8af04c1717796e6bc7e5788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Sep 2024 18:43:09 +0200 Subject: [PATCH 5/8] gromit-mpx: 1.6.0 -> 1.7.0 --- pkgs/by-name/gr/gromit-mpx/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 17bf6fe5ba1e..24f089632f20 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -15,18 +15,19 @@ at-spi2-core, dbus, libdbusmenu, + lz4, wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { pname = "gromit-mpx"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = finalAttrs.version; - sha256 = "sha256-olDQGw0qDWwXpqRopVoEPDXLRpFiiBo+/jiVeL7R6QA="; + sha256 = "sha256-jHw4V2ZvfpT3PUihe/O+9BPsv+udFg5seMbYmxOz8Yk="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { at-spi2-core dbus libdbusmenu + lz4 ]; meta = with lib; { From 0beb348e82c1e7c80c21ec3ea861591c28e24f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Sep 2024 18:46:12 +0200 Subject: [PATCH 6/8] gromit-mpx: add changelog to meta --- pkgs/by-name/gr/gromit-mpx/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 24f089632f20..32fb0ee96d08 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { to make annotations on the screen. ''; homepage = "https://github.com/bk138/gromit-mpx"; + changelog = "https://github.com/bk138/gromit-mpx/blob/${finalAttrs.version}/NEWS.md"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2Plus; From 2b37673f319d8b0f9254769df2e3567e9bbee4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Sep 2024 18:47:05 +0200 Subject: [PATCH 7/8] gromit-mpx: add maintainer gepbird --- pkgs/by-name/gr/gromit-mpx/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 32fb0ee96d08..bf6eaa17501f 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -59,7 +59,10 @@ 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; [ pjones ]; + maintainers = with maintainers; [ + pjones + gepbird + ]; platforms = platforms.linux; license = licenses.gpl2Plus; mainProgram = "gromit-mpx"; From eed66c3754fd55864498db78be15f0866aac04c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 21 Sep 2024 18:53:51 +0200 Subject: [PATCH 8/8] gromit-mpx: move to hash from sha256 --- 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 bf6eaa17501f..48c2e0aead13 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "bk138"; repo = "gromit-mpx"; rev = finalAttrs.version; - sha256 = "sha256-jHw4V2ZvfpT3PUihe/O+9BPsv+udFg5seMbYmxOz8Yk="; + hash = "sha256-jHw4V2ZvfpT3PUihe/O+9BPsv+udFg5seMbYmxOz8Yk="; }; nativeBuildInputs = [