Merge staging-next into staging

2024-11-23 15:33:13 +00:00 · 2021-10-12 00:02:05 +00:00 · 2021-10-12 00:02:05 +00:00 · 5065827878
commit 5065827878
parent d81f8fa0a4 45374ac5b3
134 changed files with 1749 additions and 1234 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -10140,6 +10140,12 @@
    githubId = 307899;
    name = "Gurkan Gur";
  };
+  sersorrel = {
+    email = "ash@sorrel.sh";
+    github = "sersorrel";
+    githubId = 9433472;
+    name = "ash";
+  };
  servalcatty = {
    email = "servalcat@pm.me";
    github = "servalcatty";
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@ -81,6 +81,13 @@
          6</link> for more details.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          GNOME has been upgraded to 41. Please take a look at their
+          <link xlink:href="https://help.gnome.org/misc/release-notes/41.0/">Release
+          Notes</link> for details.
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
  <section xml:id="sec-release-21.11-new-services">
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@ -28,6 +28,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 - `kubernetes-helm` now defaults to 3.7.0, which introduced some breaking changes to the experimental OCI manifest format. See [HIP 6](https://github.com/helm/community/blob/main/hips/hip-0006.md) for more details.

+- GNOME has been upgraded to 41. Please take a look at their [Release Notes](https://help.gnome.org/misc/release-notes/41.0/) for details.
+
 ## New Services {#sec-release-21.11-new-services}

 - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances).
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@ -372,7 +372,13 @@ in
      services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center

      xdg.portal.enable = true;
-      xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+      xdg.portal.extraPortals = [
+        pkgs.xdg-desktop-portal-gnome
+        (pkgs.xdg-desktop-portal-gtk.override {
+          # Do not build portals that we already have.
+          buildPortalsInGnome = false;
+        })
+      ];

      # Harmonize Qt5 application style and also make them use the portal for file chooser dialog.
      qt5 = {
--- a/nixos/tests/gnome-xorg.nix
+++ b/nixos/tests/gnome-xorg.nix
@ -25,6 +25,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
      services.xserver.desktopManager.gnome.debug = true;
      services.xserver.displayManager.defaultSession = "gnome-xorg";

+      systemd.user.services = {
+        "org.gnome.Shell@x11" = {
+          serviceConfig = {
+            ExecStart = [
+              # Clear the list before overriding it.
+              ""
+              # Eval API is now internal so Shell needs to run in unsafe mode.
+              # TODO: improve test driver so that it supports openqa-like manipulation
+              # that would allow us to drop this mess.
+              "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode"
+            ];
+          };
+        };
+      };
+
      virtualisation.memorySize = 1024;
    };

--- a/nixos/tests/gnome.nix
+++ b/nixos/tests/gnome.nix
@ -30,6 +30,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
        })
      ];

+      systemd.user.services = {
+        "org.gnome.Shell@wayland" = {
+          serviceConfig = {
+            ExecStart = [
+              # Clear the list before overriding it.
+              ""
+              # Eval API is now internal so Shell needs to run in unsafe mode.
+              # TODO: improve test driver so that it supports openqa-like manipulation
+              # that would allow us to drop this mess.
+              "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode"
+            ];
+          };
+        };
+      };
+
      virtualisation.memorySize = 1024;
    };

--- a/pkgs/applications/audio/faustPhysicalModeling/default.nix
+++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix
@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
  pname = "faustPhysicalModeling";
-  version = "2.30.5";
+  version = "2.33.1";

  src = fetchFromGitHub {
    owner = "grame-cncm";
    repo = "faust";
    rev = version;
-    sha256 = "sha256-hfpMeUhv6FC9lnPCfdWnAFCaKiteplyrS/o3Lf7cQY4=";
+    sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk=";
  };

  buildInputs = [ faust2jaqt faust2lv2 ];
--- a/pkgs/applications/audio/hushboard/default.nix
+++ b/pkgs/applications/audio/hushboard/default.nix
@ -0,0 +1,73 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, gobject-introspection
+, gtk3
+, libappindicator
+, libpulseaudio
+, librsvg
+, pycairo
+, pygobject3
+, six
+, wrapGAppsHook
+, xlib
+}:
+
+buildPythonApplication {
+  pname = "hushboard";
+  version = "unstable-2021-03-17";
+
+  src = fetchFromGitHub {
+    owner = "stuartlangridge";
+    repo = "hushboard";
+    rev = "c16611c539be111891116a737b02c5fb359ad1fc";
+    sha256 = "06jav6j0bsxhawrq31cnls8zpf80fpwk0cak5s82js6wl4vw2582";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gobject-introspection
+    gtk3
+    libappindicator
+    libpulseaudio
+  ];
+
+  propagatedBuildInputs = [
+    pycairo
+    pygobject3
+    six
+    xlib
+  ];
+
+  postPatch = ''
+    substituteInPlace hushboard/_pulsectl.py \
+      --replace "ctypes.util.find_library('libpulse') or 'libpulse.so.0'" "'${libpulseaudio}/lib/libpulse.so.0'"
+    substituteInPlace snap/gui/hushboard.desktop \
+      --replace "\''${SNAP}/hushboard/icons/hushboard.svg" "hushboard"
+  '';
+
+  postInstall = ''
+    # Fix tray icon, see e.g. https://github.com/NixOS/nixpkgs/pull/43421
+    wrapProgram $out/bin/hushboard \
+      --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+    mkdir -p $out/share/applications $out/share/icons/hicolor/{scalable,512x512}/apps
+    cp snap/gui/hushboard.desktop $out/share/applications
+    cp hushboard/icons/hushboard.svg $out/share/icons/hicolor/scalable/apps
+    cp hushboard-512.png $out/share/icons/hicolor/512x512/apps/hushboard.png
+  '';
+
+  # There are no tests
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://kryogenix.org/code/hushboard/";
+    license = licenses.mit;
+    description = "Mute your microphone while typing";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sersorrel ];
+  };
+}
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@ -16,11 +16,11 @@ let

 in stdenv.mkDerivation rec {
  pname = "nano";
-  version = "5.8";
+  version = "5.9";

  src = fetchurl {
    url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    sha256 = "133nhxg4xfxisjzi85rn2l575hdbvcax1s13l4m6wcvq5zdn6fz4";
+    sha256 = "dX24zaS7KHNZnkd4OvRj47VHpiewyrsw6nv3H7TCSTc=";
  };

  nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
--- a/pkgs/applications/graphics/krita/beta.nix
+++ b/pkgs/applications/graphics/krita/beta.nix
@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "5.0.0-beta1";
+  kde-channel = "unstable";
+  sha256 = "1p5l2vpsgcp4wajgn5rgjcyb8l5ickm1nkmfx8zzr4rnwjnyxdbm";
+})
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@ -1,53 +1,7 @@
-{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules
-, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
-, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
-, kio, kcrash, breeze-icons
-, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
-, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase
-, qtmultimedia, qtx11extras, quazip
-, python3Packages
-}:
+{ callPackage, ... } @ args:

