Running nixpkgs-update (https://nix-community.org/update-bot/) with UPDATE_INFO: evolution-ews 0 -> 1 attrpath: evolution-ews Checking auto update branch... [version] [version] skipping because derivation has updateScript [rustCrateVersion] [rustCrateVersion] No cargoHash found [golangModuleVersion] [golangModuleVersion] Not a buildGoModule package with vendorHash [npmDepsVersion] [npmDepsVersion] No npmDepsHash [updateScript] [updateScript] Success [updateScript] this derivation will be built: /nix/store/ggwgayilsf8gf30ql5yn41zrccxcflr3-packages.json.drv building '/nix/store/ggwgayilsf8gf30ql5yn41zrccxcflr3-packages.json.drv'... Going to be running update for following packages: - evolution-ews-3.58.3 Press Enter key to continue... Running update for: Enqueuing group of 1 packages - evolution-ews-3.58.3: UPDATING ... - evolution-ews-3.58.3: DONE. Packages updated! Diff after rewrites: diff --git a/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch index f968cf05558b..2cd005612c20 100644 --- a/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch @@ -1,5 +1,5 @@ diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c -index 9dcc5b1..9588be3 100644 +index a976b2e..c15e6f3 100644 --- a/src/EWS/camel/camel-ews-utils.c +++ b/src/EWS/camel/camel-ews-utils.c @@ -1562,7 +1562,7 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C @@ -32,7 +32,7 @@ index 9dcc5b1..9588be3 100644 for (ii = 0; strv && strv[ii]; ii++) { diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c -index a4997c7..94be919 100644 +index 6c1ebd6..4b7de44 100644 --- a/src/Microsoft365/camel/camel-m365-store.c +++ b/src/Microsoft365/camel/camel-m365-store.c @@ -311,7 +311,7 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca @@ -93,10 +93,10 @@ index cec5417..38f1a87 100644 if (g_settings_get_boolean (settings, "use-system-timezone")) location = e_cal_util_get_system_timezone_location (); diff --git a/src/common/e-ews-common-utils.c b/src/common/e-ews-common-utils.c -index f388e3b..ed57213 100644 +index 1cc5a58..05b3610 100644 --- a/src/common/e-ews-common-utils.c +++ b/src/common/e-ews-common-utils.c -@@ -208,10 +208,21 @@ e_ews_common_utils_get_configured_icaltimezone (void) +@@ -167,10 +167,21 @@ e_ews_common_utils_get_configured_icaltimezone (void) ICalTimezone *zone = NULL; gchar *location = NULL; diff --git a/pkgs/by-name/ev/evolution-ews/package.nix b/pkgs/by-name/ev/evolution-ews/package.nix index 139ca856ccf4..be943e069f4c 100644 --- a/pkgs/by-name/ev/evolution-ews/package.nix +++ b/pkgs/by-name/ev/evolution-ews/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution-ews"; - version = "3.58.3"; + version = "3.60.1"; src = fetchurl { url = "mirror://gnome/sources/evolution-ews/${lib.versions.majorMinor finalAttrs.version}/evolution-ews-${finalAttrs.version}.tar.xz"; - hash = "sha256-P274u2OJAT6EPiWM4dwxeokaNPh9eXgMmu8E0nQavJI="; + hash = "sha256-CiL4ZevrcOJnlSD9LZSqmXPEA8vk4DqojPjyPzWOi20="; }; patches = [ No auto update branch exists Old version 3.58.3" not present in staging derivation file with contents: { stdenv, lib, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution, gtk3, libsoup_3, libical, json-glib, libmspack, webkitgtk_4_1, replaceVars, _experimental-update-script-combinators, glib, makeHardcodeGsettingsPatch, }: stdenv.mkDerivation (finalAttrs: { pname = "evolution-ews"; version = "3.60.1"; src = fetchurl { url = "mirror://gnome/sources/evolution-ews/${lib.versions.majorMinor finalAttrs.version}/evolution-ews-${finalAttrs.version}.tar.xz"; hash = "sha256-CiL4ZevrcOJnlSD9LZSqmXPEA8vk4DqojPjyPzWOi20="; }; patches = [ # evolution-ews contains .so files loaded by evolution-data-server referring # schemas from evolution. evolution-data-server is not wrapped with # evolution's schemas because it would be a circular dependency with # evolution. (replaceVars ./hardcode-gsettings.patch { evo = glib.makeSchemaPath evolution evolution.name; }) ]; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; buildInputs = [ evolution-data-server evolution gtk3 libsoup_3 libical json-glib libmspack # For evolution-shell-3.0 webkitgtk_4_1 ]; cmakeFlags = [ # don't try to install into ${evolution} "-DFORCE_INSTALL_PREFIX=ON" ]; passthru = { hardcodeGsettingsPatch = makeHardcodeGsettingsPatch { inherit (finalAttrs) src; schemaIdToVariableMapping = { "org.gnome.evolution.mail" = "evo"; "org.gnome.evolution.calendar" = "evo"; }; schemaExistsFunction = "e_ews_common_utils_gsettings_schema_exists"; }; updateScript = let updateSource = gnome.updateScript { packageName = "evolution-ews"; versionPolicy = "odd-unstable"; }; updatePatch = _experimental-update-script-combinators.copyAttrOutputToFile "evolution-ews.hardcodeGsettingsPatch" ./hardcode-gsettings.patch; in _experimental-update-script-combinators.sequence [ updateSource updatePatch ]; }; meta = { description = "Evolution connector for Microsoft Exchange Server protocols"; homepage = "https://gitlab.gnome.org/GNOME/evolution-ews"; license = lib.licenses.lgpl21Plus; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 maintainers = [ lib.maintainers.dasj19 ]; platforms = lib.platforms.linux; }; })