Merge GNOME updates 2024-12-01 (#360787)

This commit is contained in:
Jan Tojnar 2024-12-03 22:51:14 +01:00 committed by GitHub
commit 53886667ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 36 additions and 30 deletions

View File

@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "evolution-ews";
version = "3.54.1";
version = "3.54.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-oeM9aED4GLdLv+iafb2jcpXdgUWn30JlrS2yQUU4kDo=";
hash = "sha256-77UZ2inoIX58t3dNQ9BGJiSMO+WKGUbIpjwyDl2IPNQ=";
};
patches = [

View File

@ -45,11 +45,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
version = "3.54.1";
version = "3.54.2";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-qEQzdJd6AcY70Dr9tcY+c6SOZ0XX1Fm08mgj3Vz5lxs=";
hash = "sha256-7eopEv/bZZnA6gKJw6muIBe/43oI14IjWEUhqlaGtXY=";
};
nativeBuildInputs = [

View File

@ -49,13 +49,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.54.1";
version = "3.54.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
hash = "sha256-JbM2xIprq8NjIdiAlLOCrq8Yq8urSpQ4s//5DCnhBa4=";
hash = "sha256-EfAlMInIq/RWz/2j/mWKNaDeK4rpPY8lfWsCCueWPSA=";
};
patches = [

View File

@ -16,20 +16,18 @@
, gnome
, gtk4
, libadwaita
, libhandy
, json-glib
, libarchive
, libportal-gtk4
, nautilus
}:
stdenv.mkDerivation (finalAttrs: {
pname = "file-roller";
version = "44.3";
version = "44.4";
src = fetchurl {
url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
hash = "sha256-BMinRiX+yEJn/exAMGr7QQS9My2FBh4NNtSrBTOt+ko=";
hash = "sha256-uMMJ2jqnhMcZVYw0ZkAjePSj1sro7XfPaEmqzVbOuew=";
};
nativeBuildInputs = [
@ -50,10 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
glib
gtk4
libadwaita
libhandy
json-glib
libarchive
libportal-gtk4
nautilus
];

View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "ghex";
version = "46.0";
version = "46.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/ghex-${version}.tar.xz";
hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E=";
hash = "sha256-ihOXVHTu4ncZsprXY/GyR2Chrt5tfaS2I3AwcLwm6f0=";
};
nativeBuildInputs = [

View File

@ -30,11 +30,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-maps";
version = "47.1";
version = "47.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
hash = "sha256-TwLtLo44GeWdptm0rIgA6GY1349GpHzyqv2ThsgwEwM=";
hash = "sha256-WFHnhtrsZY8h5FeiBv8KmtFlnzdBqtlJCxvzGSFU/ps=";
};
doCheck = !stdenv.hostPlatform.isDarwin;
@ -76,6 +76,16 @@ stdenv.mkDerivation (finalAttrs: {
''}"
];
postPatch = ''
# The .service file isn't wrapped with the correct environment
# so misses GIR files when started. By re-pointing from the gjs
# entry point to the wrapped binary we get back to a wrapped
# binary.
substituteInPlace "data/org.gnome.Maps.service.in" \
--replace-fail "Exec=@pkgdatadir@/@app-id@" \
"Exec=$out/bin/gnome-maps"
'';
preCheck = ''
# “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema.
export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS"

View File

@ -48,11 +48,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-software";
version = "47.1";
version = "47.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
hash = "sha256-k8pQA2YxZ0VZTvBfytHAXPQ/Au+PZggMF/fruMo/NL8=";
hash = "sha256-ESM4+KmOflEl3j9XIphzU0IVt37u830/1CYvAhUcfOo=";
};
patches = [

View File

@ -24,11 +24,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-text-editor";
version = "47.1";
version = "47.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
hash = "sha256-3pVkLitA/yZf7s2GuTng/QGOTrK6SZNQ8rrSv8xUAQw=";
hash = "sha256-fQQDmxYXTsX9Zf6i9Efz/r2f3yqjbpmXq8b/mSzDHjg=";
};
nativeBuildInputs = [

View File

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "libspelling";
version = "0.4.4";
version = "0.4.5";
outputs = [ "out" "dev" "devdoc" ];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "libspelling";
rev = version;
hash = "sha256-6ggegeDR4UBP2LKn6lj0pOB1Iz7MwLEf9usIB28SEMA=";
hash = "sha256-+WjhBg98s5RxQfd85FtMNuoVWjw9Hap9yDqnpYNAGgw=";
};
nativeBuildInputs = [

View File

@ -28,13 +28,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "orca";
version = "47.1";
version = "47.2";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-0H16zehWVUaXOp8pcwcy8xcmq2vJ3Mzq0uEgTX2ARO0=";
hash = "sha256-XmevNX9xmOoApEOByrTE+U5oJtbtgAZo85QWziqrjlo=";
};
patches = [

View File

@ -35,11 +35,11 @@
stdenv.mkDerivation rec {
pname = "rhythmbox";
version = "3.4.7";
version = "3.4.8";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4=";
sha256 = "IBaoqNKpWcB6RnrJaCxu1gW6iIP7dgQQ1otoq4ON+fI=";
};
nativeBuildInputs = [

View File

@ -102,7 +102,7 @@ def make_version_policy(
def find_versions(package_name: str, version_policy: VersionPolicy) -> List[Version]:
# The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762
cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text)
cache = json.loads(requests.get(f"https://download.gnome.org/sources/{package_name}/cache.json").text)
if type(cache) != list or cache[0] != 4:
raise Exception("Unknown format of cache.json file.")
@ -117,7 +117,7 @@ parser = argparse.ArgumentParser(
)
parser.add_argument(
"package-name",
help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.",
help="Name of the directory in https://download.gnome.org/sources/ containing the package.",
)
parser.add_argument(
"version-policy",

View File

@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gtksourceview";
version = "5.14.1";
version = "5.14.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz";
hash = "sha256-AJhi6HuSnaWnJOzgefAfjO4p50eXoeysNJ9YwVo8vFg=";
hash = "sha256-Gm04emgHX4rv1OdSz0hxd8SmgjsU/4pDSYaFiurvYmQ=";
};
patches = [