From 7d67d51c6dd450c62a09dc7f60bdb74661da705a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 15 Apr 2023 05:48:16 +0000 Subject: [PATCH 1/4] =?UTF-8?q?evolution-ews:=203.46.4=20=E2=86=92=203.48.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.46.4...3.48.0 --- .../evolution/evolution-ews/default.nix | 4 ++-- .../evolution-ews/hardcode-gsettings.patch | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 49e8852fd0ce..fdec80717e74 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.46.4"; + version = "3.48.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bLYE99MKkh7MgxA9ZPKOj1+1VcFT9mHSQvayB/9Hy58="; + sha256 = "FmFlu+oUQbuS8qk0jZp97EiCoNMTGc0lZlcdpnd+8t4="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch index c5fb77fc2a51..dae88b9e2bae 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -70,3 +70,27 @@ index ff1b8e3..4f876c0 100644 strv = g_settings_get_strv (settings, "labels"); for (ii = 0; strv && strv[ii]; ii++) { +diff --git a/src/Microsoft365/common/e-m365-tz-utils.c b/src/Microsoft365/common/e-m365-tz-utils.c +index 7a1d7f4..3c0d5e1 100644 +--- a/src/Microsoft365/common/e-m365-tz-utils.c ++++ b/src/Microsoft365/common/e-m365-tz-utils.c +@@ -192,7 +192,18 @@ e_m365_tz_utils_get_user_timezone (void) + gchar *location; + ICalTimezone *zone = NULL; + +- settings = g_settings_new ("org.gnome.evolution.calendar"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@evo@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution.calendar", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (settings, "use-system-timezone")) + location = e_cal_util_get_system_timezone_location (); From 6492ae6d1474921f1d749bfd3145df1972cacc16 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 15 Apr 2023 06:02:13 +0000 Subject: [PATCH 2/4] =?UTF-8?q?gnome.aisleriot:=203.22.27=20=E2=86=92=203.?= =?UTF-8?q?22.28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/aisleriot/-/compare/3.22.27...3.22.28 --- pkgs/desktops/gnome/games/aisleriot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 77ca7ca8586b..0dcb7f9f0476 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.27"; + version = "3.22.28"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "aisleriot"; rev = version; - sha256 = "sha256-XvYQ1JWMBWVZF5u3VL1zPADgMDMN/1FNuwZ4vaOeo7Y="; + sha256 = "sha256-/yxItJu8He6Zx7hDK5VaApqm9FJ6uK8KHIDj4adwb2Q="; }; nativeBuildInputs = [ From 2d219d5cfcd4844913e587162fa96653c53267b5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 15 Apr 2023 16:24:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?gnome.gucharmap:=2015.0.2=20=E2=86=92=2015.?= =?UTF-8?q?0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gucharmap/-/compare/15.0.2...15.0.3 --- pkgs/desktops/gnome/core/gucharmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index ec07f89ebc55..778d74d4160c 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -45,7 +45,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "15.0.2"; + version = "15.0.3"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = "gucharmap"; rev = version; - sha256 = "sha256-QoHLMq3U/BvpCFKttxLo0qs2xmZ/pCqPjsgq/MMWNbo="; + sha256 = "sha256-Rdi48IJdiZy8Dt8hQCkQW2VFWBX1P2CtPPfowCcAEq0="; }; strictDeps = true; From da27ace74efef3dba65acbde9fe13b6cb96aa8fc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 15 Apr 2023 13:43:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?gnome.pomodoro:=200.22.0=20=E2=86=92=200.23?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/gnome-pomodoro/gnome-pomodoro/compare/0.22.0...0.23.1 --- pkgs/desktops/gnome/misc/pomodoro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix index 97340d2a3fff..4474c3c6a682 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gnome-pomodoro"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-VsrguYU1rfYWse7FuA4uYASfqET0Q3RBeU7i+HOWFBw="; + hash = "sha256-0ZUTRrth5AfzI1E4JsuchbYeFwAbl9/XGBSYQ+AnNvM="; }; patches = [