Unverified Commit d550ee0d authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #206173 from bobby285271/pantheon 

pantheon.elementary-tasks: 6.3.0 -> 6.3.1
parents db81ed58 aacdc51e

nixos/modules/services/x11/desktop-managers/pantheon.nix

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ in 
        elementary-music

        elementary-photos

        elementary-screenshot

        # elementary-tasks

        elementary-tasks

        elementary-terminal

        elementary-videos

        epiphany

pkgs/desktops/pantheon/apps/elementary-tasks/default.nix

+16 −9
Original line number Diff line number Diff line 
{ 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

  };

}