diff options
author | Bobby Rong <rjl931189261@126.com> | 2023-01-20 12:34:41 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-20 12:34:41 +0800 |
commit | 7cf8f9bcee843560e454d66392c3e28ad850c893 (patch) | |
tree | 5d04144916d9731d5f5e26c5dc1fd85a3069c5e0 /pkgs/desktops | |
parent | eecef8985ed8965fa62290e5a25ee028630fb870 (diff) | |
parent | b8e8008873120935d47e5d3886a585f0afef47c8 (diff) | |
download | nixpkgs-7cf8f9bcee843560e454d66392c3e28ad850c893.tar nixpkgs-7cf8f9bcee843560e454d66392c3e28ad850c893.tar.gz nixpkgs-7cf8f9bcee843560e454d66392c3e28ad850c893.tar.bz2 nixpkgs-7cf8f9bcee843560e454d66392c3e28ad850c893.tar.lz nixpkgs-7cf8f9bcee843560e454d66392c3e28ad850c893.tar.xz nixpkgs-7cf8f9bcee843560e454d66392c3e28ad850c893.tar.zst nixpkgs-7cf8f9bcee843560e454d66392c3e28ad850c893.zip |
Merge pull request #211346 from bobby285271/upd/evolution
evolution: 3.46.2 → 3.46.3
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch | 8 |
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 (®istry->priv->sources_lock); |