-mkDerivation rec {
-  pname = "krita";
-  version = "4.4.7";
-
-  src = fetchurl {
-    url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-I6fFxPRCcRU5dyFXZPvGvTb9MuGikrvTaGCXpp4LRRk=";
-  };
-
-  nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
-
-  buildInputs = [
-    karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
-    ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
-    boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
-    openjpeg opencolorio_1 poppler curl ilmbase
-    qtmultimedia qtx11extras quazip
-    python3Packages.pyqt5
-  ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
-
-  NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
-    ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
-
-  cmakeFlags = [
-    "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
-    "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
-    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-  ];
-
-  postInstall = ''
-    for i in $out/bin/*; do
-      wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
-    done
-  '';
-
-  meta = with lib; {
-    description = "A free and open source painting application";
-    homepage = "https://krita.org/";
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Only;
-  };
-}
+callPackage ./generic.nix (args // {
+  version = "4.4.8";
+  kde-channel = "stable";
+  sha256 = "1y0d8gnxfdg5nfwk8dgx8fc2bwskvnys049napb1a9fr25bqmimw";
+})
--- a/pkgs/applications/graphics/krita/generic.nix
+++ b/pkgs/applications/graphics/krita/generic.nix
@ -0,0 +1,59 @@
+{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules
+, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
+, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
+, kio, kcrash, breeze-icons
+, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
+, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase
+, qtmultimedia, qtx11extras, quazip
+, python3Packages
+
+, version
+, kde-channel
+, sha256
+
+, callPackage
+}:
+
+mkDerivation rec {
+  pname = "krita";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://download.kde.org/${kde-channel}/${pname}/${version}/${pname}-${version}.tar.gz";
+    inherit sha256;
+  };
+
+  nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];
+
+  buildInputs = [
+    karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
+    ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
+    boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
+    openjpeg opencolorio_1 poppler curl ilmbase
+    qtmultimedia qtx11extras quazip
+    python3Packages.pyqt5
+  ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
+
+  NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]
+    ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";
+
+  cmakeFlags = [
+    "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
+    "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"
+    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+  ];
+
+  postInstall = ''
+    for i in $out/bin/*; do
+      wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
+    done
+  '';
+
+  meta = with lib; {
+    description = "A free and open source painting application";
+    homepage = "https://krita.org/";
+    maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Only;
+  };
+}
--- a/pkgs/applications/misc/avizo/default.nix
+++ b/pkgs/applications/misc/avizo/default.nix
@ -0,0 +1,37 @@
+{ lib, stdenv, fetchFromGitHub
+, meson, ninja, pkg-config, vala
+, gtk3, glib, gtk-layer-shell
+, dbus, dbus-glib, librsvg
+, gobject-introspection, gdk-pixbuf, wrapGAppsHook
+}:
+
+stdenv.mkDerivation {
+  pname = "avizo";
+  version = "unstable-2021-07-21";
+
+  src = fetchFromGitHub {
+    owner = "misterdanb";
+    repo = "avizo";
+    rev = "7b3874e5ee25c80800b3c61c8ea30612aaa6e8d1";
+    sha256 = "sha256-ixAdiAH22Nh19uK5GoAXtAZJeAfCGSWTcGbrvCczWYc=";
+  };
+
+  nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ];
+
+  buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ];
+
+  postInstall = ''
+    substituteInPlace "$out"/bin/volumectl \
+      --replace 'avizo-client' "$out/bin/avizo-client"
+    substituteInPlace "$out"/bin/lightctl \
+      --replace 'avizo-client' "$out/bin/avizo-client"
+  '';
+
+  meta = with lib; {
+    description = "A neat notification daemon for Wayland";
+    homepage = "https://github.com/misterdanb/avizo";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.berbiche ];
+  };
+}
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@ -26,33 +26,21 @@

 stdenv.mkDerivation rec {
  pname = "font-manager";
-  version = "0.8.6";
+  version = "0.8.7";

  src = fetchFromGitHub {
    owner = "FontManager";
    repo = "master";
    rev = version;
-    sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k";
+    sha256 = "lqXjGSsiWaMJGyr1c2Wt/bs4F8q51mQ1+f6vbZRQzVs=";
  };

  patches = [
-    # Fix some Desktop Settings with GNOME 40.
-    # https://github.com/FontManager/font-manager/issues/215
+    # Fix compilation with latest Vala.
+    # https://github.com/FontManager/font-manager/issues/240
    (fetchpatch {
-      url = "https://github.com/FontManager/font-manager/commit/b28f325d7951a66ebf1a2a432ee09fd22048a033.patch";
-      sha256 = "dKbrXGb9a4JuG/4x9vprMlh5J17HKJFifRWq9BWp1ow=";
-    })
-    (fetchpatch {
-      url = "https://github.com/FontManager/font-manager/commit/2147204d4c4c6b58161230500186c3a5d4eeb1c1.patch";
-      sha256 = "2/PFLwf7h76fIIN4+lyjg/L0KVU1hhRQCfwCAGDpb00=";
-    })
-    (fetchpatch {
-      url = "https://github.com/FontManager/font-manager/commit/3abc541ef8606727c72af7631c021809600336ac.patch";
-      sha256 = "rJPnW+7uuFLxTf5tk+Rzo+xkw2+uzU6BkzPXLeR/RGc=";
-    })
-    (fetchpatch {
-      url = "https://github.com/FontManager/font-manager/commit/03a822f0d7b72442cd2ffcc8668da265d3535e0d.patch";
-      sha256 = "3Z2UqK5VV2bIwpGd1tA7fivd7ooIuV6CxTJhzgOAkIM=";
+      url = "https://github.com/FontManager/font-manager/commit/f9c4621389dae5999ca9d2f3c8402c2512a9ea60.patch";
+      sha256 = "ZEJZSUYFLKmiHpVusO3ZUXMLUzJbbbCSqMjCtwlzPRY=";
    })
  ];

--- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "evolution-ews";
-  version = "3.40.4";
+  version = "3.42.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0eAjb8gWhiyjqaOT5ur9gPoQv6W2u37u28qAJVMuUBU=";
+    sha256 = "1byi1ksimbycd0daxp5j240r3n5qlaa4b3c5l9jzkjr9g3gkclsq";
  };

  nativeBuildInputs = [ cmake gettext intltool pkg-config ];
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@ -42,11 +42,11 @@

 stdenv.mkDerivation rec {
  pname = "evolution";
-  version = "3.40.4";
+  version = "3.42.0";

  src = fetchurl {
    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "BYXp36VQQOySNTWgRIdiRl2J4zE1Cawya76Eal1mA3Q=";
+    sha256 = "0yj2hifis5m2cy59skn07d8n69444vlsw62ildr1fv67zxbblib8";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix
+++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "emuflight-configurator";
-  version = "0.3.6";
+  version = "0.4.0";

  src = fetchurl {
    url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip";
-    sha256 = "sha256-egSUd/+RNo0vr2EJibgk9nNnql5sHC11gctUMK+DzW0=";
+    sha256 = "sha256-s5AE+r9Fw6S7IG2cDW2T7vctcYIAY8al7eCFIDjD5oI=";
  };

  nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ];
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@ -46,7 +46,7 @@ let
    owner  = "xbmc";
    repo   = "xbmc";
    rev    = "${kodiVersion}-${rel}";
-    sha256 = "0qc3rf6fv6k35iq5p0j86kpyghzl9djqxl6526fxknvrlw0xnh9j";
+    sha256 = "sha256-w5m7xlnjQDJ4l75b3ctF0wMZ4kqi+H0X6WFLs0gV6lM=";
  };

  ffmpeg = stdenv.mkDerivation rec {
--- a/pkgs/applications/virtualization/podman/wrapper.nix
+++ b/pkgs/applications/virtualization/podman/wrapper.nix
@ -2,7 +2,6 @@
 , runCommand
 , makeWrapper
 , lib
-, stdenv
 , extraPackages ? []
 , podman # Docker compat
 , runc # Default container runtime
@ -14,15 +13,12 @@
 , cni-plugins # not added to path
 , iptables
 , iproute2
-, gvproxy
-, qemu
-, xz
 }:

 let
  podman = podman-unwrapped;

-  binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [
+  binPath = lib.makeBinPath ([
    runc
    crun
    conmon
@ -31,10 +27,6 @@ let
    util-linux
    iptables
    iproute2
-  ] ++ lib.optionals stdenv.isDarwin [
-    gvproxy
-    qemu
-    xz
  ] ++ extraPackages);

 in runCommand podman.name {
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-user-docs";
-  version = "40.3";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "PeBXr6KsDebKcH9KdsKTLcvFVsHQ0cwCBWXcGHYpLM0=";
+    sha256 = "0lfxj8irwm88n3ba351ak85r97pqlds6y2hqbsic714yj4k8df1a";
  };

  nativeBuildInputs = [
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "c3251a7b66241fd25a603ea957ec88b9fa6fffa9",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c3251a7b66241fd25a603ea957ec88b9fa6fffa9.tar.gz",
-  "sha256": "0rpwykkvd6m5v0ay3ra9fyjgax1y67pr857s32z7l5bjgv1aap5p",
-  "msg": "Update from Hackage at 2021-10-05T05:41:58Z"
+  "commit": "ba457d86df5e8781485cf1b109f249ecf00ee4c6",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ba457d86df5e8781485cf1b109f249ecf00ee4c6.tar.gz",
+  "sha256": "1h1qnllhdfp6n71b36jw8kaw7kani76z3mmbigrvy8cmkbvj2mdc",
+  "msg": "Update from Hackage at 2021-10-08T09:46:02Z"
 }
--- a/pkgs/desktops/gnome/apps/cheese/default.nix
+++ b/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
--- a/pkgs/desktops/gnome/apps/ghex/default.nix
+++ b/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
--- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
+++ b/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;
--- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix
+++ b/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 = [
--- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix
+++ b/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 = [
--- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix
+++ b/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
--- a/pkgs/desktops/gnome/apps/gnome-music/default.nix
+++ b/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; [
--- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix
+++ b/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 = {
--- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix
+++ b/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 = [
--- a/pkgs/desktops/gnome/apps/polari/default.nix
+++ b/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
  ];

--- a/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch
+++ b/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);
--- a/pkgs/desktops/gnome/apps/seahorse/default.nix
+++ b/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;
--- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "adwaita-icon-theme";
-  version = "40.1.1";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY=";
+    sha256 = "71M52MNfytXRBIG3BICAPw+iCz08vDOSOPys7q7gHro=";
  };

  # For convenience, we can specify adwaita-icon-theme only in packages
--- a/pkgs/desktops/gnome/core/baobab/default.nix
+++ b/pkgs/desktops/gnome/core/baobab/default.nix
@ -19,11 +19,11 @@

 stdenv.mkDerivation rec {
  pname = "baobab";
-  version = "40.0";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6";
+    sha256 = "ytYnjS3MgMhLVxBapbtY2KMM6Y1vq9dnUZ3bhshX6FU=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/eog/default.nix
+++ b/pkgs/desktops/gnome/core/eog/default.nix
@ -28,11 +28,11 @@

 stdenv.mkDerivation rec {
  pname = "eog";
-  version = "40.3";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-KKo7BwgdlWV1RvcIlJR/qIZjGix/lV5Wz4DbcxrjsjU=";
+    sha256 = "sha256-kX3ghv2X/T7JMPoHyIut0r4fXQrmueVpyYYATgNZqaw=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome/core/epiphany/default.nix
@ -39,11 +39,11 @@

 stdenv.mkDerivation rec {
  pname = "epiphany";
-  version = "40.3";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "2tE4ufLVXeJxEo/KOLYfU/2YDFh9KeG6a1CP/zsZ9WQ=";
+    sha256 = "s50YJUkllbC3TF1qZoaoV/lBnfpMAvgBPCl7yHDibdA=";
  };

  patches = lib.optionals withPantheon [
--- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "evolution-data-server";
-  version = "3.40.4";
+  version = "3.42.0";

  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "h8GF8Yw3Jw42EZgfGb2SIayXTIB0Ysjc6QvqCHEsWAA=";
+    sha256 = "6P3TvEegfW+KMFK7yuiA8g9tvE9pc6jpDQAWm7mbFjU=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/gdm/default.nix
+++ b/pkgs/desktops/gnome/core/gdm/default.nix
@ -26,6 +26,7 @@
 , plymouth
 , librsvg
 , coreutils
+, xorgserver
 , xwayland
 , dbus
 , nixos-icons
@ -42,13 +43,13 @@ in

 stdenv.mkDerivation rec {
  pname = "gdm";
-  version = "40.1";
+  version = "41.0";

  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "q7ih6mZISPLJD4SsqkLpTSVgVwNYgamPvUH7xdfRc/0=";
+    sha256 = "VzjEKTqfWoDUpungb00N8+nzE8p7Yb+02K+rqYPiANw=";
  };

  mesonFlags = [
@ -102,7 +103,7 @@ stdenv.mkDerivation rec {
    # Change hardcoded paths to nix store paths.
    (substituteAll {
      src = ./fix-paths.patch;
-      inherit coreutils plymouth xwayland dbus;
+      inherit coreutils plymouth xorgserver xwayland dbus;
    })

    # The following patches implement certain environment variables in GDM which are set by
--- a/pkgs/desktops/gnome/core/gdm/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gdm/fix-paths.patch
@ -1,66 +1,64 @@
+diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
+index 5fbbad68..739718ec 100644
 --- a/daemon/gdm-local-display-factory.c
 +++ b/daemon/gdm-local-display-factory.c
-@@ -201,7 +201,7 @@
+@@ -233,9 +233,9 @@ struct GdmDisplayServerConfiguration {
+         const char *session_type;
+ } display_server_configuration[] = {
 #ifdef ENABLE_WAYLAND_SUPPORT
-         gboolean wayland_enabled = FALSE;
-         if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) {
-                if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) )
-+                if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) )
-                         return TRUE;
-         }
+-        { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
+        { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" },
 #endif
+-        { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
+        { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" },
+         { NULL, NULL, NULL },
+ };
+ 
+diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
+index cc61efc9..4c9d15af 100644
 --- a/daemon/gdm-manager.c
 +++ b/daemon/gdm-manager.c
-@@ -145,7 +145,7 @@
+@@ -148,7 +148,7 @@ plymouth_is_running (void)
         GError  *error;
-
+ 
         error = NULL;
 -        res = g_spawn_command_line_sync ("plymouth --ping",
 +        res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping",
                                          NULL, NULL, &status, &error);
         if (! res) {
                 g_debug ("Could not ping plymouth: %s", error->message);
-@@ -163,7 +163,7 @@
+@@ -166,7 +166,7 @@ plymouth_prepare_for_transition (void)
         GError  *error;
-
+ 
         error = NULL;
 -        res = g_spawn_command_line_sync ("plymouth deactivate",
 +        res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate",
                                          NULL, NULL, NULL, &error);
         if (! res) {
                 g_warning ("Could not deactivate plymouth: %s", error->message);
-@@ -178,7 +178,7 @@
+@@ -181,7 +181,7 @@ plymouth_quit_with_transition (void)
         GError  *error;
-
+ 
         error = NULL;
 -        res = g_spawn_command_line_async ("plymouth quit --retain-splash", &error);
 +        res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error);
         if (! res) {
                 g_warning ("Could not quit plymouth: %s", error->message);
                 g_error_free (error);
-@@ -194,7 +194,7 @@
+@@ -197,7 +197,7 @@ plymouth_quit_without_transition (void)
         GError  *error;
-
+ 
         error = NULL;
 -        res = g_spawn_command_line_async ("plymouth quit", &error);
 +        res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error);
         if (! res) {
                 g_warning ("Could not quit plymouth: %s", error->message);
                 g_error_free (error);
--- a/data/gdm.service.in
-+++ b/data/gdm.service.in
-@@ -26,7 +26,7 @@ Restart=always
- IgnoreSIGPIPE=no
- BusName=org.gnome.DisplayManager
- EnvironmentFile=-${LANG_CONFIG_FILE}
-ExecReload=/bin/kill -SIGHUP $MAINPID
-+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
- KeyringMode=shared
-
- [Install]
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index 4b709731..245ac0cf 100644
 --- a/daemon/gdm-session.c
 +++ b/daemon/gdm-session.c
-@@ -2916,16 +2916,16 @@ gdm_session_start_session (GdmSession *self,
+@@ -2972,16 +2972,16 @@ gdm_session_start_session (GdmSession *self,
                  */
                 if (run_launcher) {
                         if (is_x11) {
@ -80,3 +78,16 @@
                                                    self->selected_program);
                 }
         }
+diff --git a/data/gdm.service.in b/data/gdm.service.in
+index 17e8a8de..afc70977 100644
+--- a/data/gdm.service.in
+++ b/data/gdm.service.in
+@@ -26,7 +26,7 @@ Restart=always
+ IgnoreSIGPIPE=no
+ BusName=org.gnome.DisplayManager
+ EnvironmentFile=-${LANG_CONFIG_FILE}
+-ExecReload=/bin/kill -SIGHUP $MAINPID
+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
+ KeyringMode=shared
+ 
+ [Install]
--- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-backgrounds";
-  version = "40.1";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4=";
+    sha256 = "HaGsDSYb7fD80shbSAvGVQXiPPUfEUMSbA03cX5pMUU=";
  };

  passthru = {
--- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix
@ -26,11 +26,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-calculator";
-  version = "40.1";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz";
+    sha256 = "pm3AS9hYfnbWc3Wmrvp5VTtWnJvfeOvcKBfxwK3j3Jk=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix
@ -29,11 +29,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-contacts";
-  version = "40.0";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9";
+    sha256 = "Y+MUm10UdbeiaYAFu191DzyApzVxcWDjnfjP3+v8zfA=";
  };

  propagatedUserEnvPkgs = [
--- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix
@ -1,5 +1,4 @@
 { fetchurl
-, fetchpatch
 , lib
 , stdenv
 , substituteAll
@ -17,6 +16,7 @@
 , gettext
 , glib
 , glib-networking
+, gcr
 , glibc
 , gnome-bluetooth
 , gnome-color-manager
@ -24,8 +24,6 @@
 , gnome-online-accounts
 , gnome-settings-daemon
 , gnome
-, grilo
-, grilo-plugins
 , gsettings-desktop-schemas
 , gsound
 , gtk3
@ -70,11 +68,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-control-center";
-  version = "40.0";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE=";
+    sha256 = "sha256-pWliIq01P8+aB8QG4ofsyROOJQZFyypZQaiP8GhWWME=";
  };

  patches = [
@ -85,13 +83,6 @@ stdenv.mkDerivation rec {
      inherit glibc libgnomekbd tzdata;
      inherit cups networkmanagerapplet;
    })
-
-    # Fix startup assertion in power panel.
-    # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch";
-      sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU=";
-    })
  ];

  nativeBuildInputs = [
@ -119,14 +110,13 @@ stdenv.mkDerivation rec {
    gdk-pixbuf
    glib
    glib-networking
+    gcr
    gnome-bluetooth
    gnome-desktop
    gnome-online-accounts
    gnome-remote-desktop # optional, sharing panel
    gnome-settings-daemon
    gnome-user-share # optional, sharing panel
-    grilo
-    grilo-plugins # for setting wallpaper from Flickr
    gsettings-desktop-schemas
    gsound
    gtk3
--- a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch
@ -1,15 +1,17 @@
+diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
+index ddcc1511..546c2a36 100644
 --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
 +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -536,9 +536,9 @@ add_bwrap (GPtrArray   *array,
+@@ -555,9 +555,9 @@ add_bwrap (GPtrArray   *array,
   g_return_val_if_fail (script->s_infile != NULL, FALSE);
 
   add_args (array,
 -	    "bwrap",
 -	    "--ro-bind", "/usr", "/usr",
-	    "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
+-	    "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
 +	    "@bubblewrap_bin@",
 +	    "--ro-bind", "@storeDir@", "@storeDir@",
-+	    "--ro-bind", "/run/current-system", "/run/current-system",
+	    "--ro-bind-try", "/run/current-system", "/run/current-system",
 	    NULL);
 
   /* These directories might be symlinks into /usr/... */
--- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix
@ -26,13 +26,13 @@

 stdenv.mkDerivation rec {
  pname = "gnome-desktop";
-  version = "40.4";
+  version = "41.0";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-iK6W9YXg0IcJQbuj113fPsQDSOHFrnQTIcpIL6ydRe8=";
+    sha256 = "sha256-acsdPZoQcA62Y0jvHA5mqFX8WpeuYpAt+XpJnaEVYtI=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix
@ -27,11 +27,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-disk-utility";
-  version = "40.2";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-ztES6qh9j/ohOv1NC62TnPp662cbeySIWaHchNb1Iec=";
+    sha256 = "sha256-h0PJj9ZWBi74YpM+/jDFvkxrMi7ALu4VTscNCO0Ild8=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-font-viewer";
-  version = "40.0";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j";
+    sha256 = "XdQQMxvgcOTgNDl/J1SYDgc4UdUKIRny+/lq3G/i6HY=";
  };

  doCheck = true;
--- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
@ -35,11 +35,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-initial-setup";
-  version = "40.4";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "QSplhO5upN+WN8QimT9Or4FYTSkZD16JOvmnhxy5Axs=";
+    sha256 = "R/ZHW2bIQ+fVPZC6Dns5SHYt8VFjSkNvaMK5u6BQVgo=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
@ -7,6 +7,7 @@
 , python3
 , wrapGAppsHook
 , glib
+, nv-codec-headers-11
 , pipewire
 , systemd
 , libvncserver
@ -21,11 +22,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-remote-desktop";
-  version = "40.1";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-mvpuUlVwo3IJP5cwM4JwkDiU87H5+KnfX1eDbqHSnek=";
+    hash = "sha256-apvIscaHRvSjqsH+dMRKcuJqi7S+HxynMCdwWstlK14=";
  };

  nativeBuildInputs = [
@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
    fuse3
    gdk-pixbuf # For libnotify
    glib
+    nv-codec-headers-11
    libnotify
    libsecret
    libvncserver
--- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
@ -42,11 +42,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-settings-daemon";
-  version = "40.0.1";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp";
+    sha256 = "5spjYfvR3qst4aHjkNTxQWfPR7HFR9u4tlpdielmOIQ=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-shell-extensions";
-  version = "40.4";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "9R1MQsIru9AxLKcY9Hz0Vp/FikbvQAdDrk0cx9kKzXk=";
+    sha256 = "2E+qwUSLOPl12cGUkMWSivxcWixJ3X5/ga9pD5Rm/Gg=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix
@ -66,13 +66,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "gnome-shell";
-  version = "40.4";
+  version = "41.0";

  outputs = [ "out" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "160z8bz2kqmrs6a4cs2gakv0rl9ba69p3ij2xjakqav50n9r3i9b";
+    sha256 = "Uvlx6FFA5d50uTae9mVuSc6Vrx8jL8Hg3x8EYSmrT2U=";
  };

  patches = [
@ -103,6 +103,13 @@ stdenv.mkDerivation rec {
      url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch";
      sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw=";
    })
+
+    # Make color picker in GTK work again
+    # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1990
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/a3dcdaae30bdcbadec7ba3fa31c9eb0bb2a4c8c2.patch";
+      sha256 = "1UTWGZ5CiVJVCYcepaf+A6/8X/s6jUMsYB4BJ7VTjxk=";
+    })
  ];

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
@ -1,30 +1,36 @@
--- a/js/ui/extensionDownloader.js
-+++ b/js/ui/extensionDownloader.js
-@@ -86,7 +86,7 @@
-     stream.output_stream.write_bytes(contents, null);
-     stream.close(null);
-     let [success, pid] = GLib.spawn_async(null,
-                                          ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
-+                                          ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()],
-                                           null,
-                                           GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                           null);
--- a/js/ui/status/keyboard.js
-+++ b/js/ui/status/keyboard.js
-@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button {
-         if (xkbVariant.length > 0)
-             description = `${description}\t${xkbVariant}`;
- 
-        Util.spawn(['gkbd-keyboard-display', '-l', description]);
-+        Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
-     }
- });
+diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service
+index de91167c5..1c9965678 100644
 --- a/data/org.gnome.Shell-disable-extensions.service
 +++ b/data/org.gnome.Shell-disable-extensions.service
