summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-06-26 03:37:12 +0000
committerJan Tojnar <jtojnar@gmail.com>2022-10-11 18:52:34 +0200
commitc3e4064b74813ccf07ab45824fca94e028bb31dd (patch)
treee0e6b51206b62da3eef824b3811a7c0afa037d74 /pkgs/desktops
parentee2cbd86a0d78fda4dad81863cad6de17bcede9f (diff)
downloadnixpkgs-c3e4064b74813ccf07ab45824fca94e028bb31dd.tar
nixpkgs-c3e4064b74813ccf07ab45824fca94e028bb31dd.tar.gz
nixpkgs-c3e4064b74813ccf07ab45824fca94e028bb31dd.tar.bz2
nixpkgs-c3e4064b74813ccf07ab45824fca94e028bb31dd.tar.lz
nixpkgs-c3e4064b74813ccf07ab45824fca94e028bb31dd.tar.xz
nixpkgs-c3e4064b74813ccf07ab45824fca94e028bb31dd.tar.zst
nixpkgs-c3e4064b74813ccf07ab45824fca94e028bb31dd.zip
endeavour: rename from gnome.gnome-todo
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome/apps/gnome-todo/default.nix96
-rw-r--r--pkgs/desktops/gnome/default.nix3
2 files changed, 1 insertions, 98 deletions
diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix
deleted file mode 100644
index 1f905dcc7c1..00000000000
--- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, fetchpatch
-, meson
-, ninja
-, pkg-config
-, python3
-, wrapGAppsHook4
-, gettext
-, gnome
-, glib
-, gtk4
-, wayland
-, libadwaita
-, libpeas
-, gnome-online-accounts
-, gsettings-desktop-schemas
-, libportal-gtk4
-, evolution-data-server-gtk4
-, libical
-, librest
-, json-glib
-, itstool
-, unstableGitUpdater
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-todo";
-  version = "unstable-2022-06-12";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "gnome-todo";
-    rev = "ad4e15f0b58860caf8c6d497795b83b594a9c3e5";
-    sha256 = "HRufLoZou9ssQ/qoDG8anhOAtl8IYvFpyjq/XJlsotQ=";
-  };
-
-  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";
-    })
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gettext
-    python3
-    wrapGAppsHook4
-    itstool
-  ];
-
-  buildInputs = [
-    glib
-    gtk4
-    wayland # required by gtk header
-    libadwaita
-    libpeas
-    gnome-online-accounts
-    gsettings-desktop-schemas
-    gnome.adwaita-icon-theme
-
-    # Plug-ins
-    libportal-gtk4 # background
-    evolution-data-server-gtk4 # eds
-    libical
-    librest # todoist
-    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/GNOME/gnome-todo.git";
-    };
-  };
-
-  meta = with lib; {
-    description = "Personal task manager for GNOME";
-    homepage = "https://wiki.gnome.org/Apps/Todo";
-    license = licenses.gpl3Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 1169bae6d67..b8d48cf12fd 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -178,8 +178,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { };
 
-  gnome-todo = callPackage ./apps/gnome-todo {};
-
   gnome-weather = callPackage ./apps/gnome-weather { };
 
   polari = callPackage ./apps/polari { };
@@ -269,6 +267,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
 
   gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16
+  gnome-todo = pkgs.endeavour; # added 2022-07-30
   libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19
 
   bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26