diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-04-12 22:14:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 22:14:27 +0800 |
| commit | d550ee0d43250bd2cc2f681a1a41f3a244e0426f (patch) | |
| tree | fb06c51065d26e7d3030b1b7d2906c5f87e1c385 /pkgs/desktops/pantheon | |
| parent | db81ed584f80b6fb4ecd12138a04a09977e78ae5 (diff) | |
| parent | aacdc51e1591d49c8cf00979a0edae598baee7b0 (diff) | |
| download | nixpkgs-d550ee0d43250bd2cc2f681a1a41f3a244e0426f.tar nixpkgs-d550ee0d43250bd2cc2f681a1a41f3a244e0426f.tar.gz nixpkgs-d550ee0d43250bd2cc2f681a1a41f3a244e0426f.tar.bz2 nixpkgs-d550ee0d43250bd2cc2f681a1a41f3a244e0426f.tar.lz nixpkgs-d550ee0d43250bd2cc2f681a1a41f3a244e0426f.tar.xz nixpkgs-d550ee0d43250bd2cc2f681a1a41f3a244e0426f.tar.zst nixpkgs-d550ee0d43250bd2cc2f681a1a41f3a244e0426f.zip | |
Merge pull request #206173 from bobby285271/pantheon
pantheon.elementary-tasks: 6.3.0 -> 6.3.1
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-tasks/default.nix | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 683b4a75acf..bba8fb4a723 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -12,10 +13,9 @@ , evolution-data-server , granite , geoclue2 -, geocode-glib +, geocode-glib_2 , gtk3 -, libchamplain -, libgdata +, libchamplain_libsoup3 , libgee , libhandy , libical @@ -23,15 +23,24 @@ stdenv.mkDerivation rec { pname = "elementary-tasks"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = "tasks"; rev = version; - sha256 = "sha256-kW36bKA0uzW98Xl2bjbTkcfLm4SeQR8VB2FyKOqfPnM="; + sha256 = "sha256-b8KUlfpZxRFDiBjgrV/4XicCcEw2fWaN78NaOq6jQBk="; }; + patches = [ + # Port to libsoup 3 + # https://github.com/elementary/tasks/pull/345 + (fetchpatch { + url = "https://github.com/elementary/tasks/commit/22e0d18693932e9eea3d2a22329f845575ce26e6.patch"; + sha256 = "sha256-nLJlKf4L7G12ZnCo4wezyMRyeAf+Tf0OGHyT8I1ZuDA="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -46,10 +55,9 @@ stdenv.mkDerivation rec { evolution-data-server granite geoclue2 - geocode-glib + geocode-glib_2 gtk3 - libchamplain - libgdata + libchamplain_libsoup3 libgee libhandy libical @@ -71,6 +79,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.tasks"; - broken = true; # https://github.com/elementary/tasks/issues/340 }; } |