gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge GNOME updates 2024-10-08 (#372080)

Browse Source
This commit is contained in:
Jan Tojnar
2025-01-10 22:18:43 +01:00
committed by GitHub
parent b77d396bda a208e10f0a
commit 8fc0e240bd
10 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+2 -2
View File
@@ -46,11 +46,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
version = "3.54.2";
version = "3.54.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-7eopEv/bZZnA6gKJw6muIBe/43oI14IjWEUhqlaGtXY=";
hash = "sha256-dGz4HvXDJa8X9Tsvq0bWcmDzsT2gFNiZTUrZ6Ea4Ves=";
};
nativeBuildInputs = [
pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
+14 -12
View File
@@ -1,5 +1,5 @@
diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
index 5e65ec8..8ca28c6 100644
index 5e65ec8..2cae29d 100644
--- a/src/addressbook/libebook/e-book-client.c
+++ b/src/addressbook/libebook/e-book-client.c
@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry,
@@ -42,23 +42,25 @@ index 5e65ec8..8ca28c6 100644
g_settings_set_string (
settings, SELF_UID_KEY,
e_contact_get_const (contact, E_CONTACT_UID));
@@ -2028,8 +2050,18 @@ e_book_client_is_self (EContact *contact)
@@ -2028,8 +2050,20 @@ e_book_client_is_self (EContact *contact)
* unfortunately the API doesn't allow that.
*/
g_mutex_lock (&mutex);
- if (!settings)
- settings = g_settings_new (SELF_UID_PATH_ID);
+ if (!settings) {
+ g_autoptr(GSettingsSchemaSource) schema_source;
+ g_autoptr(GSettingsSchema) schema;
+ schema_source = g_settings_schema_source_new_from_directory("@EDS@",
+ g_settings_schema_source_get_default(),
+ TRUE,
+ NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
+ SELF_UID_PATH_ID,
+ FALSE);
+ settings = g_settings_new_full(schema, NULL, NULL);
+ {
+ g_autoptr(GSettingsSchemaSource) schema_source;
+ g_autoptr(GSettingsSchema) schema;
+ schema_source = g_settings_schema_source_new_from_directory("@EDS@",
+ g_settings_schema_source_get_default(),
+ TRUE,
+ NULL);
+ schema = g_settings_schema_source_lookup(schema_source,
+ SELF_UID_PATH_ID,
+ FALSE);
+ settings = g_settings_new_full(schema, NULL, NULL);
+ }
+ }
uid = g_settings_get_string (settings, SELF_UID_KEY);
g_mutex_unlock (&mutex);
pkgs/by-name/ev/evolution-data-server/package.nix
+2 -2
View File
@@ -51,7 +51,7 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.54.2";
version = "3.54.3";
outputs = [
"out"
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
hash = "sha256-EfAlMInIq/RWz/2j/mWKNaDeK4rpPY8lfWsCCueWPSA=";
hash = "sha256-UQjcOO5cwfjvkVXof2xBKflkRVCglixa4j/4B7V8uNA=";
};
patches = [
pkgs/by-name/gl/glycin-loaders/package.nix
+2 -2
View File
@@ -23,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "glycin-loaders";
version = "1.1.2";
version = "1.1.4";
src = fetchurl {
url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
hash = "sha256-Qccr4eybpV2pDIL8GFc7dC3/WCsJr8N7RWXEfpnMj/Q=";
hash = "sha256-0bbVkLaZtmgaZ9ARmKWBp/cQ2Mp0UJNN1/XbJB+hJQA=";
};
patches = [
pkgs/by-name/gn/gnome-maps/package.nix
+2 -2
View File
@@ -30,11 +30,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-maps";
version = "47.2";
version = "47.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
hash = "sha256-WFHnhtrsZY8h5FeiBv8KmtFlnzdBqtlJCxvzGSFU/ps=";
hash = "sha256-HpAwe6/njiML1OrdCUcicakp+1FolCJFkG+fEdrhPLg=";
};
doCheck = !stdenv.hostPlatform.isDarwin;
pkgs/by-name/gn/gnote/package.nix
+2 -2
View File
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "gnote";
version = "47.0";
version = "47.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-vrNcreIMYOQxVRbyCsfr7p37wrgPAHy+2LxaUlIuRC4=";
hash = "sha256-mmDxaSSA9k0WbTHmVkoP8kgSelmOL/f2NX3AsuwlsWg=";
};
buildInputs = [
pkgs/by-name/gt/gtk-vnc/package.nix
+14 -6
View File
@@ -12,12 +12,13 @@
cyrus_sasl,
pulseaudioSupport ? stdenv.hostPlatform.isLinux,
libpulseaudio,
libgcrypt,
gmp,
gtk3,
vala,
gettext,
perl,
python3,
gi-docgen,
gnome,
gdk-pixbuf,
zlib,
@@ -25,18 +26,19 @@
stdenv.mkDerivation rec {
pname = "gtk-vnc";
version = "1.3.1";
version = "1.4.0";
outputs = [
"out"
"bin"
"man"
"dev"
"devdoc"
];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "USdjrE4FWdAVi2aCyl3Ro71jPwgvXkNJ1xWOa1+A8c4=";
url = "mirror://gnome/sources/gtk-vnc/${lib.versions.majorMinor version}/gtk-vnc-${version}.tar.xz";
sha256 = "G+ZMTkdgxSs+wzBnKQ0e+kCtTOyrbGc4E4BOPFWdloM=";
};
nativeBuildInputs = [
@@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
gettext
perl # for pod2man
python3
gi-docgen
];
buildInputs =
@@ -57,7 +60,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
zlib
glib
libgcrypt
gmp
cyrus_sasl
gtk3
]
@@ -69,9 +72,14 @@ stdenv.mkDerivation rec {
"-Dpulseaudio=disabled"
];
postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "gtk-vnc";
versionPolicy = "none";
};
};
pkgs/by-name/li/libshumate/package.nix
+2 -2
View File
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libshumate";
version = "1.3.0";
version = "1.3.1";
outputs = [
"out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
hash = "sha256-giem6Cgc3hIjKJT++Ddg1E+maznvAzxh7ZNKhsbcddQ=";
hash = "sha256-bv6TUtkXRIItQerUcUoqtLN4SBqGoiBLe+xAgt/8G4s=";
};
depsBuildBuild = [
pkgs/by-name/me/meld/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "meld";
version = "3.22.2";
version = "3.22.3";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-RqCnE/vNGxU7N3oeB1fIziVcmCJGdljqz72JsekjFu8=";
sha256 = "sha256-N/fynrH/D+xNiwiNVIPFVt4QifbQGP5tSBmTyvJJnYQ=";
};
nativeBuildInputs = [
pkgs/by-name/or/orca/package.nix
+4 -4
View File
@@ -29,13 +29,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "orca";
version = "47.2";
version = "47.3";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-XmevNX9xmOoApEOByrTE+U5oJtbtgAZo85QWziqrjlo=";
url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz";
hash = "sha256-GwsUW7aFzXTso+KMt7cJf5jRPuHMWLce3u06j5BFIxs=";
};
patches = [
@@ -93,7 +93,7 @@ python3.pkgs.buildPythonApplication rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "orca";
};
};