Merge pull request #314678 from jtojnar/gnome-updates

GNOME updates 2024-05-25
This commit is contained in:
Jan Tojnar 2024-05-28 08:59:13 +02:00 committed by GitHub
commit 76d36c09da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 98 additions and 123 deletions

View File

@ -40,15 +40,15 @@
, xvfb-run
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-builder";
version = "46.1";
version = "46.2";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-lhaWbVIqLIUCizPAm605cudp6fkK91VNXnGDfb3HiHE=";
url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
hash = "sha256-DIV7iQA7JHh/Kx0qrhLSdaB0xmhLSIA7SMACdtk3GWM=";
};
patches = [
@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
'';
passthru.updateScript = gnome.updateScript {
packageName = pname;
packageName = "gnome-builder";
};
meta = with lib; {
@ -175,4 +175,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
mainProgram = "gnome-builder";
};
}
})

View File

@ -7,23 +7,23 @@
, ninja
, pkg-config
, uhttpmock_1_0
, libxml2
, glib
, gnome-online-accounts
, json-glib
, librest_1_0
, libsoup_3
, gnome
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libmsgraph";
version = "0.2.1";
version = "0.2.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/msgraph/${lib.versions.majorMinor finalAttrs.version}/msgraph-${finalAttrs.version}.tar.xz";
hash = "sha256-4OWeqorj4KSOwKbC/tBHCFanCSSOkhK2odA33leS7Ls=";
hash = "sha256-EsyVT3ULsTes6FAP6TVdJubgDvbMqrKVDp02DpJ1gzU=";
};
nativeBuildInputs = [
@ -36,21 +36,16 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
uhttpmock_1_0
libxml2
];
propagatedBuildInputs = [
glib
gnome-online-accounts
json-glib
librest_1_0
libsoup_3
];
mesonFlags = [
# https://gitlab.gnome.org/GNOME/msgraph/-/merge_requests/9
"-Dc_args=-Wno-error=format-security"
];
postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc/msgraph-0" "$devdoc"

View File

@ -26,11 +26,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "file-roller";
version = "44.2";
version = "44.3";
src = fetchurl {
url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
hash = "sha256-LFcXzn8F+6sTyEe2zjGxsCSIYfp6uPD/Hx4dRdHizfk=";
hash = "sha256-BMinRiX+yEJn/exAMGr7QQS9My2FBh4NNtSrBTOt+ko=";
};
nativeBuildInputs = [

View File

@ -29,11 +29,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-maps";
version = "46.10";
version = "46.11";
src = fetchurl {
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
hash = "sha256-XyXul6DC/t+E8M8DkrTvi+GT4/bOJfl1RntvzsBUIa8=";
hash = "sha256-lAtBuXQLCBMyXjkWdYcWz4+g7k4MkZHyYM7AbZITWDU=";
};
doCheck = !stdenv.isDarwin;

View File

@ -40,15 +40,15 @@
, withLibsecret ? true
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "evince";
version = "46.1";
version = "46.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-lLtSU2WwYKKML2AX0iy/KvURVQclSqQum/wAC7wYq2I=";
url = "mirror://gnome/sources/evince/${lib.versions.major finalAttrs.version}/evince-${finalAttrs.version}.tar.xz";
hash = "sha256-vA0dQbnX/8di6Z0qv6+sv3RRgvCzHYbbXuyMZ/XzAGs=";
};
depsBuildBuild = [
@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "evince";
};
};
@ -141,4 +141,4 @@ stdenv.mkDerivation rec {
mainProgram = "evince";
maintainers = teams.gnome.members ++ teams.pantheon.members;
};
}
})

View File

@ -34,13 +34,13 @@
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-initial-setup";
version = "46.0";
version = "46.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-+O6dzqfjXnNeqjvI0QQdBrtk6/HhBG5ejkjx+0QVGEc=";
url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz";
hash = "sha256-bHktiSrbYLDeC33oglwUlD0c0nmvT5x2So9UEbYKjyc=";
};
patches = [
@ -94,8 +94,8 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
packageName = "gnome-initial-setup";
attrPath = "gnome.gnome-initial-setup";
};
};
@ -106,4 +106,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = teams.gnome.members;
};
}
})

View File

