From d8cd7961b8f0740925eb9d859cf9341de447d604 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 18 Jun 2023 04:24:02 +0800 Subject: [PATCH 1/2] marker: 2020.04.04.2 -> 2023.05.02 --- pkgs/applications/editors/marker/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index 93b8dabb6814..8af1921f4d64 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -9,20 +9,20 @@ , gtk3 , gtksourceview , gtkspell3 -, webkitgtk +, webkitgtk_4_1 , pandoc }: stdenv.mkDerivation rec { pname = "marker"; - version = "2020.04.04.2"; + version = "2023.05.02"; src = fetchFromGitHub { owner = "fabiocolacio"; repo = "Marker"; rev = version; fetchSubmodules = true; - sha256 = "sha256-wLR1FQqlLA02ed/JoAcxRHhIVua1FibAee1PC2zOPOM="; + sha256 = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; }; nativeBuildInputs = [ @@ -37,13 +37,17 @@ stdenv.mkDerivation rec { gtk3 gtksourceview gtkspell3 - webkitgtk + webkitgtk_4_1 pandoc ]; + postPatch = '' + meson rewrite kwargs set project / version '${version}' + ''; + meta = with lib; { homepage = "https://fabiocolacio.github.io/Marker/"; - description = "Markdown editor for the Linux desktop"; + description = "Markdown editor for the Linux desktop made with GTK3"; maintainers = with maintainers; [ trepetti ]; license = licenses.gpl3Plus; platforms = platforms.linux; From 9537e6070961016b93096608017630559671e2c0 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 18 Jun 2023 04:24:26 +0800 Subject: [PATCH 2/2] marker: add aleksana as maintainer --- pkgs/applications/editors/marker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index 8af1921f4d64..dcfe3d8ed35f 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fabiocolacio.github.io/Marker/"; description = "Markdown editor for the Linux desktop made with GTK3"; - maintainers = with maintainers; [ trepetti ]; + maintainers = with maintainers; [ trepetti aleksana ]; license = licenses.gpl3Plus; platforms = platforms.linux; changelog = "https://github.com/fabiocolacio/Marker/releases/tag/${version}";