diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/planify/default.nix similarity index 59% rename from pkgs/applications/office/elementary-planner/default.nix rename to pkgs/applications/office/planify/default.nix index e46e1e3b7d5f..59f603a1ae36 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , evolution-data-server @@ -16,20 +15,21 @@ , libadwaita , libgee , libical +, libportal-gtk4 , pantheon , sqlite , webkitgtk_6_0 }: stdenv.mkDerivation rec { - pname = "elementary-planner"; - version = "unstable-2023-04-20"; + pname = "planify"; + version = "4.1"; src = fetchFromGitHub { owner = "alainm23"; - repo = "planner"; - rev = "97c0f1c30d087e2ac459241bfdb9b606a12a77ce"; - sha256 = "sha256-W4Hfa9zgKpGKfd7QSTLF2FT0vSJ5mQMV+W9WWltZlL4="; + repo = "planify"; + 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://useplanner.com"; + 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"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fad9272fe03a..4553ba96dee1 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 b4fd32339b89..268e343f259f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30457,8 +30457,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; }; @@ -33238,6 +33236,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