Merge pull request #179849 from jtojnar/gnome

GNOME updates

Changed files
+96 -79
nixos
tests
installed-tests
pkgs
applications
audio
rhythmbox
backup
deja-dup
misc
networking
mailreaders
evolution
evolution
evolution-ews
video
pitivi
desktops
gnome
apps
core
evolution-data-server
gnome-calculator
sushi
development
libraries
+1
nixos/tests/installed-tests/default.nix
···
fwupd = callInstalledTest ./fwupd.nix {};
gcab = callInstalledTest ./gcab.nix {};
gdk-pixbuf = callInstalledTest ./gdk-pixbuf.nix {};
+
geocode-glib = callInstalledTest ./geocode-glib.nix {};
gjs = callInstalledTest ./gjs.nix {};
glib-networking = callInstalledTest ./glib-networking.nix {};
gnome-photos = callInstalledTest ./gnome-photos.nix {};
+15 -16
pkgs/applications/audio/rhythmbox/default.nix
···
{ stdenv
, lib
, fetchurl
-
, fetchpatch
, pkg-config
, meson
, ninja
···
, json-glib
, itstool
, wrapGAppsHook
+
, desktop-file-utils
, gst_all_1
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
+
, check
}:
stdenv.mkDerivation rec {
pname = "rhythmbox";
-
version = "3.4.5";
+
version = "3.4.6";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo=";
+
sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ=";
};
-
patches = [
-
# Fix stuff linking against rhythmdb not finding libxml headers
-
# included by rhythmdb.h header.
-
# https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147
-
(fetchpatch {
-
url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch";
-
sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg=";
-
})
-
];
-
nativeBuildInputs = [
pkg-config
meson
···
glib
itstool
wrapGAppsHook
+
desktop-file-utils
];
buildInputs = [
···
libnotify
] ++ gst_plugins;
-
postInstall = ''
-
glib-compile-schemas "$out/share/glib-2.0/schemas"
-
'';
+
checkInputs = [
+
check
+
];
+
+
mesonFlags = [
+
"-Dtests=disabled"
+
];
+
+
# Requires DISPLAY
+
doCheck = false;
preFixup = ''
gappsWrapperArgs+=(
+2 -2
pkgs/applications/backup/deja-dup/default.nix
···
stdenv.mkDerivation rec {
pname = "deja-dup";
-
version = "43.3";
+
version = "43.4";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
-
sha256 = "sha256-HOIBAzR+7OZ1RO+MSpCQKShcikdtWCjdMUO2rE2TxiM=";
+
sha256 = "sha256-8eqrBQrMvS4cta5RP0ibo4Zc3B8hlkftxaRyvb6JuEY=";
};
patches = [
+2 -2
pkgs/applications/misc/orca/default.nix
···
buildPythonApplication rec {
pname = "orca";
-
version = "42.1";
+
version = "42.2";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "6p6dLehwg4ewUqe+FqXmnOqfZ2jfrrRee9meRmNxYt4=";
+
sha256 = "mXHp/aGqK9ZKdrMxcxNcZBWaSQssS8/757lUj+38eCw=";
};
patches = [
+2 -2
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
···
stdenv.mkDerivation rec {
pname = "evolution-ews";
-
version = "3.44.2";
+
version = "3.44.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "xXPzlxA8FybyS+Tz+f0gzrvJtEW6CysOt8lI/YQVBho=";
+
sha256 = "hcysooh6+FvwSORzx7bELF9WQasFpbxM/Oo04rb1vhc=";
};
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
+2 -2
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
···
stdenv.mkDerivation rec {
pname = "evolution";
-
version = "3.44.2";
+
version = "3.44.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "+scGznpXP42WdzfxWtDr66Q6h/48p1f4VBID2ZG+BjM=";
+
sha256 = "U2sR9BM99vIW8nr5okgaGe164Ivi1KE7EoBhwmKjZJk=";
};
nativeBuildInputs = [
+5 -18
pkgs/applications/video/pitivi/default.nix
···
{ lib
, fetchurl
-
, fetchpatch
, pkg-config
, gettext
, itstool
, python3
, wrapGAppsHook
-
, python3Packages
, gst_all_1
, gtk3
, gobject-introspection
, libpeas
, librsvg
, gnome
-
, gnome-desktop
, libnotify
, gsound
, meson
···
, gsettings-desktop-schemas
}:
-
python3Packages.buildPythonApplication rec {
+
python3.pkgs.buildPythonApplication rec {
pname = "pitivi";
-
version = "2021.05";
+
version = "2022.06";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "z1aTxGxCqw2hSi5Zv89LyIBgS0HpzTqo0uvcYIJ7dcc=";
+
sha256 = "Uz0448bSEcK9DpXiuWsPCDO98NXUd6zgffYRWDUGyDg=";
};
patches = [
···
# and saves them to the generated binary. This would make the build-time
# dependencies part of the closure so we remove it.
./prevent-closure-contamination.patch
-
-
# Fix build with meson 0.61
-
# https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/414
-
(fetchpatch {
-
url = "https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c.patch";
-
sha256 = "MC4naGnqhrYlFBFHZaSzbOzrqaNK5/Xv5jBmCu0fLQE=";
-
})
];
nativeBuildInputs = [
···
gtk3
libpeas
librsvg
-
gnome-desktop
gsound
-
gnome.adwaita-icon-theme
gsettings-desktop-schemas
libnotify
] ++ (with gst_all_1; [
···
gst-devtools
]);
-
pythonPath = with python3Packages; [
+
pythonPath = with python3.pkgs; [
pygobject3
gst-python
-
pyxdg
numpy
pycairo
matplotlib
-
dbus-python
+
librosa
];
postPatch = ''
+3 -6
pkgs/desktops/gnome/apps/gnome-boxes/default.nix
···
, gtk3
, gtksourceview4
, gtk-vnc
-
, freerdp
, libvirt
, spice-gtk
, python3
···
stdenv.mkDerivation rec {
pname = "gnome-boxes";
-
version = "42.1";
+
version = "42.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "lvXQEbdQjbVhvw0WbA6p6LEhgFxA5dnzYRkkXBUXIIA=";
+
sha256 = "98K8oU3K4oONsR+iyA4jQI41SBeK+GGg1NDcxql4ABU=";
};
patches = [
-
# Fix path to libgovf-0.1.so (and libgtk-frdp-0.1.so when enabling rdp meson option)
-
# in the gir file. We patch gobject-introspection to hardcode absolute paths but
+
# Fix path to libgovf-0.1.so in the gir file. We patch gobject-introspection to hardcode absolute paths but
# our Meson patch will only pass the info when install_dir is absolute as well.
./fix-gir-lib-path.patch
];
···
buildInputs = [
acl
cyrus_sasl
-
freerdp
gdbm
glib
glib-networking
-11
pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch
···
)
govf_dep = declare_dependency(
-
--- a/subprojects/gtk-frdp/src/meson.build
-
+++ b/subprojects/gtk-frdp/src/meson.build
-
@@ -50,7 +50,7 @@ gtk_frdp_lib = shared_library('gtk-frdp-' + api_version,
-
gtk_frdp_sources,
-
dependencies: gtk_frdp_deps,
-
install: true,
-
- install_dir: libdir
-
+ install_dir: get_option ('prefix') / libdir
-
)
-
-
gtk_frdp_dep = declare_dependency(
+2 -2
pkgs/desktops/gnome/apps/gnome-maps/default.nix
···
stdenv.mkDerivation rec {
pname = "gnome-maps";
-
version = "42.2";
+
version = "42.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "sha256-Xm0bDKfMk56pGq39pWM6hl6oX6VlADaGGyv+8L/QabE=";
+
sha256 = "sha256-5FZGf6zzyP0QyThrXnTEPZWVrZ+3Ulf32gFK+YPWnNE=";
};
doCheck = true;
+2 -2
pkgs/desktops/gnome/core/evolution-data-server/default.nix
···
stdenv.mkDerivation rec {
pname = "evolution-data-server";
-
version = "3.44.2";
+
version = "3.44.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "Ltcq/k1rsXD4co+uoJB/7hAhLf3nqfq4L7zIPQ8i8Cg=";
+
sha256 = "kEOrU/NB2hAxXFUDhKazIEMBk/yNeGHdJcTpsuC+Qls=";
};
patches = [
+2 -2
pkgs/desktops/gnome/core/gnome-calculator/default.nix
···
stdenv.mkDerivation rec {
pname = "gnome-calculator";
-
version = "42.1";
+
version = "42.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "700k5Cpl3IYOYgbztHC30jPCripNSWXYhZqp6oo5Ws0=";
+
sha256 = "M9qxvKQ2WNZlIJWLD2dMsK0xhc/TDBLkWef2lIHFxqA=";
};
nativeBuildInputs = [
+2 -2
pkgs/desktops/gnome/core/sushi/default.nix
···
stdenv.mkDerivation rec {
pname = "sushi";
-
version = "41.2";
+
version = "42.0";
src = fetchurl {
url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "tZ+0LJllxzYfdilt0qNARatlUGXqQUPeWsiyygyq6l4=";
+
sha256 = "RdjbevRaeXhOejRYjRSeqVXIvkS7gqNuiWgpQFt8iCA=";
};
nativeBuildInputs = [
+42 -10
pkgs/development/libraries/geocode-glib/default.nix
···
-
{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome, libsoup, json-glib, glib }:
+
{ fetchurl
+
, lib
+
, stdenv
+
, meson
+
, ninja
+
, pkg-config
+
, gettext
+
, gtk-doc
+
, docbook-xsl-nons
+
, gobject-introspection
+
, gnome
+
, libsoup
+
, json-glib
+
, glib
+
, nixosTests
+
}:
stdenv.mkDerivation rec {
pname = "geocode-glib";
-
version = "3.26.2";
+
version = "3.26.3";
outputs = [ "out" "dev" "devdoc" "installedTests" ];
src = fetchurl {
-
url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1";
+
url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz";
+
sha256 = "Hf6ug7kOzMobbPfc98XjsxeCjPC1YgXERx7w+RGZl2Y=";
};
-
-
nativeBuildInputs = [ meson ninja pkg-config gettext gtk-doc docbook_xsl gobject-introspection ];
-
buildInputs = [ glib libsoup json-glib ];
patches = [
./installed-tests-path.patch
];
-
postPatch = ''
-
substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests"
-
'';
+
nativeBuildInputs = [
+
meson
+
ninja
+
pkg-config
+
gettext
+
gtk-doc
+
docbook-xsl-nons
+
gobject-introspection
+
];
+
+
buildInputs = [
+
glib
+
libsoup
+
json-glib
+
];
+
+
mesonFlags = [
+
"-Dsoup2=${lib.boolToString (lib.versionOlder libsoup.version "2.99")}"
+
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
+
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
+
};
+
tests = {
+
installed-tests = nixosTests.installed-tests.geocode-glib;
};
};
+14 -2
pkgs/development/libraries/geocode-glib/installed-tests-path.patch
···
--- a/geocode-glib/tests/meson.build
+++ b/geocode-glib/tests/meson.build
@@ -1,4 +1,4 @@
-
-install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib'
-
+install_dir = '@installedTests@/libexec/installed-tests/geocode-glib'
+
-install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests' / library_name
+
+install_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / library_name
e = executable('geo-uri',
'geo-uri.c',
+
--- a/meson_options.txt
+
+++ b/meson_options.txt
+
@@ -1,6 +1,9 @@
+
option('enable-installed-tests',
+
type: 'boolean', value: true,
+
description: 'Build & install test programs')
+
+option('installed_test_prefix',
+
+ type: 'string', value: '',
+
+ description: 'Prefix for installed tests')
+
option('enable-introspection',
+
type: 'boolean', value: true,
+
description: 'Whether to enable the introspection generation')