diff --git a/pkgs/applications/misc/endeavour/default.nix b/pkgs/applications/misc/endeavour/default.nix index 18ff848fbcd..3c48efe66c4 100644 --- a/pkgs/applications/misc/endeavour/default.nix +++ b/pkgs/applications/misc/endeavour/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , wrapGAppsHook4 , gettext , gnome @@ -22,19 +21,19 @@ , librest , json-glib , itstool -, unstableGitUpdater +, gitUpdater }: stdenv.mkDerivation rec { pname = "endeavour"; - version = "unstable-2022-06-12"; + version = "42.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Endeavour"; - rev = "ad4e15f0b58860caf8c6d497795b83b594a9c3e5"; - sha256 = "HRufLoZou9ssQ/qoDG8anhOAtl8IYvFpyjq/XJlsotQ="; + rev = "v${version}"; + sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ="; }; patches = [ @@ -45,6 +44,20 @@ stdenv.mkDerivation rec { extraPrefix = ""; name = "gnome-todo_meson-build.patch"; }) + + # build: Fix building with -Werror=format-security + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch"; + sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo="; + }) + + # build: Use GNOME module post_install() + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch"; + sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I="; + }) ]; nativeBuildInputs = [ @@ -52,7 +65,6 @@ stdenv.mkDerivation rec { ninja pkg-config gettext - python3 wrapGAppsHook4 itstool ]; @@ -75,14 +87,10 @@ stdenv.mkDerivation rec { json-glib # todoist ]; - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py - patchShebangs build-aux/meson/meson_post_install.py - ''; - passthru = { - updateScript = unstableGitUpdater { - url = "https://gitlab.gnome.org/World/Endeavour.git"; + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; }; };