diff --git a/pkgs/by-name/ev/evolution-data-server/fix-paths.patch b/pkgs/by-name/ev/evolution-data-server/fix-paths.patch deleted file mode 100644 index 334235516591..000000000000 --- a/pkgs/by-name/ev/evolution-data-server/fix-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/calendar/libecal/e-cal-system-timezone.c -+++ b/src/calendar/libecal/e-cal-system-timezone.c -@@ -26,7 +26,7 @@ - #ifdef HAVE_SOLARIS - #define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab" - #else --#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo" -+#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo" - #endif - - #define ETC_TIMEZONE "/etc/timezone" diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index a98612382f1f..5c8a196e4eb7 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -128,10 +128,10 @@ index e85a56b..59d3fe2 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index 5b4debf..77c8d9c 100644 +index 3ab8908..6c4b210 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c -@@ -144,7 +144,18 @@ ebmb_is_power_saver_enabled (void) +@@ -146,7 +146,18 @@ ebmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -242,10 +242,10 @@ index a83d3d3..dc7acac 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index e0e9169..a44f52c 100644 +index f19ab22..abd3263 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -156,7 +156,18 @@ ecmb_is_power_saver_enabled (void) +@@ -158,7 +158,18 @@ ecmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -265,7 +265,7 @@ index e0e9169..a44f52c 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2627,7 +2638,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2629,7 +2640,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -312,10 +312,10 @@ index d5a0823..2ae03f8 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index cceba4a..d3c4da6 100644 +index b09ded8..5fe1996 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) +@@ -744,7 +744,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -361,7 +361,7 @@ index e61160c..b6553a4 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index 56429a9..a9cc62c 100644 +index 396cf39..e31dc1a 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -5682,7 +5682,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) @@ -385,10 +385,10 @@ index 56429a9..a9cc62c 100644 if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c -index 6556f1e..90f0a5e 100644 +index 38bedb6..f799c29 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c +++ b/src/camel/providers/smtp/camel-smtp-transport.c -@@ -1471,7 +1471,18 @@ smtp_helo (CamelSmtpTransport *transport, +@@ -1472,7 +1472,18 @@ smtp_helo (CamelSmtpTransport *transport, transport->authtypes = NULL; } @@ -433,7 +433,7 @@ index 188f276..939f89b 100644 settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index 1453410..a3f06b0 100644 +index 9624d86..6baa019 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c @@ -72,7 +72,18 @@ eos_google_read_settings (EOAuth2Service *service, @@ -457,7 +457,7 @@ index 1453410..a3f06b0 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 734f194..5b05077 100644 +index 7342577..915d8bd 100644 --- a/src/libedataserver/e-oauth2-service-outlook.c +++ b/src/libedataserver/e-oauth2-service-outlook.c @@ -75,7 +75,18 @@ eos_outlook_read_settings (EOAuth2Service *service, @@ -481,7 +481,7 @@ index 734f194..5b05077 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index 3a9ce9c..f96b840 100644 +index 3738359..f9ce2d9 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c @@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, @@ -505,7 +505,7 @@ index 3a9ce9c..f96b840 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index af59b0b..0c7e75e 100644 +index 29c1dd2..84d42b7 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, diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 8dc34e210948..107fe4ba40b7 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, substituteAll , pkg-config , gnome , _experimental-update-script-combinators @@ -13,7 +12,6 @@ , libsecret , icu , sqlite -, tzdata , libcanberra-gtk3 , p11-kit , db @@ -40,6 +38,7 @@ , withGtk3 ? true , withGtk4 ? false , libphonenumber +, libuuid , gnome-online-accounts , libgweather , boost @@ -50,21 +49,16 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.52.4"; + version = "3.53.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; - hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc="; + hash = "sha256-QRhmMD/rQoac1mHXr+ygF/hh/ABHy4Dgmt8QXsqiIbU="; }; patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - # Avoid using wrapper function, which the hardcode gsettings # patch generator cannot handle. ./drop-tentative-settings-constructor.patch @@ -104,6 +98,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 pcre libphonenumber + libuuid boost protobuf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [