From eecd59dd5635d7f9ecb975476c6606cb87d932fe Mon Sep 17 00:00:00 2001 From: cafkafk Date: Sat, 3 Sep 2022 15:43:34 +0200 Subject: [PATCH 1/2] Added cafkafk to maintainer-list.nix --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3efd6efcefaa..34e27d00d136 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15146,4 +15146,14 @@ fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; }]; }; + cafkafk = { + email = "cafkafk@cafkafk.com"; + matrix = "@cafkafk:matrix.cafkafk.com"; + name = "Christina Sørensen"; + github = "cafkafk"; + githubId = 89321978; + keys [{ + fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; + }]; + }; } From c729132d01ec0b0516293363af3c6c5e3bb11e10 Mon Sep 17 00:00:00 2001 From: cafkafk Date: Sat, 3 Sep 2022 15:46:48 +0200 Subject: [PATCH 2/2] Fixed wgptk + v6.0 -> 6.5 - Added cafkafk as maintaienr - Moved gobject-introspection to nativeBuildInputs - Bumped version og wpgtk - Fixed spelling mistake in maintainer-list.nix --- maintainers/maintainer-list.nix | 2 +- pkgs/tools/X11/wpgtk/default.nix | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 34e27d00d136..4746dd86baad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15152,7 +15152,7 @@ name = "Christina Sørensen"; github = "cafkafk"; githubId = 89321978; - keys [{ + keys = [{ fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; }]; }; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 48b3bbffd324..1bdc5b0f49ba 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,19 +3,22 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.5.0"; + version = "6.5.5"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "0gv607jrdfbmadjyy3pbrj5ksh1dmaw5hz7l8my2z7sh0ifds0n2"; + sha256 = "sha256-g3flxQNiNta+uL4t21Lhpij8b5yB78SJLGaFpTcm9fE="; }; + nativeBuildInputs = [ + gobject-introspection + ]; + buildInputs = [ wrapGAppsHook gtk3 - gobject-introspection gnome.adwaita-icon-theme libxslt ]; @@ -46,6 +49,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/deviantfero/wpgtk"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ maintainers.melkor333 ]; + maintainers = [ maintainers.melkor333 maintainers.cafkafk ]; }; }