From b721d2721487613940b2ac1f676360ba65d6dc2f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 Jun 2023 10:30:08 +0800
Subject: [PATCH 1/2] planify: renamed from elementary-planner

A throw is used instead of alias because this corresponds to a very
breaking upstream change and I don't see automatic data migration
right now.
---
 .../office/{elementary-planner => planify}/default.nix      | 6 +++---
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename pkgs/applications/office/{elementary-planner => planify}/default.nix (93%)

diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/planify/default.nix
similarity index 93%
rename from pkgs/applications/office/elementary-planner/default.nix
rename to pkgs/applications/office/planify/default.nix
index e46e1e3b7d5f..3bcbe7819944 100644
--- a/pkgs/applications/office/elementary-planner/default.nix
+++ b/pkgs/applications/office/planify/default.nix
@@ -22,12 +22,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "elementary-planner";
+  pname = "planify";
   version = "unstable-2023-04-20";
 
   src = fetchFromGitHub {
     owner = "alainm23";
-    repo = "planner";
+    repo = "planify";
     rev = "97c0f1c30d087e2ac459241bfdb9b606a12a77ce";
     sha256 = "sha256-W4Hfa9zgKpGKfd7QSTLF2FT0vSJ5mQMV+W9WWltZlL4=";
   };
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Task manager with Todoist support designed for GNU/Linux";
-    homepage = "https://useplanner.com";
+    homepage = "https://github.com/alainm23/planify";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
     platforms = platforms.linux;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6527b83e63b6..a631fbdfde5f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -445,6 +445,7 @@ mapAliases ({
   electron_8 = throw "electron_8 has been removed in favor of newer versions"; # added 2022-02-08
 
   electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01
+  elementary-planner = throw "elementary-planner has been renamed to planify"; # Added 2023-06-24
 
   elixir_ls = elixir-ls; # Added 2023-03-20
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 587345e59742..f455470fdff9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30381,8 +30381,6 @@ with pkgs;
 
   electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };
 
-  elementary-planner = callPackage ../applications/office/elementary-planner { };
-
   elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector {
     libdwarf = libdwarf_20210528;
   };
@@ -33153,6 +33151,8 @@ with pkgs;
 
   pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { };
 
+  planify = callPackage ../applications/office/planify { };
+
   plank = callPackage ../applications/misc/plank { };
 
   playonlinux = callPackage ../applications/misc/playonlinux

From da1b5e43ef4adea2f6b3b2d1964465b42d361411 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 24 Jun 2023 10:36:59 +0800
Subject: [PATCH 2/2] planify: unstable-2023-04-20 -> 4.1

https://github.com/alainm23/planify/compare/97c0f1c30d087e2a...4.1
---
 pkgs/applications/office/planify/default.nix | 23 +++++---------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix
index 3bcbe7819944..59f603a1ae36 100644
--- a/pkgs/applications/office/planify/default.nix
+++ b/pkgs/applications/office/planify/default.nix
@@ -5,7 +5,6 @@
 , meson
 , ninja
 , pkg-config
-, python3
 , vala
 , wrapGAppsHook4
 , evolution-data-server
@@ -16,6 +15,7 @@
 , libadwaita
 , libgee
 , libical
+, libportal-gtk4
 , pantheon
 , sqlite
 , webkitgtk_6_0
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "unstable-2023-04-20";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
-    rev = "97c0f1c30d087e2ac459241bfdb9b606a12a77ce";
-    sha256 = "sha256-W4Hfa9zgKpGKfd7QSTLF2FT0vSJ5mQMV+W9WWltZlL4=";
+    rev = version;
+    sha256 = "sha256-H8TPuqKRwbcB+2NTC5ZIK7y6uiYbTT4svtx21FbTzME=";
   };
 
   nativeBuildInputs = [
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    python3
     vala
     wrapGAppsHook4
   ];
@@ -51,28 +50,18 @@ stdenv.mkDerivation rec {
     libadwaita
     libgee
     libical
+    libportal-gtk4
     pantheon.granite7
     sqlite
     webkitgtk_6_0
   ];
 
-  mesonFlags = [
-    "-Dproduction=true"
-  ];
-
-  postPatch = ''
-    chmod +x build-aux/meson/post_install.py
-    patchShebangs build-aux/meson/post_install.py
-    substituteInPlace build-aux/meson/post_install.py \
-      --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
-  '';
-
   meta = with lib; {
     description = "Task manager with Todoist support designed for GNU/Linux";
     homepage = "https://github.com/alainm23/planify";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
     platforms = platforms.linux;
-    mainProgram = "com.github.alainm23.task-planner";
+    mainProgram = "io.github.alainm23.planify";
   };
 }