Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'

13 files changed, 71 insertions, 77 deletions

diff --git a/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix
index 71a582993abf..38754a556938 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , gettext
 , fetchurl
-, fetchpatch
 , wrapGAppsHook
 , gnome-video-effects
 , libcanberra-gtk3
@@ -35,23 +34,15 @@
 
 stdenv.mkDerivation rec {
   pname = "cheese";
-  version = "3.38.0";
+  version = "41.0";
 
   outputs = [ "out" "man" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8";
+    url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    sha256 = "EG8d9n4c9Bwqp5yZveZ2rskA2wNstSX6EIObBhh9Ivk=";
   };
 
-  patches = [
-    # Fix build with latest Vala or GLib
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch";
-      sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4=";
-    })
-  ];
-
   nativeBuildInputs = [
     appstream-glib
     docbook_xml_dtd_43
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix
index 500e60feb75c..6275bcd3fc65 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
-, fetchpatch
 , pkg-config
 , meson
 , ninja
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ghex";
-  version = "3.18.4";
+  version = "3.41.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2";
+    sha256 = "KcdG8ihzteQVvDly29PdYNalH3CA5qPpVsNNZHrjRKI=";
   };
 
   nativeBuildInputs = [
@@ -50,18 +50,6 @@ stdenv.mkDerivation rec {
     desktop-file-utils
   ];
 
-  patches = [
-    # Fixes for darwin. Drop in next release.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch";
-      sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch";
-      sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s";
-    })
-  ];
-
   postPatch = ''
      chmod +x meson_post_install.py
      patchShebangs meson_post_install.py
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
index 510da6c83d94..fa0f590b5f5b 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
@@ -55,11 +55,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "40.3";
+  version = "41.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "//COj0Wkvm0zsKGpY6yzc5ujld6yFZDUOLsepvv3QFg=";
+    sha256 = "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h";
   };
 
   doCheck = true;
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix
index da2e37e51fc4..c8c2853203ce 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calendar";
-  version = "40.2";
+  version = "41.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "njcB/UoOWJgA0iUgN3BkTzHVI0ZV9UqDqF/wVW3X6jM=";
+    sha256 = "0gqrxcn7fcvlh5c9691lx5zgdgs71ah15h5psrbhkg8qcqy95b3k";
   };
 
   patches = [
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix
index 5cbd58d602a9..960a3320472d 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-characters";
-  version = "40.0";
+  version = "41.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha";
+    sha256 = "0yw6mimfwn0fij8zncjb4rg8bnazd1z47rmzq85lk6807nlyqag1";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix
index a00b239641f8..1f2cb9dc52e1 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-connections/default.nix
@@ -13,6 +13,7 @@
 , wrapGAppsHook
 , glib
 , gtk3
+, libhandy
 , libxml2
 , gtk-vnc
 , gtk-frdp
@@ -21,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-connections";
-  version = "40.0.1";
+  version = "41.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE=";
+    hash = "sha256-M5/1VaEI0gt6sPO/GCmWMWAYYOeO+peLpqudGO3DtGA=";
   };
 
   nativeBuildInputs = [
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
     glib
     gtk-vnc
     gtk3
+    libhandy
     libxml2
     gtk-frdp
   ];
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix
index 5784fb8d481f..7ddf227a8fb3 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix
@@ -9,13 +9,13 @@
 , gtk3
 , gobject-introspection
 , gdk-pixbuf
+, librest
 , librsvg
 , libgweather
 , geoclue2
 , wrapGAppsHook
 , folks
 , libchamplain
-, gfbgraph
 , libsoup
 , gsettings-desktop-schemas
 , webkitgtk
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-maps";
-  version = "40.4";
+  version = "41.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-LFt+HmX39OVP6G7d2hE46qbAaRoUlAPZXL4i7cgiUJw=";
+    sha256 = "sha256-G0CC22wHDp3LCFJZ6+PIpCG44eiyezKEq2BXULudjJI=";
   };
 
   doCheck = true;
@@ -53,7 +53,6 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     geoclue2
     geocode-glib
-    gfbgraph
     gjs
     gnome-online-accounts
     gnome.adwaita-icon-theme
