summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-01-18 07:13:51 +0000
committerBobby Rong <rjl931189261@126.com>2023-01-18 15:21:42 +0800
commitc2bf247bec672a0d6e2bdeced2d7d1b5643281c1 (patch)
treee7f1a2280a771551b04132c1359257c0a48264bd
parent0282b0b2bccf28f7bc74763d675cc814c962e4a5 (diff)
downloadnixpkgs-c2bf247bec672a0d6e2bdeced2d7d1b5643281c1.tar
nixpkgs-c2bf247bec672a0d6e2bdeced2d7d1b5643281c1.tar.gz
nixpkgs-c2bf247bec672a0d6e2bdeced2d7d1b5643281c1.tar.bz2
nixpkgs-c2bf247bec672a0d6e2bdeced2d7d1b5643281c1.tar.lz
nixpkgs-c2bf247bec672a0d6e2bdeced2d7d1b5643281c1.tar.xz
nixpkgs-c2bf247bec672a0d6e2bdeced2d7d1b5643281c1.tar.zst
nixpkgs-c2bf247bec672a0d6e2bdeced2d7d1b5643281c1.zip
evolution-data-server: 3.46.2 → 3.46.3
https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.46.2...3.46.3
-rw-r--r--pkgs/desktops/gnome/core/evolution-data-server/default.nix4
-rw-r--r--pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch8
2 files changed, 6 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 bdde8160ca5..082483b1c24 100644
--- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
@@ -50,13 +50,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.46.2";
+  version = "3.46.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "+b1SAIt+U12BaSDPzscKDlViveKK9x+ZbiA/9qhuRuA=";
+    sha256 = "CTjiJ55c+8IgR2bKnT/qVwkRaZsHwQy+AaymKn6LK+4=";
   };
 
   patches = [
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 1774717affe..dfe109f57bd 100644
--- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
@@ -442,10 +442,10 @@ index 8e4ee81..cc94026 100644
  		g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
-index 7783781..6a2db01 100644
+index b0c2410..ca915e0 100644
 --- a/src/libedataserver/e-oauth2-service.c
 +++ b/src/libedataserver/e-oauth2-service.c
-@@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
+@@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
  	name_len = strlen (name);
  	hostname_len = strlen (hostname);
  
@@ -466,10 +466,10 @@ index 7783781..6a2db01 100644
  	g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
-index 6701a3a..f497263 100644
+index 4a9b398..e7cb404 100644
 --- a/src/libedataserver/e-source-registry.c
 +++ b/src/libedataserver/e-source-registry.c
-@@ -1764,7 +1764,19 @@ e_source_registry_init (ESourceRegistry *registry)
+@@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry)
  
  	g_mutex_init (&registry->priv->sources_lock);