diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-05 13:13:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-05 13:13:21 +0200 |
| commit | e50c67ad7eefa8e77436fbd0366b69638b1c8713 (patch) | |
| tree | 0b5038414bb6f38e649f9eb53133d2fb2eca6c72 /pkgs/desktops/gnome-3/core/evolution-data-server | |
| parent | df77ecc99d0ee7555bc6353e6eef592409d5d855 (diff) | |
| parent | 866c5aa090d8f4c7f6e1b983531b7b8be4d354ac (diff) | |
| download | nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.gz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.bz2 nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.lz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.xz nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.tar.zst nixlib-e50c67ad7eefa8e77436fbd0366b69638b1c8713.zip | |
Merge pull request #83618 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/desktops/gnome-3/core/evolution-data-server')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index ff4e499204c3..ca122eaffd06 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.34.4"; + version = "3.36.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wz8mizblmvficxap6z9w62ymjwa8x99spnaljcwjl1wc55lnp4q"; + sha256 = "1v4qjnggpwvafyqnkl1avsi3mpfxpcaz7kwxcf2iz7pvb1k0xmyl"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch index c499bac4552c..4e345c3cb3ca 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch @@ -423,10 +423,10 @@ diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e- index f89cd4a5c..06cca9b5f 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1642,7 +1642,21 @@ static void +@@ -1650,7 +1650,21 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { - reminders->priv = G_TYPE_INSTANCE_GET_PRIVATE (reminders, E_TYPE_REMINDERS_WIDGET, ERemindersWidgetPrivate); + reminders->priv = e_reminders_widget_get_instance_private (reminders); - reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); + { + GSettingsSchemaSource *schema_source; |