@@ -64,6 +63,7 @@ stdenv.mkDerivation rec {
     libgee
     libgweather
     libhandy
+    librest
     librsvg
     libsoup
     webkitgtk
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix
index 803235e95843..96ec321fa4a9 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix
@@ -25,18 +25,19 @@
 , gst_all_1
 , libdazzle
 , libsoup
+, libhandy
 , gsettings-desktop-schemas
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "40.1.1";
+  version = "41.0";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "IMtnPhHC8xQ9NYjPyrmhInkQgOun3GASypTBhglVjVE=";
+    sha256 = "1llz2aqa3n3ivwl7i09pgylsbgrfzb872vcj1k7pvivxm1kkbcb9";
   };
 
   nativeBuildInputs = [
@@ -67,6 +68,7 @@ python3.pkgs.buildPythonApplication rec {
     libnotify
     libdazzle
     libsoup
+    libhandy
     gsettings-desktop-schemas
     tracker
   ] ++ (with gst_all_1; [
@@ -77,13 +79,12 @@ python3.pkgs.buildPythonApplication rec {
     gst-plugins-ugly
   ]);
 
-  propagatedBuildInputs = with python3.pkgs; [
+  pythonPath = with python3.pkgs; [
     pycairo
     dbus-python
     pygobject3
   ];
 
-
   postPatch = ''
     for f in meson_post_conf.py meson_post_install.py; do
       chmod +x $f
@@ -91,6 +92,13 @@ python3.pkgs.buildPythonApplication rec {
     done
   '';
 
+  # Prevent double wrapping, let the Python wrapper use the args in preFixup.
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   doCheck = false;
 
   # handle setup hooks better
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix
index ae1334cd562b..cfa77fadb79d 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix
@@ -21,15 +21,16 @@
 , libical
 , librest
 , json-glib
+, itstool
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-todo";
-  version = "40.0";
+  version = "41.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "aAl8lvBnXHFCZn0QQ0ToNHLdf8xTj+wKzb9gJrucobE=";
+    sha256 = "1r94880d4khbjhhfnhaba3y3d4hv2bri82rzfzxn27s5iybpqras";
   };
 
   nativeBuildInputs = [
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
     gettext
     python3
     wrapGAppsHook
+    itstool
   ];
 
   buildInputs = [
@@ -62,10 +64,6 @@ stdenv.mkDerivation rec {
   postPatch = ''
     chmod +x build-aux/meson/meson_post_install.py
     patchShebangs build-aux/meson/meson_post_install.py
-
-    # https://gitlab.gnome.org/GNOME/gnome-todo/merge_requests/103
-    substituteInPlace src/meson.build \
-      --replace 'Gtk-3.0' 'Gtk-4.0'
   '';
 
   passthru = {
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix
index 17e98bb2a569..aa192a6a3b65 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-weather";
-  version = "40.1";
+  version = "41.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "PREUTEeXxG0gaMPd9c4rwDD8oPJyzwPyGMT0baO3PE0=";
+    sha256 = "1vidwq768xnrnr24jcfbpwjczz7vm5zmaiv41nb75q4p8avlwqg5";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix
index 0675ccb2f82d..f207307588a1 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix
@@ -1,17 +1,15 @@
 { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme
 , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
-, pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib
-, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
+, pkg-config, gtk4, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib
+, gnome, wrapGAppsHook4, telepathy-logger, gspell, gsettings-desktop-schemas }:
 
-let
+stdenv.mkDerivation rec {
   pname = "polari";
-  version = "3.38.0";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "41.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    sha256 = "o7BfgWYDcMZ8lCtvRLKYx7eIFv6zjJJuwiEr3iLqQOs=";
   };
 
   patches = [
@@ -24,12 +22,12 @@ in stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
 
   nativeBuildInputs = [
-    meson ninja pkg-config itstool gettext wrapGAppsHook libxml2
+    meson ninja pkg-config itstool gettext wrapGAppsHook4 libxml2
     desktop-file-utils gobject-introspection appstream-glib
   ];
 
   buildInputs = [
-    gtk3 glib adwaita-icon-theme gsettings-desktop-schemas
+    gtk4 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas
     telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk
   ];
 
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch b/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch
index 0fb09eb154af..269b455f9787 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch
+++ b/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch
@@ -1,24 +1,24 @@
 diff --git a/src/thumbnailer.js b/src/thumbnailer.js
 old mode 100644
 new mode 100755
-index e2ad0a5..7ebf08a
+index ed6350ea..83d832cb
 --- a/src/thumbnailer.js
 +++ b/src/thumbnailer.js
 @@ -1,3 +1,4 @@
-+#!/usr/bin/env gjs
- imports.gi.versions.Gdk = '3.0';
- imports.gi.versions.Gtk = '3.0';
- 
++#!/usr/bin/env gjs --module
+ import Cairo from 'cairo';
+ import Gdk from 'gi://Gdk?version=3.0';
+ import Gio from 'gi://Gio';
 diff --git a/src/urlPreview.js b/src/urlPreview.js
-index f17e0be..ccffc32 100644
+index 5f7931e4..d2282900 100644
 --- a/src/urlPreview.js
 +++ b/src/urlPreview.js
-@@ -44,7 +44,7 @@ class Thumbnailer {
-     _generateThumbnail(data) {
+@@ -69,7 +69,7 @@ class Thumbnailer {
+     async _generateThumbnail(data) {
          let { filename, uri } = data;
          this._subProc = Gio.Subprocess.new(
--            ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename],
+-            ['gjs', '--module', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename],
 +            [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename],
              Gio.SubprocessFlags.NONE);
-         this._subProc.wait_async(null, (o, res) => {
-             try {
+         try {
+             await this._subProc.wait_async(null);
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix
index d09a4c9ff3e6..67036df2d51b 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix
@@ -27,15 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "seahorse";
-  version = "40.0";
+  version = "41.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw=";
+    hash = "sha256-5u7AnoEESClfVH8YwdV3K2XD7cHZ5aJZXxC13eaJKfU=";
   };
 
-  doCheck = true;
-
   nativeBuildInputs = [
     meson
     ninja
@@ -65,10 +63,21 @@ stdenv.mkDerivation rec {
     libhandy
   ];
 
+  doCheck = true;
+
   postPatch = ''
     patchShebangs build-aux/
   '';
 
+  preCheck = ''
+    # Add “org.gnome.crypto.pgp” GSettings schema to path
+    # to make it available for “gpgme-backend” test.
+    # It is used by Seahorse’s internal “common” library.
+    addToSearchPath XDG_DATA_DIRS "${glib.getSchemaPath gcr}/../.."
+    # The same test also requires home directory so that it can store settings.
+    export HOME=$TMPDIR
+  '';
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = pname;