-@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer
+@@ -11,5 +11,5 @@ ConditionPathExists=%t/gnome-shell-disable-extensions
 [Service]
 Type=simple
 # Disable extensions
 -ExecStart=gsettings set org.gnome.shell disable-user-extensions true
 +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
 Restart=no
+diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
+index 8bf4646a6..59e88bb4c 100644
+--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
+@@ -114,7 +114,7 @@ async function extractExtensionArchive(bytes, dir) {
+     stream.close_async(GLib.PRIORITY_DEFAULT, null);
+ 
+     const unzip = Gio.Subprocess.new(
+-        ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
+        ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()],
+         Gio.SubprocessFlags.NONE);
+     await unzip.wait_check_async(null);
+ }
+diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
+index bc50f3d37..868eb5abf 100644
+--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
+@@ -1080,6 +1080,6 @@ class InputSourceIndicator extends PanelMenu.Button {
+         if (xkbVariant.length > 0)
+             description = '%s\t%s'.format(description, xkbVariant);
+ 
+-        Util.spawn(['gkbd-keyboard-display', '-l', description]);
+        Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
+     }
+ });
--- a/pkgs/desktops/gnome/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-software/default.nix
@ -25,7 +25,6 @@
 , gsettings-desktop-schemas
 , gnome-desktop
 , libxmlb
