From 8d4c637199bda112ed35845b68dc5ce6d28efcc8 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 5 Jan 2024 15:38:20 +0100 Subject: [PATCH 1/4] =?UTF-8?q?evolution:=203.50.2=20=E2=86=92=203.50.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index b7167d261b21..c6736980c3d9 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.50.2"; + version = "3.50.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "D4M1214mmFRHi01tlHLu2s0Kiev3+0+DdWJDMMqqcSA="; + sha256 = "sha256-s1SjsFzRmWSjya2k7m4RsCzI25JtiB7ww30FmzAd/KQ="; }; nativeBuildInputs = [ From 85f0144502e7b8daf61fe205983849c47ccdf05d Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 5 Jan 2024 15:38:31 +0100 Subject: [PATCH 2/4] =?UTF-8?q?evolution-data-server:=203.50.2=20=E2=86=92?= =?UTF-8?q?=203.50.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 7 ++----- .../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 24a2e7d50e0d..eab06d72f7e6 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 f502e89a71bd..6fef72819391 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) From 91fd5cfa79626e2b74414357cb84a006c00b3b6a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 7 Jan 2024 12:40:26 +0800 Subject: [PATCH 3/4] libgweather: Fix darwin build https://hydra.nixos.org/build/243158351/nixlog/1 --- pkgs/development/libraries/libgweather/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 0ce3450f053e..53c4b5f259b7 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" (lib.mesonBool "introspection" withIntrospection) + ] ++ lib.optionals stdenv.isDarwin [ + "-Dc_args=-D_DARWIN_C_SOURCE" ]; postPatch = '' From 09686ed7f85fcdc9bceee2e25f2ad9a38563cc16 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 7 Jan 2024 13:09:15 +0800 Subject: [PATCH 4/4] evolution-data-server: Fix darwin build Probably caused by the clang 16 bump. /tmp/nix-build-evolution-data-server-3.50.3.drv-0/evolution-data-server-3.50.3/src/addressbook/libebook-contacts/e-phone-number-private.cpp:186:7: error: no member named 'auto_ptr' in namespace 'std' std::auto_ptr parsed_number(new EPhoneNumber); ~~~~~^ --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index eab06d72f7e6..a6fccb8713b3 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -147,6 +147,10 @@ stdenv.mkDerivation rec { --replace "-Wl,--no-undefined" "" substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \ --replace "G_OS_WIN32" "__APPLE__" + '' + lib.optionalString stdenv.cc.isClang '' + # https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/513 + substituteInPlace src/addressbook/libebook-contacts/e-phone-number-private.cpp \ + --replace "std::auto_ptr" "std::unique_ptr" ''; postInstall = lib.optionalString stdenv.isDarwin ''