From 1f628480761c8e7f21380c952e3bea0a9a802ce5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Dec 2023 13:04:15 +0000 Subject: [PATCH] =?UTF-8?q?evolution-data-server:=203.50.1=20=E2=86=92=203?= =?UTF-8?q?.50.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds custom eds-oauth2 URI protocol handler. https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.50.1...3.50.2 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- .../core/evolution-data-server/hardcode-gsettings.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index f372f688eabc..24a2e7d50e0d 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.50.1"; + version = "3.50.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "kfT/w4objS/ok5g0RJrFQcC/9KObRE7cKpUpNEoo6Yo="; + sha256 = "XmYnA4jVDBTzsa4/oNISe5/tznUqzTk7VUUoGwH8SXA="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 4857efc4c230..f502e89a71bd 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -202,7 +202,7 @@ index 2525856..7ecc1a8 100644 g_clear_object (&settings); } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index c01e8b2..59fb4c4 100644 +index ade0a73..d7c3e73 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c @@ -2626,8 +2626,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) @@ -312,7 +312,7 @@ index bef9188..ce92f6c 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index db5fc2e..162e00f 100644 +index 4deae76..ebe0a1b 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c @@ -747,7 +747,18 @@ gpg_ctx_get_executable_name (void) @@ -505,7 +505,7 @@ index 3bb1071..199e822 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 2364f3e..e8f59f2 100644 +index af59b0b..0c7e75e 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c @@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service,