-, gnome-online-accounts
 , json-glib
 , libsecret
 , valgrind-light
@ -43,11 +42,11 @@ in

 stdenv.mkDerivation rec {
  pname = "gnome-software";
-  version = "40.4";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "voxhGoAvcXGNzLvUVE7ZaIcxGYRv03t7dqeq1yx5mL8=";
+    sha256 = "AkC3bsnfYi2b7A6zjkrFY8rt5oCLrZO4gmPYCXD/OcE=";
  };

  patches = [
@ -89,7 +88,6 @@ stdenv.mkDerivation rec {
    polkit
    flatpak
    libxmlb
-    gnome-online-accounts
    libsysprof-capture
  ] ++ lib.optionals withFwupd [
    fwupd
--- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix
@ -24,11 +24,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-system-monitor";
-  version = "40.1";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx";
+    sha256 = "x/xExhlJt5SwKJlo67vMDBX4z8PZ5Fv6qB7UXBITnl8=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix
@ -1,36 +1,79 @@
-{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus
-, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala
-, desktop-file-utils, itstool, wrapGAppsHook, pcre2
-, libxslt, docbook-xsl-nons }:
+{ stdenv
+, lib
+, fetchurl
+, meson
+, ninja
+, pkg-config
+, python3
+, libxml2
+, gnome
+, dconf
+, nautilus
+, glib
+, gtk3
+, gsettings-desktop-schemas
+, vte
+, gettext
+, which
+, libuuid
+, vala
+, desktop-file-utils
+, itstool
+, wrapGAppsHook
+, pcre2
+, libxslt
+, docbook-xsl-nons
+}:

 stdenv.mkDerivation rec {
  pname = "gnome-terminal";
-  version = "3.40.1";
+  version = "3.42.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07";
+    sha256 = "tQ6eVmQjDmyikLzziBKltl4LqsZqSG7iEIlM9nX3Lgs=";
  };

-  buildInputs = [
-    gtk3 gsettings-desktop-schemas vte libuuid dconf
-    # For extension
-    nautilus
-  ];
-
  nativeBuildInputs = [
-    pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons
-    vala desktop-file-utils wrapGAppsHook pcre2
+    meson
+    ninja
+    pkg-config
+    gettext
+    itstool
+    which
+    libxml2
+    libxslt
+    glib # for glib-compile-schemas
+    docbook-xsl-nons
+    vala
+    desktop-file-utils
+    wrapGAppsHook
+    pcre2
+    python3
  ];

-  # Silly ./configure, it looks for dbus file from gnome-shell in the
+  buildInputs = [
+    glib
+    gtk3
+    gsettings-desktop-schemas
+    vte
+    libuuid
+    dconf
+    nautilus # For extension
+  ];
+
+  # Silly build system, it looks for dbus file from gnome-shell in the
  # installation tree of the package it is configuring.
  postPatch = ''
-    substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
-    substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
-  '';
+    substituteInPlace src/meson.build \
+       --replace "gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml'" \
+       "'${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml'"

-  configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30
+    patchShebangs \
+      data/icons/meson_updateiconcache.py \
+      data/meson_desktopfile.py \
+      src/meson_compileschemas.py
+  '';

  passthru = {
    updateScript = gnome.updateScript {
@ -39,8 +82,6 @@ stdenv.mkDerivation rec {
    };
  };

-  enableParallelBuilding = true;
-
  meta = with lib; {
    description = "The GNOME Terminal Emulator";
    homepage = "https://wiki.gnome.org/Apps/Terminal";
--- a/pkgs/desktops/gnome/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome/core/gucharmap/default.nix
@ -44,7 +44,7 @@ let
  };
 in stdenv.mkDerivation rec {
  pname = "gucharmap";
-  version = "13.0.2";
+  version = "14.0.0";

  outputs = [ "out" "lib" "dev" "devdoc" ];

@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
    owner = "GNOME";
    repo = pname;
    rev = version;
-    sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62";
+    sha256 = "sha256-d283zVRH42NZNq+vGmItN3ZBrRrl9gpYDco7osm3RoY=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@ -14,6 +14,7 @@
 , zenity
 , libcanberra
 , ninja
+, xvfb-run
 , xkeyboard_config
 , libxkbfile
 , libXdamage
@ -45,13 +46,13 @@

 let self = stdenv.mkDerivation rec {
  pname = "mutter";
-  version = "40.4";
+  version = "41.0";

  outputs = [ "out" "dev" "man" ];

  src = fetchurl {
    url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-pxwVnNKshKZ32l+nrMSUg7Jifa13L4gPiJ645FMKHiM=";
+    sha256 = "sha256-+oChp0QETYjr/Wd/8DID1ncF7SzWJOoGy7i1iUjN+J4=";
  };

  patches = [
@ -90,6 +91,7 @@ let self = stdenv.mkDerivation rec {
    mesa # needed for gbm
    meson
    ninja
+    xvfb-run
    pkg-config
    python3
    wrapGAppsHook
--- a/pkgs/desktops/gnome/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome/core/nautilus/default.nix
@ -34,11 +34,11 @@

 stdenv.mkDerivation rec {
  pname = "nautilus";
-  version = "40.2";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "tx7y/gfl7qiaK7HlvTCUe9GIc7+zD3nL8X7fvU0g9g0=";
+    sha256 = "+blBrcEEcAxn6kB2YiMV8fa3fc7BVMN/PUwLKDlQoeU=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch
@ -1,8 +1,8 @@
 diff --git a/meson.build b/meson.build
-index 4aa683d6..a930d533 100644
+index 8af2fcf9..0e318307 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -20,7 +20,11 @@ if not get_option('uninstalled')
+@@ -22,7 +22,11 @@ if not get_option('uninstalled')
     rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel')
     rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'),
     'rygel')
@ -15,7 +15,7 @@ index 4aa683d6..a930d533 100644
     rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins')
     rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines')
     rygel_presetdir = join_paths(rygel_datadir, 'presets')
-@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir)
+@@ -57,7 +61,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir)
 conf.set_quoted('PLUGIN_DIR', rygel_plugindir)
 conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir)
 conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir)
@ -25,14 +25,11 @@ index 4aa683d6..a930d533 100644
 conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract'))
 conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications'))
 diff --git a/meson_options.txt b/meson_options.txt
-index cb604c4e..1b049b77 100644
+index fd04776a..3dee43ba 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -1,6 +1,7 @@
+@@ -1,3 +1,4 @@
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
 option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only')
 option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation')
- option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path')
-+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
- option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3'])
- option('engines', type : 'array', choices : ['simple', 'gstreamer'])
- option('examples', type : 'boolean', value : 'true')
+ option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages')
--- a/pkgs/desktops/gnome/core/rygel/default.nix
+++ b/pkgs/desktops/gnome/core/rygel/default.nix
@ -28,16 +28,20 @@

 stdenv.mkDerivation rec {
  pname = "rygel";
-  version = "0.40.1";
+  version = "0.40.2";

  # TODO: split out lib
  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0=";
+    sha256 = "yejHNiltIsTe/pWXJ6KdMUN7vSt6oMZHDWviQBEFBpc=";
  };

+  patches = [
+    ./add-option-for-installation-sysconfdir.patch
+  ];
+
  nativeBuildInputs = [
    meson
    ninja
@ -78,16 +82,10 @@ stdenv.mkDerivation rec {
    "-Dapi-docs=false"
    "--sysconfdir=/etc"
    "-Dsysconfdir_install=${placeholder "out"}/etc"
-    # Build all plug-ins except for tracker 2
-    "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3"
  ];

  doCheck = true;

-  patches = [
-    ./add-option-for-installation-sysconfdir.patch
-  ];
-
  postPatch = ''
    patchShebangs data/xml/process-xml.py
  '';
--- a/pkgs/desktops/gnome/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome/core/simple-scan/default.nix
@ -25,11 +25,11 @@

 stdenv.mkDerivation rec {
  pname = "simple-scan";
-  version = "40.1";
+  version = "40.5";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-6+45qx/kygU8TtK9OjynZ0L/EJQ23QZF00FWIhMroLQ=";
+    sha256 = "sha256-61N55MtspgUJLJQiEMGEJdA2dz2nZUHkO4nYIj+CuaQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/sushi/default.nix
+++ b/pkgs/desktops/gnome/core/sushi/default.nix
@ -8,8 +8,7 @@
 , gnome
 , gtksourceview4
 , gjs
-, webkitgtk
-, libmusicbrainz5
+, webkitgtk_4_1
 , icu
 , wrapGAppsHook
 , gst_all_1
@ -23,11 +22,11 @@

 stdenv.mkDerivation rec {
  pname = "sushi";
-  version = "3.38.1";
+  version = "41.0";

  src = fetchurl {
-    url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "8+bRDIFVKNA6Zl+v0VwHGeAXqBOXWzrzIHYZnjeIiOk=";
+    url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    sha256 = "m3UlaQzkNmJO+gpgV3NJNDLNDva49GSYLouETtqYmO4=";
  };

  nativeBuildInputs = [
@ -49,8 +48,7 @@ stdenv.mkDerivation rec {
    gtksourceview4
    gdk-pixbuf
    librsvg
-    libmusicbrainz5
-    webkitgtk
+    webkitgtk_4_1
    epoxy
    gst_all_1.gstreamer
    gst_all_1.gst-plugins-base
--- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix
@ -10,11 +10,11 @@

 stdenv.mkDerivation rec {
  pname = "yelp-xsl";
-  version = "40.2";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-kZxVL4RqrsdB/lHVr0FrRpvNslx37/w7WhWktLf/gU4=";
+    sha256 = "sha256-yM1kwJO72MXV5H/TiGTpCDG1+c90A1MIcCBvqWY2pKU=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/yelp/default.nix
+++ b/pkgs/desktops/gnome/core/yelp/default.nix
@ -1,23 +1,47 @@
-{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib
-, gnome, sqlite
-, itstool, libxml2, libxslt, gst_all_1
-, wrapGAppsHook }:
+{ lib
+, stdenv
+, gettext
+, fetchurl
+, webkitgtk_4_1
+, pkg-config
+, gtk3
+, glib
+, gnome
+, sqlite
+, itstool
+, libxml2
+, libxslt
+, gst_all_1
+, wrapGAppsHook
+}:

 stdenv.mkDerivation rec {
  pname = "yelp";
-  version = "40.3";
+  version = "41.1";

  src = fetchurl {
    url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-oXOEeFHyYYm+eOy7EAFdU52Mzv/Hwj6GNUkrw62l7iM=";
+    sha256 = "sha256-RWpkFWR7zusBWbkLNVP/MocozymmCPzggCQjJQTMuHQ=";
  };

-  nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ];
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+    itstool
+    wrapGAppsHook
+  ];
+
  buildInputs = [
-    gtk3 glib webkitgtk sqlite
-    libxml2 libxslt gnome.yelp-xsl
+    gtk3
+    glib
+    webkitgtk_4_1
+    sqlite
+    libxml2
+    libxslt
+    gnome.yelp-xsl
    gnome.adwaita-icon-theme
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
  ];

  passthru = {
--- a/pkgs/desktops/gnome/core/zenity/default.nix
+++ b/pkgs/desktops/gnome/core/zenity/default.nix
@ -1,10 +1,12 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
+, meson
+, ninja
 , pkg-config
 , libxml2
 , gnome
 , gtk3
-, yelp-tools
 , gettext
 , libX11
 , itstool
@ -13,17 +15,18 @@

 stdenv.mkDerivation rec {
  pname = "zenity";
-  version = "3.32.0";
+  version = "3.41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7";
+    sha256 = "GbZ2w1EOIrrfzDIEBi1DK6U3QC9eCuJhKMDZDJVAN+E=";
  };

  nativeBuildInputs = [
+    meson
+    ninja
    pkg-config
    gettext
-    yelp-tools
    itstool
    libxml2
    wrapGAppsHook
--- a/pkgs/desktops/gnome/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix
@ -7,10 +7,10 @@
 , gtk3
 , wrapGAppsHook
 , glib
-, amtk
 , appstream-glib
 , gobject-introspection
 , python3
+, gi-docgen
 , webkitgtk
 , gettext
 , itstool
@ -20,11 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "devhelp";
-  version = "40.1";
+  version = "41.2";
+
+  outputs = [ "out" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "PorZPoSEtEgjyuR0ov2dziLtbs0lZVWSzq17G2gya7s=";
+    sha256 = "7KqQsPTaqPsgMPbcaQv1M/+Zp3NDf+Dhis/oLZl/YNI=";
  };

  nativeBuildInputs = [
@ -37,22 +39,27 @@ stdenv.mkDerivation rec {
    appstream-glib
    gobject-introspection
    python3
+    gi-docgen
  ];

  buildInputs = [
    glib
    gtk3
    webkitgtk
-    amtk
    gnome.adwaita-icon-theme
    gsettings-desktop-schemas
  ];

+  mesonFlags = [
+    "-Dgtk_doc=true"
+  ];
+
  doCheck = true;

  postPatch = ''
-    chmod +x meson_post_install.py # patchShebangs requires executable file
-    patchShebangs meson_post_install.py
+    # patchShebangs requires executable file
+    chmod +x build-aux/meson/meson_post_install.py
+    patchShebangs build-aux/meson/meson_post_install.py
  '';

  preFixup = ''
@ -63,6 +70,11 @@ stdenv.mkDerivation rec {
    )
  '';

+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput share/doc/devhelp-3 "$devdoc"
+  '';
+
  passthru = {
    updateScript = gnome.updateScript {
      packageName = "devhelp";
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@ -19,7 +19,7 @@

 stdenv.mkDerivation rec {
  pname = "gnome-shell-extension-gsconnect";
-  version = "47";
+  version = "48";

  outputs = [ "out" "installedTests" ];

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
    owner = "andyholmes";
    repo = "gnome-shell-extension-gsconnect";
    rev = "v${version}";
-    sha256 = "sha256-cpyB7ufjKTj7YVbPlQFJ4qaL6Rb/aBReKxCYzErT4+Q=";
+    sha256 = "sha256-cKEFTF8DnQIQAXVW9NvE34mUqueQP/OtxTzMUy1dT5U=";
  };

  patches = [
--- a/pkgs/desktops/gnome/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix
@ -19,11 +19,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-chess";
-  version = "40.1";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk";
+    sha256 = "8MKVFSLw5YX6aDdipBk9q2ujLtjOiSB/gIJ7VgRVaO8=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/games/hitori/default.nix
+++ b/pkgs/desktops/gnome/games/hitori/default.nix
@ -18,11 +18,11 @@

 stdenv.mkDerivation rec {
  pname = "hitori";
-  version = "3.38.2";
+  version = "3.38.3";

  src = fetchurl {
    url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "wmQ1cwN/ansW6SCK7e6GkQJvCBq6qhYJQu21LwkCnKw=";
+    sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome/games/swell-foop/default.nix
@ -21,11 +21,11 @@

 stdenv.mkDerivation rec {
  pname = "swell-foop";
-  version = "40.1";
+  version = "41.0.1";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1";
+    sha256 = "YEL/MTxsh9VkgnxwNpazsgkTbD/Dn+Jkpu+k4wWTg9g=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
@ -1,5 +1,9 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
+, fetchpatch
+, meson
+, ninja
 , pkg-config
 , gnome
 , gtk3
@ -11,21 +15,32 @@

 stdenv.mkDerivation rec {
  pname = "gnome-autoar";
-  version = "0.3.3";
+  version = "0.4.0";

  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "JyQA9zo3Wn6I/fHhJZG/uPPwPt8BeAytzXT3C2E+XAQ=";
+    sha256 = "6oxtUkurxxKsWeHQ46yL8BN0gtrfM8lP6RE3lKG8RHQ=";
  };

-  passthru = {
-    updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; };
-  };
+  patches = [
+    # Make compatible with older Meson.
+    # https://gitlab.gnome.org/GNOME/gnome-autoar/-/merge_requests/26
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/2d90da6174c03aad546802234a3d77fa0b714e6b.patch";
+      sha256 = "CysDpBJmVPm4gOSV2h041MY2yApfAy8+4QC7Jlka1xE=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/ac21bd0c50584a1905a0da65d4bf9a6926ecd483.patch";
+      sha256 = "aTu6eKFSKjljk0TYkhFjPcD8eJCIk8TR0YhZYO9JE1k=";
+    })
+  ];

  nativeBuildInputs = [
    gobject-introspection
+    meson
+    ninja
    pkg-config
    vala
  ];
@ -39,6 +54,17 @@ stdenv.mkDerivation rec {
    glib
  ];

+  mesonFlags = [
+    "-Dvapi=true"
+  ];
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "gnome-autoar";
+      attrPath = "gnome.gnome-autoar";
+    };
+  };
+
  meta = with lib; {
    platforms = platforms.linux;
    maintainers = teams.gnome.members;
--- a/pkgs/desktops/gnome/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome/misc/gpaste/default.nix
@ -17,14 +17,14 @@
 }:

 stdenv.mkDerivation rec {
-  version = "3.40.2";
+  version = "3.42.0";
  pname = "gpaste";

  src = fetchFromGitHub {
    owner = "Keruspe";
    repo = "GPaste";
    rev = "v${version}";
-    sha256 = "sha256-DUikcnkDBRkCwPLrl8lkNr+SeNpc3bPwPTWRn91nOo4=";
+    sha256 = "sha256-YsAA487Q2BwDh4V2TPN/YwAFCw+F11OKMjatcNR98/c=";
  };

  patches = [
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@ -42,6 +42,8 @@ let

        "0.52" = ./disable-graphviz-0.46.1.patch;

+        "0.54" = ./disable-graphviz-0.46.1.patch;
+
      }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");

    disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
@ -130,5 +132,10 @@ in rec {
    sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE=";
  };

-  vala = vala_0_52;
+  vala_0_54 = generic {
+    version = "0.54.1";
+    sha256 = "0jlhd6hr9mai7hhc2c78w6zmnzf7xncp7fhyiavkqqzhhsn7gpjx";
+  };
+
+  vala = vala_0_54;
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -1996,9 +1996,16 @@ EOT
  # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
  streamly-posix = doJailbreak super.streamly-posix;

+  # https://github.com/hadolint/language-docker/issues/72
+  language-docker_10_2_0 = overrideCabal super.language-docker_10_2_0 (drv: {
+    testFlags = (drv.testFlags or []) ++ [
+      "--skip=/Language.Docker.Integration/parse"
+    ];
+  });
+
  # 2021-09-06: hadolint depends on language-docker >= 10.1
  hadolint = super.hadolint.override {
-    language-docker = self.language-docker_10_1_2;
+    language-docker = self.language-docker_10_2_0;
  };

  # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1)
@ -2025,11 +2032,11 @@ EOT

  # Needs network >= 3.1.2
  quic = super.quic.overrideScope (self: super: {
-    network = self.network_3_1_2_2;
+    network = self.network_3_1_2_5;
  });

  http3 = super.http3.overrideScope (self: super: {
-    network = self.network_3_1_2_2;
+    network = self.network_3_1_2_5;
  });

 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -43,54 +43,129 @@ self: super: {
  unix = null;
  xhtml = null;

+  aeson = appendPatch (doJailbreak super.aeson) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/aeson-1.5.6.0.patch";
+    sha256 = "07rk7f0lhgilxvbg2grpl1p5x25wjf9m7a0wqmi2jr0q61p9a0nl";
+    # The revision information is newer than that included in the patch
+    excludes = ["*.cabal"];
+  });
+
+  attoparsec = appendPatch (doJailbreak super.attoparsec_0_14_1) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/attoparsec-0.14.1.patch";
+    sha256 = "0nprywmi3i9ih8mcc8afyimrfjr8pbcjxr2ywz9gwdlwdplk21da";
+  });
+
  # 0.12.0 introduces support for 9.2
  base-compat = self.base-compat_0_12_0;
+  base-compat-batteries = self.base-compat-batteries_0_12_0;
+
+  basement = overrideCabal (appendPatch super.basement (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/basement-0.0.12.patch";
+    sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z";
+  })) (drv: {
+    # This is inside a conditional block so `doJailbreak` doesn't work
+    postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal";
+  });
+
+  # Duplicate Show instances in tests and library cause compiling tests to fail
+  blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch";
+    sha256 = "1h5ny3mlng69vwaabl3af8hlv4qi24wfw8s14lw2ksw1yjbgi0j8";
+  });
+
+  cereal = appendPatch super.cereal (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch";
+    sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128";
+  });
+
+  # Tests fail because of typechecking changes
+  conduit = dontCheck super.conduit;
+
+  constraints = appendPatch super.constraints (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch";
+    sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3";
+  });
+
+  cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch";
+    sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09";
+  });

  # cabal-install needs more recent versions of Cabal and base16-bytestring.
  cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
    Cabal = null;
  });

+  doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch";
+    sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1";
+  });
+
+  entropy = appendPatch super.entropy (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/entropy-0.4.1.6.patch";
+    sha256 = "0pbbl6m8b3snf9cz6rs0ljmacpsavayfn0s3p67hdcmndy3ndawi";
+  });
+
+  # Tests fail in GHC 9.2
+  extra = dontCheck super.extra;
+
  # Jailbreaks & Version Updates