@ -13,11 +13,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extensions";
version = "46.1";
version = "46.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
hash = "sha256-xbpQcA2nephvAGC+7az8AX5+yCKD8qY4SEKggHvEVT8=";
hash = "sha256-1ELp0mklEl/yFaXBNCkElWVTgHQdqvuzejqZ1vDH2G8=";
};
patches = [

View File

@ -66,13 +66,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell";
version = "46.1";
version = "46.2";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
hash = "sha256-ZPmZhEwQHmO/KU1FsTjeVjGa0vMmKCchqtD6hgZTs2k=";
hash = "sha256-a1hxAcBL+zZKsJzTi12T6+60JUdUyAfPcS+8juP94jg=";
};
patches = [
@ -102,13 +102,6 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/dcd112d9708954187e7490564c2229d82ba5326f/f/0001-gdm-Work-around-failing-fingerprint-auth.patch";
hash = "sha256-mgXty5HhiwUO1UV3/eDgWtauQKM0cRFQ0U7uocST25s=";
})
# screencast: Correct expected bus name for streams
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3303
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/50a011a19dcc6997ea6173c07bb80b2d9888d363.patch";
hash = "sha256-ccEpdWgDxwnj7ouzFekpoln5Y2PtgRikWetwK+0U9Fg=";
})
];
nativeBuildInputs = [

View File

@ -43,13 +43,13 @@ let
withFwupd = stdenv.hostPlatform.isx86;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-software";
version = "46.1";
version = "46.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-tu63iRAN6UtQ6+Lnfxaya+TC2xVImQXxmNBgxCXhkHY=";
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
hash = "sha256-5wDLood2T14iVVFOMS4WBVD9v3pdP+FjWLtve2cyuXQ=";
};
patches = [
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "gnome-software";
attrPath = "gnome.gnome-software";
};
};
@ -123,4 +123,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}
})

View File

@ -27,16 +27,16 @@
, nixosTests
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-terminal";
version = "3.52.1";
version = "3.52.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gnome-terminal";
rev = version;
hash = "sha256-npoQfe5+HTn7CsrW6MuOoiYBc3rYMAMv4apC6dFR8O4=";
rev = finalAttrs.version;
hash = "sha256-c6xMUyhQnJiIrFnnUEx6vGVvFghGvLjTxiAFq+nSj2A=";
};
nativeBuildInputs = [
@ -94,4 +94,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
};
}
})

View File

@ -43,9 +43,9 @@ let
unicode-character-database
];
};
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (finalAttrs: {
pname = "gucharmap";
version = "15.1.2";
version = "15.1.5";
outputs = [ "out" "lib" "dev" "devdoc" ];
@ -53,8 +53,8 @@ in stdenv.mkDerivation rec {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gucharmap";
rev = version;
sha256 = "sha256-tvFw2k5xCl+QE6cHvLj5KKdYFSghN7PVgHPmd27wh7k=";
rev = finalAttrs.version;
sha256 = "sha256-PG86D8QvqHdmo3aJseCerngmuWUqtSMdWzbixWE2HOQ=";
};
strictDeps = true;
@ -107,8 +107,8 @@ in stdenv.mkDerivation rec {
description = "GNOME Character Map, based on the Unicode Character Database";
mainProgram = "gucharmap";
homepage = "https://gitlab.gnome.org/GNOME/gucharmap";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}
})

View File

@ -10,7 +10,6 @@
, colord
, lcms2
, pango
, json-glib
, libstartup_notification
, libcanberra
, ninja
@ -59,7 +58,6 @@
, sysprof
, libsysprof-capture
, desktop-file-utils
, libcap_ng
, egl-wayland
, graphene
, wayland
@ -68,13 +66,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
version = "46.1";
version = "46.2";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
hash = "sha256-Y7JmDdD6GT+mYsgO4S64sW8rjDvDiWNmIAx5lDgk1R0=";
hash = "sha256-AJuqd/g2JhLKouGMM4obPIqtO1/ilkwv73gk0yEiiYM=";
};
mesonFlags = [
@ -91,9 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
];
propagatedBuildInputs = [
# required for pkg-config to detect mutter-clutter
json-glib
libcap_ng
# required for pkg-config to detect mutter-mtk
graphene
];

View File

@ -38,13 +38,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nautilus";
version = "46.1";
version = "46.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
hash = "sha256-zBpf3x3XL5Lp4/PHrSY3CaDeU5Golb6TRPamf0OIe9c=";
hash = "sha256-bujJkBm540R/aRjWgjKiDeyonlUlwFgFQyt9iEDKcfo=";
};
patches = [

View File

@ -26,16 +26,16 @@
, gnome
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rygel";
version = "0.42.5";
version = "0.42.6";
# TODO: split out lib
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "ETNgLS5nEKreayKqmNkzhMjVY5bzRHY0E+luARC32J8=";
url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz";
sha256 = "R9JXBLYQiDdeJqq6Vr5HwXGJRy5vgMdSq+hvAu9OMwQ=";
};
patches = [
@ -92,8 +92,8 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
packageName = "rygel";
attrPath = "gnome.rygel";
versionPolicy = "odd-unstable";
};
};
@ -105,4 +105,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}
})

View File

@ -16,16 +16,16 @@
, yelp-tools
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "aisleriot";
version = "3.22.32";
version = "3.22.33";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "aisleriot";
rev = version;
sha256 = "sha256-+U/EsKTZjWa05DbILWAxqIpMcZ0DP0l4LIYxM2wCFdM=";
rev = finalAttrs.version;
sha256 = "sha256-HylhDBgkAJrrs/r42v3aDNR8mBJaqnJHyY7T3QW1eWg=";
};
nativeBuildInputs = [
@ -70,4 +70,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
})

