diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index eb85c97f9f21..74987c07a5b9 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -57,9 +59,12 @@ stdenv.mkDerivation rec { patches = lib.optionals withPantheon [ # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/evince - # The patch currently differs from upstream (updated for evince 41). - ./pantheon-dark-style.patch + # https://github.com/elementary/evince/pull/21 + # https://github.com/elementary/evince/pull/31 + (fetchpatch { + url = "https://raw.githubusercontent.com/elementary/evince/c8364019ee2c2dffd2a1bccf79b8f4e526aa22af/dark-style.patch"; + sha256 = "sha256-nKELRXnM6gMRTGmWdO1Qqlo9ciy+4HOK5z2CYOoi2Lo="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch b/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch deleted file mode 100644 index 5e1ef67b08cd..000000000000 --- a/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/meson.build b/meson.build -index bcb69cf7..4a18c08c 100644 ---- a/meson.build -+++ b/meson.build -@@ -162,6 +162,7 @@ gmodule_dep = dependency('gmodule-2.0') - gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_version) - gtk_dep = dependency('gtk+-3.0', version: gtk_req_version) - gthread_dep = dependency('gthread-2.0', version: glib_req_version) -+granite_dep = dependency('granite') - # Keep the version here synchronised with subprojects/libhandy.wrap - hdy_dep = dependency('libhandy-1', version: hdy_req_version, fallback: ['libhandy', 'libhandy_dep']) - -diff --git a/shell/ev-application.c b/shell/ev-application.c -index e704bda2..d705328c 100644 ---- a/shell/ev-application.c -+++ b/shell/ev-application.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #ifdef GDK_WINDOWING_X11 - #include -@@ -176,7 +177,7 @@ ev_spawn (const char *uri, - - g_string_append_printf (cmd, " %s", path); - g_free (path); -- -+ - /* Page label */ - if (dest) { - switch (ev_link_dest_get_dest_type (dest)) { -@@ -940,6 +941,20 @@ ev_application_migrate_config_dir (EvApplication *application) - g_free (old_accels); - } - -+static void -+ev_application_set_prefers_color_scheme () -+{ -+ GtkSettings* gtk_settings = gtk_settings_get_default (); -+ GraniteSettings* granite_settings = granite_settings_get_default (); -+ -+ g_object_set ( -+ gtk_settings, -+ "gtk-application-prefer-dark-theme", -+ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, -+ NULL -+ ); -+} -+ - static void - ev_application_startup (GApplication *gapplication) - { -@@ -992,6 +1007,7 @@ ev_application_startup (GApplication *gapplication) - - EvApplication *application = EV_APPLICATION (gapplication); - const gchar **it; -+ GraniteSettings* granite_settings = granite_settings_get_default (); - - g_application_set_resource_base_path (gapplication, "/org/gnome/evince"); - -@@ -999,6 +1015,11 @@ ev_application_startup (GApplication *gapplication) - - hdy_init (); - -+ ev_application_set_prefers_color_scheme (); -+ -+ g_signal_connect (granite_settings, "notify::prefers-color-scheme", -+ G_CALLBACK(ev_application_set_prefers_color_scheme), NULL); -+ - for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1) - gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]); - } -diff --git a/shell/meson.build b/shell/meson.build -index 7cbc48f2..a3089b13 100644 ---- a/shell/meson.build -+++ b/shell/meson.build -@@ -52,6 +52,7 @@ sources += gnome.compile_resources( - deps = [ - gdk_pixbuf_dep, - gnome_desktop_dep, -+ granite_dep, - hdy_dep, - libevmisc_dep, - libevproperties_dep, diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 6492c9332940..d0c1cc970a7c 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-+r19n42FPoBArZNDF4ZAdUBZqsSxpLwpeBoyaRJBCrg="; + sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0="; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index d74907db9118..badfec690eb5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,15 +26,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.10.1"; - - repoName = "applications-menu"; + version = "2.10.2"; src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "applications-menu"; rev = version; - sha256 = "sha256-e9InWx5b2DAFK7m7z/oCW7Mw/ymBNz1Sc7vT65kkZ9o="; + sha256 = "sha256-xBuMJzIFOueSvNwvXc85AI9NHuMW3bOblNsyuDkIzyk="; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 708e2b6eb0cc..1164e0592bfb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg="; + sha256 = "sha256-GxlnzLDrZmDDAGlUMoM4k4SkbCqra3Th6ugRAj3Wse4="; }; patches = [ @@ -38,12 +37,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; elementary_calendar = elementary-calendar; }) - # Fix incorrect month shown on re-opening indicator if previously changed month - # https://github.com/elementary/wingpanel-indicator-datetime/pull/284 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch"; - sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch index bec5f43e0d78..51c495362027 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch @@ -1,8 +1,21 @@ +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 4aba03c..6385bc9 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -55,7 +55,7 @@ public class DateTime.Indicator : Wingpanel.Indicator { + + panel_label.button_press_event.connect ((e) => { + if (e.button == Gdk.BUTTON_MIDDLE) { +- var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F")); ++ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F")); + try { + var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE); + appinfo.launch_uris (null, null); diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala -index 6e0d530a..2f90f96c 100644 +index cb54253..7477d1a 100644 --- a/src/Widgets/calendar/CalendarView.vala +++ b/src/Widgets/calendar/CalendarView.vala -@@ -222,7 +222,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { +@@ -242,7 +242,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. public void show_date_in_maya (GLib.DateTime date) { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index a0a687985f91..3ebc38138795 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ZuOZlfxtRq8ZcrXGe9wlFGwn2isdvMoXQveKKnEPFdo="; + sha256 = "sha256-iHhZJwaomQgH1Sal8uejl4QlavOQ75UKZ9xchTi1X3U="; }; nativeBuildInputs = [