+  assoc = doJailbreak super.assoc;
  async = doJailbreak super.async;
  base64-bytestring = doJailbreak super.base64-bytestring;
  ChasingBottoms = doJailbreak super.ChasingBottoms;
+  cpphs = overrideCabal super.cpphs (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";});
+  cryptohash-md5 = doJailbreak super.cryptohash-md5;
+  cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
  data-fix = doJailbreak super.data-fix;
  dec = doJailbreak super.dec;
  ed25519 = doJailbreak super.ed25519;
+  ghc-byteorder = doJailbreak super.ghc-byteorder;
  hackage-security = doJailbreak super.hackage-security;
  hashable-time = doJailbreak super.hashable-time;
  HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; });
-  integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
+  integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; });
+  indexed-traversable = doJailbreak super.indexed-traversable;
+  lifted-async = doJailbreak super.lifted-async;
  lukko = doJailbreak super.lukko;
-  network = super.network_3_1_2_2;
+  network = super.network_3_1_2_5;
  parallel = doJailbreak super.parallel;
+  polyparse = overrideCabal (doJailbreak super.polyparse) (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; });
  primitive = doJailbreak super.primitive;
  regex-posix = doJailbreak super.regex-posix;
  resolv = doJailbreak super.resolv;
  singleton-bool = doJailbreak super.singleton-bool;