View File

@ -47,11 +47,11 @@
stdenv.mkDerivation rec {
pname = "geary";
version = "44.1";
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "fRHLbhxQThCMLckaoiVqRATcq+fRyHPY1glOLfM1onc=";
sha256 = "r60VEwKBfd8Ji15BbnrH8tXupWejuAu5C9PGKv0TuaE=";
};
nativeBuildInputs = [

View File

@ -31,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-online-accounts";
version = "3.50.1";
version = "3.50.2";
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
hash = "sha256-Qu5D/R4pQrn/YQYlLM3INGAoFVCL96OlLAvf/6Vur0A=";
hash = "sha256-3xatl10TnGv8TrsuyLuDJyl6eR7yvwuXfHgHavX6qY4=";
};
mesonFlags = [

View File

@ -45,13 +45,13 @@
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gvfs";
version = "1.54.0";
version = "1.54.1";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz";
hash = "sha256-9T2B34bC6GzdJRgsLYpmmiI3HoNiPe0bnVQW3Pxt42Y=";
url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
hash = "sha256-rEo7zLf+FQIVjvD95cl5q0RxJVfQKKjk8wop8PvZ0Z8=";
};
patches = [
@ -137,13 +137,13 @@ stdenv.mkDerivation rec {
];
doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
doInstallCheck = doCheck;
doInstallCheck = finalAttrs.doCheck;
separateDebugInfo = true;
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "gvfs";
versionPolicy = "odd-unstable";
};
};
@ -154,4 +154,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = teams.gnome.members;
};
}
})

View File

@ -22,7 +22,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libadwaita";
version = "1.5.0";
version = "1.5.1";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GNOME";
repo = "libadwaita";
rev = finalAttrs.version;
hash = "sha256-uEaBI2jHlMdVprMGRZe/8HszO3nEBUJaJtvJjrMOjE4=";
hash = "sha256-dH0VPIt6SGTDcb1I72cKnNlyqZ3dptvKmMDjOd17BfA=";
};
depsBuildBuild = [

View File

@ -10,15 +10,15 @@
, deterministic-uname
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libgtop";
version = "2.41.2";
version = "2.41.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-2QJs2KSNJ83/0zL41gqSdktWQk5SLEIM0ToB9A2vksM=";
url = "mirror://gnome/sources/libgtop/${lib.versions.majorMinor finalAttrs.version}/libgtop-${finalAttrs.version}.tar.xz";
hash = "sha256-d1Z235WOLqJFL3Vo8osupYEGPTEnc91cC3Ykwbmy2ow=";
};
nativeBuildInputs = [
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "libgtop";
versionPolicy = "odd-unstable";
};
};
@ -48,4 +48,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members;
platforms = platforms.unix;
};
}
})

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch2
, gi-docgen
, meson
, ninja
@ -21,26 +20,18 @@
, gnome
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libshumate";
version = "1.2.1";
version = "1.2.2";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-EQXuB34hR/KgOc3fphb6XLlDiIPdlAQn4RaZ3NZUnBE=";
url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
hash = "sha256-b1h1effy1gs40/RyfrGo0v6snL3AGOU/9fdyqGCPpEs=";
};
patches = [
(fetchpatch2 {
# Fix tests https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/236
url = "https://gitlab.gnome.org/GNOME/libshumate/-/commit/852615b0df2252ea67f4f82e9ace2fc2794467b3.patch";
hash = "sha256-Ksye3zNNYmzP4O+QFDVODXUkFJOLDVMEZNfGXwbxWhs=";
})
];
depsBuildBuild = [
# required to find native gi-docgen when cross compiling
pkg-config
@ -95,7 +86,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "libshumate";
};
};
@ -107,4 +98,4 @@ stdenv.mkDerivation rec {
maintainers = teams.gnome.members;
platforms = platforms.unix;
};
}
})

View File

@ -32,14 +32,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vte";
version = "0.76.1";
version = "0.76.2";
outputs = [ "out" "dev" ]
++ lib.optional (gtkVersion != null) "devdoc";
src = fetchurl {
url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
hash = "sha256-CE6D73ZXdCaaSynfl8oi7cNDuaHYFDPTALjLLQh6HsI=";
hash = "sha256-49xggtW9cPiq+qrSzfyvflHaa6AKkZsR3axu+gnHKEc=";
};
patches = [

View File

@ -19,13 +19,13 @@
, webp-pixbuf-loader
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "xdg-desktop-portal-gnome";
version = "46.1";
version = "46.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-fo2WI+nZaonAiXYWgnzUQdzygykn048TXHIlUrEXKqE=";
url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz";
hash = "sha256-tcZeol6Eg1AtAzphO+bca3GIOsB/Gj5HStGAScR9FtY=";
};
nativeBuildInputs = [
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "xdg-desktop-portal-gnome";
};
};
@ -75,4 +75,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.lgpl21Plus;
};
}
})