diff options
author | Maxine Aubrey <max@ine.dev> | 2024-01-05 15:38:31 +0100 |
---|---|---|
committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-01-10 19:11:43 +0000 |
commit | 4b2faae81a9ae732f312eaba46f1c83c1d031b23 (patch) | |
tree | 91bda93c2dd610a52229fb00cc478036fd999530 | |
parent | fb568a831ce8cb33a4fa5274707ea35589dea518 (diff) |
evolution-data-server: 3.50.2 → 3.50.3
https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.50.2...3.50.3 Also removes libaccounts-glib dependency, which is not needed since 3.31.1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/66121edf92f8babe8de8d970faf2155ca8824c07 (cherry picked from commit 85f0144502e7b8daf61fe205983849c47ccdf05d)
-rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/default.nix | 7 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 24a2e7d50e0d4..eab06d72f7e62 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -33,7 +33,6 @@ , enableOAuth2 ? stdenv.isLinux , webkitgtk_4_1 , webkitgtk_6_0 -, libaccounts-glib , json-glib , glib , gtk3 @@ -51,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.50.2"; + version = "3.50.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XmYnA4jVDBTzsa4/oNISe5/tznUqzTk7VUUoGwH8SXA="; + sha256 = "sha256-Il1wtqQCaPIlwqxCjuXrUtWm/aJgKVXVCiSXBSb+JFI="; }; patches = [ @@ -107,8 +106,6 @@ stdenv.mkDerivation rec { libphonenumber boost protobuf - ] ++ lib.optionals stdenv.isLinux [ - libaccounts-glib ] ++ lib.optionals stdenv.isDarwin [ libiconv ] ++ lib.optionals withGtk3 [ 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 f502e89a71bd3..6fef728193913 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -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 ef34665..59f294b 100644 +index 8518c90..6a655a9 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -5627,7 +5627,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) |