+  scientific = doJailbreak super.scientific;
+  shelly = doJailbreak super.shelly;
  split = doJailbreak super.split;
  splitmix = doJailbreak super.splitmix;
  tar = doJailbreak super.tar;
+  these = doJailbreak super.these;
  time-compat = doJailbreak super.time-compat;
+  type-equality = doJailbreak super.type-equality;
  vector = doJailbreak (dontCheck super.vector);
  vector-binary-instances = doJailbreak super.vector-binary-instances;
  vector-th-unbox = doJailbreak super.vector-th-unbox;
  zlib = doJailbreak super.zlib;

+  # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
+  alex = dontCheck super.alex;
+
  # Apply patches from head.hackage.
-  alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch";
-    sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
-  });
-  doctest = dontCheck (doJailbreak super.doctest_0_18_1);
  language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
-    sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch";
+    sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv";
  });

-  # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x
-  hashable = super.hashable_1_3_3_0;
+  hashable = super.hashable_1_3_4_1;
+
+  haskell-src-meta = appendPatch (doJailbreak super.haskell-src-meta) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch";
+    sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp";
+  });
+
+  # Tests depend on `parseTime` which is no longer available
+  hourglass = dontCheck super.hourglass;

  # 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0
  # The test suite indirectly depends on random, which leads to infinite recursion
@ -100,16 +175,31 @@ self: super: {
  lens = super.lens_5_0_1;

  # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
-  memory = super.memory_0_16_0;
+  memory = appendPatch super.memory_0_16_0 (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch";
+    sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl";
+  });

  # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs
  # https://github.com/snoyberg/mono-traversable/issues/192
  mono-traversable = dontCheck super.mono-traversable;

+  quickcheck-instances = appendPatch (doJailbreak super.quickcheck-instances) (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/quickcheck-instances-0.3.25.2.patch";
+    sha256 = "0ndnb6wbnhxxwy69jjdpmd7gmmv6asmx1jczwz1hsn921mn1ilnp";
+    # `.cabal` revision information has been included in the patch
+    excludes = ["*.cabal"];
+  });
+
  # Disable tests pending resolution of
  # https://github.com/Soostone/retry/issues/71
  retry = dontCheck super.retry;

