cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #206173 from bobby285271/pantheon

Browse source 
pantheon.elementary-tasks: 6.3.0 -> 6.3.1
This commit is contained in:
Bobby Rong 2023-04-12 22:14:27 +08:00 committed by GitHub
commit d550ee0d43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/pantheon.nix
View file

@ -288,7 +288,7 @@ in
elementary-music elementary-music
elementary-photos elementary-photos
elementary-screenshot elementary-screenshot
# elementary-tasks elementary-tasks
elementary-terminal elementary-terminal
elementary-videos elementary-videos
epiphany epiphany

25
pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, nix-update-script , nix-update-script
, meson , meson
, ninja , ninja
@ -12,10 +13,9 @@
, evolution-data-server , evolution-data-server
, granite , granite
, geoclue2 , geoclue2
, geocode-glib , geocode-glib_2
, gtk3 , gtk3
, libchamplain , libchamplain_libsoup3
, libgdata
, libgee , libgee
, libhandy , libhandy
, libical , libical
@ -23,15 +23,24 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-tasks"; pname = "elementary-tasks";
version = "6.3.0"; version = "6.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = "tasks"; repo = "tasks";
rev = version; 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 = [ nativeBuildInputs = [
meson meson
ninja ninja
@ -46,10 +55,9 @@ stdenv.mkDerivation rec {
evolution-data-server evolution-data-server
granite granite
geoclue2 geoclue2
geocode-glib geocode-glib_2
gtk3 gtk3
libchamplain libchamplain_libsoup3
libgdata
libgee libgee
libhandy libhandy
libical libical
@ -71,6 +79,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = teams.pantheon.members; maintainers = teams.pantheon.members;
mainProgram = "io.elementary.tasks"; mainProgram = "io.elementary.tasks";
broken = true; # https://github.com/elementary/tasks/issues/340
}; };
} }