From 82e844aad1688d071429140d6307d23a888c4501 Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Mon, 7 Nov 2022 23:26:23 +0800
Subject: [PATCH 1/2] endeavour: move to pkgs/applications/office

Office is likely a better category for endeavour.
---
 pkgs/applications/{misc => office}/endeavour/default.nix | 0
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/{misc => office}/endeavour/default.nix (100%)

diff --git a/pkgs/applications/misc/endeavour/default.nix b/pkgs/applications/office/endeavour/default.nix
similarity index 100%
rename from pkgs/applications/misc/endeavour/default.nix
rename to pkgs/applications/office/endeavour/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93ddf1774edf..8be527795501 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28061,7 +28061,7 @@ with pkgs;
 
   inherit (gnome) empathy;
 
-  endeavour = callPackage ../applications/misc/endeavour { };
+  endeavour = callPackage ../applications/office/endeavour { };
 
   enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };
 

From 91a82f14d2c22f9c606c8c3df5579549796e393f Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Mon, 7 Nov 2022 23:29:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?endeavour:=2042.0=20=E2=86=92=2043.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/World/Endeavour/-/compare/v42.0...43.0
---
 .../applications/office/endeavour/default.nix | 42 ++-----------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/office/endeavour/default.nix b/pkgs/applications/office/endeavour/default.nix
index 3c48efe66c47..09442c8b56ba 100644
--- a/pkgs/applications/office/endeavour/default.nix
+++ b/pkgs/applications/office/endeavour/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitLab
-, fetchpatch
 , meson
 , ninja
 , pkg-config
@@ -15,51 +14,24 @@
 , libpeas
 , gnome-online-accounts
 , gsettings-desktop-schemas
-, libportal-gtk4
 , evolution-data-server-gtk4
 , libical
-, librest
-, json-glib
 , itstool
 , gitUpdater
 }:
 
 stdenv.mkDerivation rec {
   pname = "endeavour";
-  version = "42.0";
+  version = "43.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "Endeavour";
-    rev = "v${version}";
-    sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ=";
+    rev = version;
+    sha256 = "sha256-1mCTw+nJ1w7RdCXfPCO31t1aYOq9Bki3EaXsHiiveD0=";
   };
 
-  patches = [
-    # fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667
-    (fetchpatch {
-      url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";
-      sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY=";
-      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 = [
     meson
     ninja
@@ -80,18 +52,12 @@ stdenv.mkDerivation rec {
     gnome.adwaita-icon-theme
 
     # Plug-ins
-    libportal-gtk4 # background
     evolution-data-server-gtk4 # eds
     libical
-    librest # todoist
-    json-glib # todoist
   ];
 
   passthru = {
-    updateScript = gitUpdater {
-      inherit pname version;
-      rev-prefix = "v";
-    };
+    updateScript = gitUpdater { };
   };
 
   meta = with lib; {