+  streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch {
+    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch";
+    sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy";
+  });
+
  # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
  hlint = super.hlint_3_3_4.overrideScope (self: super: {
    ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 18.12
+# Stackage LTS 18.13
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -163,22 +163,22 @@ default-package-overrides:
  - array-memoize ==0.6.0
  - arrow-extras ==0.1.0.1
  - arrows ==0.4.4.2
-  - ascii ==1.0.1.4
-  - ascii-case ==1.0.0.4
-  - ascii-char ==1.0.0.8
+  - ascii ==1.0.1.6
+  - ascii-case ==1.0.0.6
+  - ascii-char ==1.0.0.10
  - asciidiagram ==1.3.3.3
-  - ascii-group ==1.0.0.4
-  - ascii-predicates ==1.0.0.4
+  - ascii-group ==1.0.0.6
+  - ascii-predicates ==1.0.0.6
  - ascii-progress ==0.3.3.0
-  - ascii-superset ==1.0.1.4
-  - ascii-th ==1.0.0.4
+  - ascii-superset ==1.0.1.6
+  - ascii-th ==1.0.0.6
  - asn1-encoding ==0.9.6
  - asn1-parse ==0.9.5
  - asn1-types ==0.3.4
  - assert-failure ==0.1.2.5
  - assoc ==1.0.2
  - astro ==0.4.3.0
-  - async ==2.2.3
+  - async ==2.2.4
  - async-extra ==0.2.0.0
  - async-pool ==0.9.1
  - async-refresh ==0.3.0.0
@ -277,7 +277,7 @@ default-package-overrides:
  - blaze-svg ==0.3.6.1
  - blaze-textual ==0.2.2.1
  - bmp ==1.2.6.3
-  - BNFC ==2.9.2
+  - BNFC ==2.9.3
  - BNFC-meta ==0.6.1
  - board-games ==0.3
  - boltzmann-samplers ==0.1.1.0
@ -614,7 +614,7 @@ default-package-overrides:
  - distributed-closure ==0.4.2.0
  - distribution-opensuse ==1.1.1
  - distributive ==0.6.2.1
-  - dl-fedora ==0.9.1
+  - dl-fedora ==0.9.2
  - dlist ==1.0
  - dlist-instances ==0.1.1.1
  - dlist-nonempty ==0.1.1
@ -683,7 +683,7 @@ default-package-overrides:
  - elynx-tree ==0.5.1.1
  - email-validate ==2.3.2.15
  - emd ==0.2.0.0
-  - emojis ==0.1
+  - emojis ==0.1.1
  - enclosed-exceptions ==1.0.3
  - ENIG ==0.0.1.0
  - entropy ==0.4.1.6
@ -704,7 +704,7 @@ default-package-overrides:
  - errors ==2.3.0
  - errors-ext ==0.4.2
  - ersatz ==0.4.9
-  - esqueleto ==3.5.2.2
+  - esqueleto ==3.5.3.0
  - essence-of-live-coding ==0.2.5
  - essence-of-live-coding-gloss ==0.2.5
  - essence-of-live-coding-pulse ==0.2.5
@ -838,7 +838,7 @@ default-package-overrides:
  - generic-aeson ==0.2.0.12
  - generic-arbitrary ==0.1.0
  - generic-constraints ==1.1.1.1
-  - generic-data ==0.9.2.0
+  - generic-data ==0.9.2.1
  - generic-data-surgery ==0.3.0.0
  - generic-deriving ==1.14.1
  - generic-functor ==0.2.0.0
@ -1011,7 +1011,7 @@ default-package-overrides:
  - hasql-transaction ==1.0.1
  - hasty-hamiltonian ==1.3.4
  - HaTeX ==3.22.3.0
-  - HaXml ==1.25.5
+  - HaXml ==1.25.6
  - haxr ==3000.11.4.1
  - HCodecs ==0.5.2
  - hdaemonize ==0.5.6
@ -1107,7 +1107,7 @@ default-package-overrides:
  - hslua-module-path ==0.1.0.1
  - hslua-module-system ==0.2.2.1
  - hslua-module-text ==0.3.0.1
-  - HsOpenSSL ==0.11.7.1
+  - HsOpenSSL ==0.11.7.2
  - HsOpenSSL-x509-system ==0.1.0.4
  - hsp ==0.10.0
  - hspec ==2.7.10
@ -1259,7 +1259,7 @@ default-package-overrides:
  - intset-imperative ==0.1.0.0
  - invariant ==0.5.4
  - invertible ==0.2.0.7
-  - invertible-grammar ==0.1.3
+  - invertible-grammar ==0.1.3.1
  - io-machine ==0.2.0.0
  - io-manager ==0.1.0.3
  - io-memoize ==1.1.1.0
@ -1395,6 +1395,7 @@ default-package-overrides:
  - linear ==1.21.6
  - linear-circuit ==0.1.0.2
  - linenoise ==0.3.2
+  - linux-capabilities ==0.1.0.0
  - linux-file-extents ==0.2.0.0
  - linux-namespaces ==0.1.3.0
  - liquid-fixpoint ==0.8.10.2
@ -1446,7 +1447,7 @@ default-package-overrides:
  - makefile ==1.1.0.0
  - managed ==1.0.8
  - MapWith ==0.2.0.0
-  - markdown ==0.1.17.4
+  - markdown ==0.1.17.5
  - markdown-unlit ==0.5.1
  - markov-chain ==0.0.3.4
  - massiv ==0.6.1.0
@ -1578,7 +1579,7 @@ default-package-overrides:
  - multipart ==0.2.1
  - multiset ==0.3.4.3
  - multistate ==0.8.0.3
-  - murmur3 ==1.0.4
+  - murmur3 ==1.0.5
  - murmur-hash ==0.1.0.9
  - MusicBrainz ==0.4.1
  - mustache ==2.3.1
@ -1634,7 +1635,7 @@ default-package-overrides:
  - nonce ==1.0.7
  - nondeterminism ==1.4
  - non-empty ==0.3.3
-  - nonempty-containers ==0.3.4.3
+  - nonempty-containers ==0.3.4.4
  - nonemptymap ==0.0.6.0
  - non-empty-sequence ==0.2.0.4
  - nonempty-vector ==0.2.1.0
@ -1686,7 +1687,7 @@ default-package-overrides:
  - opentelemetry-extra ==0.7.0
  - opentelemetry-lightstep ==0.7.0
  - opentelemetry-wai ==0.7.0
-  - operational ==0.2.3.5
+  - operational ==0.2.4.0
  - operational-class ==0.3.0.0
  - optics ==0.3
  - optics-core ==0.3.0.1
@ -2011,7 +2012,7 @@ default-package-overrides:
  - rocksdb-haskell ==1.0.1
  - rocksdb-haskell-jprupp ==2.1.3
  - rocksdb-query ==0.4.2
-  - roles ==0.2.0.0
+  - roles ==0.2.1.0
  - rope-utf16-splay ==0.3.2.0
  - rosezipper ==0.2
  - rot13 ==0.2.0.1
@ -2120,7 +2121,7 @@ default-package-overrides:
  - set-cover ==0.1.1
  - setenv ==0.1.1.3
  - setlocale ==1.0.0.10
-  - sexp-grammar ==2.3.2
+  - sexp-grammar ==2.3.3
  - SHA ==1.6.4.4
  - shake ==0.19.6
  - shake-language-c ==0.12.0
@ -2464,7 +2465,7 @@ default-package-overrides:
  - turtle ==1.5.22
  - typecheck-plugin-nat-simple ==0.1.0.2
  - TypeCompose ==0.9.14
-  - typed-process ==0.2.6.1
+  - typed-process ==0.2.6.3
  - typed-uuid ==0.1.0.0
  - type-equality ==1
  - type-errors ==0.2.0.0
@ -2608,7 +2609,7 @@ default-package-overrides:
  - wai-websockets ==3.0.1.2
  - wakame ==0.1.0.0
  - warp ==3.3.17
-  - warp-tls ==3.3.1
+  - warp-tls ==3.3.2
  - warp-tls-uid ==0.2.0.6
  - wave ==0.2.0
  - wcwidth ==0.0.2
@ -2660,7 +2661,7 @@ default-package-overrides:
  - Xauth ==0.1
  - xdg-basedir ==0.2.2
  - xdg-userdirs ==0.1.0.2
-  - xeno ==0.4.2
+  - xeno ==0.4.3
  - xlsx ==0.8.4
  - xlsx-tabular ==0.2.2.1
  - xml ==1.3.14
@ -2693,7 +2694,7 @@ default-package-overrides:
  - yesod-fb ==0.6.1
  - yesod-form ==1.7.0
  - yesod-gitrev ==0.2.2
-  - yesod-markdown ==0.12.6.11
+  - yesod-markdown ==0.12.6.12
  - yesod-newsfeed ==1.7.0.0
  - yesod-page-cursor ==2.0.0.9
  - yesod-paginator ==1.1.1.0
@ -2724,6 +2725,6 @@ default-package-overrides:
  - zlib-bindings ==0.1.1.5
  - zlib-lens ==0.1.2.1
  - zot ==0.0.3
-  - zstd ==0.1.2.0
+  - zstd ==0.1.3.0
  - ztail ==1.2.0.2
  - zydiskell ==0.2.0.0
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@ -21,11 +21,11 @@

 stdenv.mkDerivation rec {
  pname = "at-spi2-core";
-  version = "2.40.3";
+  version = "2.42.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "5Jg3wq0w1x4fKcqOCWilS5UDAnL3/0C4m0iWhlPzelw=";
+    sha256 = "11p3lvmbm0hfck3p5xwxxycln8x0cf7l68jjz6an2g7sjh7a2pab";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/development/libraries/atkmm/2.36.nix
+++ b/pkgs/development/libraries/atkmm/2.36.nix
@ -0,0 +1,33 @@
+{ lib, stdenv, fetchurl, atk, glibmm_2_68, pkg-config, gnome, meson, ninja, python3 }:
+
+stdenv.mkDerivation rec {
+  pname = "atkmm";
+  version = "2.36.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "sha256-4RMkv+0bbjMKAtslzswUXcoD+w3/R/BxDIXjF2h9pFg=";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  propagatedBuildInputs = [ atk glibmm_2_68 ];
+
+  nativeBuildInputs = [ pkg-config meson ninja python3 ];
+
+  doCheck = true;
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = pname;
+      versionPolicy = "odd-unstable";
+    };
+  };
+
+  meta = {
+    description = "C++ wrappers for ATK accessibility toolkit";
+    license = lib.licenses.lgpl21Plus;
+    homepage = "https://gtkmm.org";
+    platforms = lib.platforms.unix;
+  };
+}
--- a/pkgs/development/libraries/atkmm/default.nix
+++ b/pkgs/development/libraries/atkmm/default.nix
@ -1,19 +1,19 @@
-{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome }:
+{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome, meson, ninja, python3 }:

 stdenv.mkDerivation rec {
  pname = "atkmm";
-  version = "2.28.0";
+  version = "2.28.2";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c";
+    sha256 = "sha256-oLtJdlzszCk6ssZzW6EAQxgH04T/oUwuvTDgeZP9L6Q=";
  };

  outputs = [ "out" "dev" ];

  propagatedBuildInputs = [ atk glibmm ];

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config meson python3 ninja ];

  doCheck = true;

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
    updateScript = gnome.updateScript {
      packageName = pname;
      versionPolicy = "odd-unstable";
+      freeze = true;
    };
  };

--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@ -1,18 +1,19 @@
-{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }:
+{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx, meson, ninja }:
+
 stdenv.mkDerivation rec {
  pname = "cairomm";
-  version = "1.12.2";
+  version = "1.14.3";

  src = fetchurl {
-    url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz";
+    url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz";
    # gnome doesn't have the latest version ATM; beware: same name but different hash
    #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25";
+    sha256 = "sha256-DTfgZ8XEyngIt87dq/4ZMsW9KnUK1k+zIeEhNTYpfng=";
  };

  outputs = [ "out" "dev" ];

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config meson ninja ];
  propagatedBuildInputs = [ cairo libsigcxx ];
  buildInputs = [ fontconfig freetype ]
  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
--- a/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch
+++ b/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch
@ -0,0 +1,29 @@
+From 7bc49f8edd9a49d675ee5b163ab61b405e2d0258 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Thu, 7 Oct 2021 21:42:26 +0200
+Subject: [PATCH] Fix build with Vala 0.54
+
+Vala codegen now emits constructor methods so we need to skip @new
+so that we can use a custom one from our VAPI overrides.
+
+https://gitlab.gnome.org/GNOME/vala/-/commit/472765b90cd98c1a628975d20005c46352d665f8
+---
+ vapi/Dee-1.0.metadata | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/vapi/Dee-1.0.metadata b/vapi/Dee-1.0.metadata
+index 7e80de0..793ffd8 100644
+--- a/vapi/Dee-1.0.metadata
+++ b/vapi/Dee-1.0.metadata
+@@ -1,6 +1,8 @@
+ GListResultSet skip
+ GListResultSetClass skip
+ 
+Filter
+	.new skip
+ FilterModel
+ 	.filter unowned
+ Model
+-- 
+2.33.0
+
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
    "${src}/debian/patches/gtkdocize.patch"
    "${src}/debian/patches/strict-prototype.patch"
    "${src}/debian/patches/vapi-skip-properties.patch"
+    ./0001-Fix-build-with-Vala-0.54.patch

    # Fixes glib 2.62 deprecations
    (fetchpatch {
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@ -1,5 +1,7 @@
-{ fetchurl
-, lib, stdenv
+{ stdenv
+, lib
+, fetchurl
+, fetchpatch
 , pkg-config
 , meson
 , ninja
@ -43,6 +45,15 @@ stdenv.mkDerivation rec {
    sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU=";
  };

+  patches = [
+    # Fix build with evolution-data-server ≥ 3.41
+    # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/52
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/folks/-/commit/62d588b0c609de17df5b4d1ebfbc67c456267efc.patch";
+      sha256 = "TDL/5kvVwHnvDMuKDdPLQmpmE1FTZhY+7HG8NxKqt5w=";
+    })
+  ];
+
  nativeBuildInputs = [
    gettext
    gobject-introspection
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@ -11,6 +11,9 @@
 , libtasn1
 , gtk3
 , pango
+, libsecret
+, openssh
+, systemd
 , gobject-introspection
 , makeWrapper
 , libxslt
@ -22,22 +25,15 @@

 stdenv.mkDerivation rec {
  pname = "gcr";
-  version = "3.40.0";
+  version = "3.41.0";
+
+  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U=";
+    sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE=";
  };

-  postPatch = ''
-    patchShebangs build/ gcr/fixtures/
-
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
-  '';
-
-  outputs = [ "out" "dev" ];
-
  nativeBuildInputs = [
    pkg-config
    meson
@ -56,6 +52,9 @@ stdenv.mkDerivation rec {
    libgcrypt
    libtasn1
    pango
+    libsecret
+    openssh
+    systemd
  ];

  propagatedBuildInputs = [
@ -70,10 +69,22 @@ stdenv.mkDerivation rec {

  mesonFlags = [
    "-Dgtk_doc=false"
+    # We are still using ssh-agent from gnome-keyring.
+    # https://github.com/NixOS/nixpkgs/issues/140824
+    "-Dssh_agent=false"
  ];

  doCheck = false; # fails 21 out of 603 tests, needs dbus daemon

+  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+
+  postPatch = ''
+    patchShebangs build/ gcr/fixtures/
+
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
  preFixup = ''
    wrapProgram "$out/bin/gcr-viewer" \
      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
@ -82,7 +93,6 @@ stdenv.mkDerivation rec {
  passthru = {
    updateScript = gnome.updateScript {
      packageName = pname;
-      versionPolicy = "odd-unstable";
    };
  };

--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@ -30,13 +30,13 @@ let
  ];
 in stdenv.mkDerivation rec {
  pname = "gjs";
-  version = "1.68.3";
+  version = "1.70.0";

  outputs = [ "out" "dev" "installedTests" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-ghx/T3jxUA2mpWxUY3I72P+A3mM8y6Q6WrA9jMyiHT8=";
+    sha256 = "sha256-SwYpNBoxigI3ThE6uX+anzMlQjJp/B4LBDpf+wGGHF8=";
  };

  patches = [
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "glib-networking";
-  version = "2.68.2";
+  version = "2.70.0";

  outputs = [ "out" "installedTests" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "U168BU72l9tWpP/+2RvA4RyO4cmstIqtKMjh1cPVmU8=";
+    sha256 = "0dbg1na239mbavn4hknkax5sns9q2dbdnqw9wcpmhv58mzkhid36";
  };

  patches = [
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@ -45,11 +45,11 @@ in

 stdenv.mkDerivation rec {
  pname = "glib";
-  version = "2.68.4";
+  version = "2.70.0";

  src = fetchurl {
    url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs=";
+    sha256 = "0hh7hk02fkm1bn48k4z8f3kgv9qbni5z22gizd567fn527w7s390";
  };

  patches = optionals stdenv.isDarwin [
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "glibmm";
-  version = "2.64.5";
+  version = "2.66.1";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-UI/IbiyRQRmKoWwiWxb9a5EZF8DTgXYCZShE0Jc+o4Y=";
+    sha256 = "sha256-ab1rUydxbKL1EatYCpaf178M0sJM4V4dDlMFktP/IJw=";
  };

  outputs = [ "out" "dev" ];
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
    updateScript = gnome.updateScript {
      packageName = pname;
      versionPolicy = "odd-unstable";
+      freeze = true;
    };
  };

--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@ -26,7 +26,7 @@

 stdenv.mkDerivation rec {
  pname = "gobject-introspection";
-  version = "1.68.0";
+  version = "1.70.0";

  # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
  # by pygobject3 (and maybe others), but it's only searched in $out
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj";
+    sha256 = "0jpwraip7pwl9bf9s59am3r7074p34fasvfb5ym1fb8hwc34jawh";
  };

  patches = [
--- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
+++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix
@ -12,11 +12,11 @@

 stdenv.mkDerivation rec {
  pname = "gsettings-desktop-schemas";
-  version = "40.0";
+  version = "41.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i";
+    sha256 = "dyiZcuWW0ERYPwwFYwbY8dvYrc+RKRClDaCmY+ZTMu0=";
  };

  strictDeps = true;
--- a/pkgs/development/libraries/gsound/default.nix
+++ b/pkgs/development/libraries/gsound/default.nix
@ -1,15 +1,15 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome }:
+{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome, meson, ninja }:

 stdenv.mkDerivation rec {
  pname = "gsound";
-  version = "1.0.2";
+  version = "1.0.3";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
+    sha256 = "06l80xgykj7x1kqkjvcq06pwj2rmca458zvs053qc55x3sg06bfa";
  };

-  nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ];
+  nativeBuildInputs = [ pkg-config meson ninja gobject-introspection libtool vala ];
  buildInputs = [ glib libcanberra ];

  passthru = {
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "gtk-mac-integration";
-  version = "2.1.3";
+  version = "3.0.1";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "GNOME";
    repo = pname;
    rev = "${pname}-${version}";
-    sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap";
+    sha256 = "0sc0m3p8r5xfh5i4d7dg72kfixx9yi4f800y43bszyr88y52jkga";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ];
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@ -19,15 +19,11 @@
 , gdk-pixbuf
 , gobject-introspection
 , fribidi
+, harfbuzz
 , xorg
 , epoxy
-, json-glib
 , libxkbcommon
 , libxml2
-, librest
-, libsoup
-, ffmpeg
-, gmp
 , gnome
 , gsettings-desktop-schemas
 , gst_all_1
@ -37,6 +33,8 @@
 , x11Support ? stdenv.isLinux
 , waylandSupport ? stdenv.isLinux
 , libGL
+# experimental and can cause crashes in inspector
+, vulkanSupport ? false
 , vulkan-loader
 , vulkan-headers
 , wayland
@ -61,7 +59,7 @@ in

 stdenv.mkDerivation rec {
  pname = "gtk4";
-  version = "4.2.1";
+  version = "4.4.0";

  outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
  outputBin = "dev";
@ -73,7 +71,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
-    sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY=";
+    sha256 = "4KFQj0QWhsOiDf7EivUzsZpLLgF8GOruMdzNt9KSUFs=";
  };

  nativeBuildInputs = [
@ -86,27 +84,25 @@ stdenv.mkDerivation rec {
    python3
    sassc
    gi-docgen
+    libxml2 # for xmllint
  ] ++ setupHooks;

  buildInputs = [
    libxkbcommon
    epoxy
-    json-glib
    isocodes
-  ] ++ lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals vulkanSupport [
    vulkan-headers
  ] ++ [
-    librest
-    libsoup
-    ffmpeg
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-bad
    fribidi
+    harfbuzz
  ] ++ (with xorg; [
    libICE
    libSM
-    libXcomposite
    libXcursor
+    libXdamage
    libXi
    libXrandr
    libXrender
@ -134,7 +130,7 @@ stdenv.mkDerivation rec {
    glib
    graphene
    pango
-  ] ++ lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals vulkanSupport [
    vulkan-loader
  ] ++ [
    # Required for GSettings schemas at runtime.
@ -148,10 +144,11 @@ stdenv.mkDerivation rec {
    "-Dbuild-tests=false"
    "-Dtracker=${if trackerSupport then "enabled" else "disabled"}"
    "-Dbroadway-backend=${lib.boolToString broadwaySupport}"
+  ] ++ lib.optionals vulkanSupport [
+    "-Dvulkan=enabled"
  ] ++ lib.optionals (!cupsSupport) [
    "-Dprint-cups=disabled"
  ] ++ lib.optionals stdenv.isDarwin [
-    "-Dvulkan=disabled"
    "-Dmedia-gstreamer=disabled" # requires gstreamer-gl
  ] ++ lib.optionals (!x11Support) [
    "-Dx11-backend=false"
@ -168,6 +165,7 @@ stdenv.mkDerivation rec {
  postPatch = ''
    files=(
      build-aux/meson/post-install.py
+      build-aux/meson/gen-demo-header.py
      demos/gtk-demo/geninclude.py
      gdk/broadway/gen-c-array.py
      gdk/gen-gdk-gresources-xml.py
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , pkg-config
@ -24,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "gtksourceview";
-  version = "4.8.1";
+  version = "4.8.2";

  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE=";
+    sha256 = "1k1pava84ywgq62xl5bz8y3zm7z2kz6kkgp423c0y02jrgjyfbc4";
  };

  patches = [
@ -38,13 +37,6 @@ stdenv.mkDerivation rec {
    # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS).
    # Since this is not generally true with Nix, let’s add $out/share unconditionally.
    ./4.x-nix_share_path.patch
-
-    # fixes intermittent "gtksourceview-gresources.h: no such file" errors
-    (fetchpatch {
-      name = "ensure-access-to-resources-in-corelib-build.patch";
-      url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch";
-      sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0=";
-    })
  ];

  nativeBuildInputs = [
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@ -15,7 +15,8 @@
 , perlPackages
 , pythonBindings ? true
 , tclBindings ? true
-, perlBindings ? true
+, perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform
+, buildPackages
 }:

 stdenv.mkDerivation rec {
@ -27,11 +28,15 @@ stdenv.mkDerivation rec {
    sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9";
  };

+  strictDeps = true;
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
  nativeBuildInputs = [
    swig
    pkg-config
    libtool
-  ];
+  ] ++ lib.optionals pythonBindings [ python3 ]
+    ++ lib.optionals tclBindings [ tcl ]
+    ++ lib.optionals perlBindings [ perl ];

  buildInputs = [
    gd
@ -39,10 +44,12 @@ stdenv.mkDerivation rec {
    libusb-compat-0_1
    boost
  ] ++ lib.optionals pythonBindings [ python3 ncurses ]
-    ++ lib.optionals tclBindings [ tcl ]
-    ++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ];
+    ++ lib.optionals tclBindings [ tcl ];

-  configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ]
+
+  configureFlags = [
+    "CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc"
+  ] ++ lib.optionals perlBindings [ "--with-perl-binding" ]
    ++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ]
    ++ lib.optionals pythonBindings [ "--with-python-binding" ];

--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }:
 stdenv.mkDerivation rec {
  pname = "jsonrpc-glib";
-  version = "3.38.0";
+  version = "3.40.0";

  outputs = [ "out" "dev" "devdoc" ];

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI=";
+    sha256 = "wuPRYlfHJmzTkBiE4iN1V1v2Go4fZ1lsiODYeucNDvQ=";
  };

  mesonFlags = [
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc
+{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc
 , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
 , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
 , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation rec {
  pname = "libblockdev";
-  version = "2.25";
+  version = "2.26";

  src = fetchFromGitHub {
    owner = "storaged-project";
    repo = "libblockdev";
    rev = "${version}-1";
-    sha256 = "sha256-eHUHTogKoNrnwwSo6JaI7NMxVt9JeMqfWyhR62bDMuQ=";
+    sha256 = "sha256-e7j5b1KbjgVN9JpJtK2o7RNEHZjKDoDyoY4f8GlIdyI=";
  };

  outputs = [ "out" "dev" "devdoc" ];
@ -22,13 +22,6 @@ stdenv.mkDerivation rec {
      src = ./fix-paths.patch;
      sgdisk = "${gptfdisk}/bin/sgdisk";
    })
-
-    # fix build with glib 2.68 (g_memdup is deprecated)
-    # https://github.com/storaged-project/libblockdev/pull/623
-    (fetchpatch {
-      url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch";
-      sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM=";
-    })
  ];

  postPatch = ''
--- a/Show More
+++ b/Show More