GNOME: 48 → 49 (#440720)

2025-11-03 16:46:36 +00:00
parent 75cf6e139a 23f16d7cab
commit c08504b1c9
158 changed files with 1074 additions and 1085 deletions
@@ -168,6 +168,8 @@

 - `meilisearch_1_11` has been removed, as it is no longer supported.

+- `budgie-desktop` has been updated [10.9.3](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.3), this changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie`.
+
 - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.

 - `carla` no longer support `gtk2` override.
@@ -92,7 +92,15 @@ async def attr_instantiation_worker(
 ) -> tuple[Path, str]:
    async with semaphore:
        eprint(f"Instantiating {attr_path}…")
-        return (await nix_instantiate(attr_path), attr_path)
+        try:
+            return (await nix_instantiate(attr_path), attr_path)
+        except Exception as e:
+            # Failure should normally terminate the script but
+            # looks like Python is buggy so we need to do it ourselves.
+            eprint(f"Failed to instantiate {attr_path}")
+            if e.stderr:
+                eprint(e.stderr.decode("utf-8"))
+            sys.exit(1)


 async def requisites_worker(
@@ -22,6 +22,14 @@

 - COSMIC DE has been updated to the beta version, bringing it closer to its first stable release. This includes updates to its core components, applications, and overall stability.

+- GNOME has been updated to version 49.
+
+  - Removes X11 session support. Though you can still run X11 apps using XWayland.
+  - gnome-session’s custom service manager was removed in favour of using systemd.
+  - GDM now allows multiple seats, which is useful for e.g. remote logins. Though we currently [limit this to five greeter instances](https://github.com/NixOS/nixpkgs/issues/458058).
+
+  Refer to the [GNOME release notes](https://release.gnome.org/49/) for more details.
+
 ## New Modules {#sec-release-25.11-new-modules}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -9,7 +9,7 @@ let
  vteInitSnippet = ''
    # Show current working directory in VTE terminals window title.
    # Supports both bash and zsh, requires interactive shell.
-    . ${pkgs.vte.override { gtkVersion = null; }}/etc/profile.d/vte.sh
+    . ${pkgs.vte-gtk4}/etc/profile.d/vte.sh
  '';

 in
@@ -569,6 +569,7 @@
  ./services/desktops/gnome/gnome-online-miners.nix
  ./services/desktops/gnome/gnome-remote-desktop.nix
  ./services/desktops/gnome/gnome-settings-daemon.nix
+  ./services/desktops/gnome/gnome-software.nix
  ./services/desktops/gnome/gnome-user-share.nix
  ./services/desktops/gnome/localsearch.nix
  ./services/desktops/gnome/rygel.nix
@@ -20,9 +20,7 @@ in

  config = mkIf cfg.enable {
    environment.systemPackages = [ cfg.package ];
-    systemd.services.display-manager = lib.mkIf config.services.displayManager.enable {
-      path = [ cfg.package ];
-    };
+    systemd.packages = [ cfg.package ];
    services.speechd.enable = true;
  };
 }
@@ -297,8 +297,12 @@ in

      systemd.packages = [
        pkgs.gnome-flashback
+        pkgs.metacity
+        (pkgs.gnome-panel-with-modules.override {
+          panelModulePackages = cfg.flashback.panelModulePackages;
+        })
      ]
-      ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;
+      ++ map pkgs.gnome-flashback.mkSystemdTargetForWm cfg.flashback.customSessions;

      environment.systemPackages = [
        pkgs.gnome-flashback
@@ -311,9 +315,7 @@ in
        wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }
      ) flashbackWms)
      # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
-      ++ (map (
-        wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }
-      ) flashbackWms);
+      ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel; }) flashbackWms);
    })

    (lib.mkIf serviceCfg.core-os-services.enable {
@@ -444,38 +446,31 @@ in

    # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-apps.bst
    (lib.mkIf serviceCfg.core-apps.enable {
-      environment.systemPackages = utils.removePackagesByName (
-        [
-          pkgs.baobab
-          pkgs.decibels
-          pkgs.epiphany
-          pkgs.gnome-text-editor
-          pkgs.gnome-calculator
-          pkgs.gnome-calendar
-          pkgs.gnome-characters
-          pkgs.gnome-clocks
-          pkgs.gnome-console
-          pkgs.gnome-contacts
-          pkgs.gnome-font-viewer
-          pkgs.gnome-logs
-          pkgs.gnome-maps
-          pkgs.gnome-music
-          pkgs.gnome-system-monitor
-          pkgs.gnome-weather
-          pkgs.loupe
-          pkgs.nautilus
-          pkgs.gnome-connections
-          pkgs.simple-scan
-          pkgs.snapshot
-          pkgs.totem
-          pkgs.yelp
-        ]
-        ++ lib.optionals config.services.flatpak.enable [
-          # Since PackageKit Nix support is not there yet,
-          # only install gnome-software if flatpak is enabled.
-          pkgs.gnome-software
-        ]
-      ) config.environment.gnome.excludePackages;
+      environment.systemPackages = utils.removePackagesByName [
+        pkgs.baobab
+        pkgs.decibels
+        pkgs.epiphany
+        pkgs.gnome-text-editor
+        pkgs.gnome-calculator
+        pkgs.gnome-calendar
+        pkgs.gnome-characters
+        pkgs.gnome-clocks
+        pkgs.gnome-console
+        pkgs.gnome-contacts
+        pkgs.gnome-font-viewer
+        pkgs.gnome-logs
+        pkgs.gnome-maps
+        pkgs.gnome-music
+        pkgs.gnome-system-monitor
+        pkgs.gnome-weather
+        pkgs.loupe
+        pkgs.nautilus
+        pkgs.gnome-connections
+        pkgs.simple-scan
+        pkgs.snapshot
+        pkgs.totem
+        pkgs.yelp
+      ] config.environment.gnome.excludePackages;

      # Enable default program modules
      # Since some of these have a corresponding package, we only
@@ -488,6 +483,12 @@ in
      programs.seahorse.enable = notExcluded pkgs.seahorse;
      services.gnome.sushi.enable = notExcluded pkgs.sushi;

+      # Since PackageKit Nix support is not there yet,
+      # only install gnome-software if flatpak is enabled.
+      services.gnome.gnome-software.enable = lib.mkIf config.services.flatpak.enable (
+        notExcluded pkgs.gnome-software
+      );
+
      # VTE shell integration for gnome-console
      programs.bash.vteIntegration = mkDefault true;
      programs.zsh.vteIntegration = mkDefault true;
@@ -78,8 +78,10 @@ in

    systemd.user.targets."gnome-session".wants = [
      "gnome-initial-setup-copy-worker.service"
+    ];
+
+    systemd.user.targets."graphical-session-pre".wants = [
      "gnome-initial-setup-first-login.service"
-      "gnome-welcome-tour.service"
    ];

    systemd.user.targets."gnome-session@gnome-initial-setup".wants = [
@@ -89,6 +91,11 @@ in
    programs.dconf.profiles.gnome-initial-setup.databases = [
      "${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"
    ];
+
+    users = {
+      # TODO: switch to using provided gnome-initial-setup sysusers.d
+      groups.gnome-initial-setup = { };
+    };
  };

 }
@@ -0,0 +1,28 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  meta = {
+    maintainers = lib.teams.gnome.members;
+  };
+
+  options = {
+    services.gnome.gnome-software = {
+      enable = lib.mkEnableOption "GNOME Software, package manager for GNOME";
+    };
+  };
+
+  config = lib.mkIf config.services.gnome.gnome-software.enable {
+    environment.systemPackages = [
+      pkgs.gnome-software
+    ];
+
+    systemd.packages = [
+      pkgs.gnome-software
+    ];
+  };
+}
@@ -183,10 +183,44 @@ in
      name = "gdm";
      uid = config.ids.uids.gdm;
      group = "gdm";
-      home = "/run/gdm";
      description = "GDM user";
    };

+    users.users.gdm-greeter = {
+      isSystemUser = true;
+      uid = 60578;
+      group = "gdm";
+      home = "/run/gdm";
+    };
+
+    users.users.gdm-greeter-1 = {
+      isSystemUser = true;
+      uid = 60579;
+      group = "gdm";
+      home = "/run/gdm-1";
+    };
+
+    users.users.gdm-greeter-2 = {
+      isSystemUser = true;
+      uid = 60580;
+      group = "gdm";
+      home = "/run/gdm-2";
+    };
+
+    users.users.gdm-greeter-3 = {
+      isSystemUser = true;
+      uid = 60581;
+      group = "gdm";
+      home = "/run/gdm-3";
+    };
+
+    users.users.gdm-greeter-4 = {
+      isSystemUser = true;
+      uid = 60582;
+      group = "gdm";
+      home = "/run/gdm-4";
+    };
+
    users.groups.gdm.gid = config.ids.gids.gdm;

    # GDM needs different xserverArgs, presumable because using wayland by default.
@@ -348,15 +382,15 @@ in
    # GDM LFS PAM modules, adapted somehow to NixOS
    security.pam.services = {
      gdm-launch-environment.text = ''
-        auth     required       pam_succeed_if.so audit quiet_success user = gdm
+        auth     required       pam_succeed_if.so audit quiet_success user ingroup gdm
        auth     optional       pam_permit.so

-        account  required       pam_succeed_if.so audit quiet_success user = gdm
+        account  required       pam_succeed_if.so audit quiet_success user ingroup gdm
        account  sufficient     pam_unix.so

        password required       pam_deny.so

-        session  required       pam_succeed_if.so audit quiet_success user = gdm
+        session  required       pam_succeed_if.so audit quiet_success user ingroup gdm
        session  required       pam_env.so conffile=/etc/pam/environment readenv=0
        session  optional       ${config.systemd.package}/lib/security/pam_systemd.so
        session  optional       pam_keyinit.so force revoke
@@ -42,13 +42,7 @@
    in
    ''
      with subtest("Wait for login"):
-          # wait_for_x() checks graphical-session.target, which is expected to be
-          # inactive on Budgie before Budgie manages user session with systemd.
-          # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/39e9f0895c978f76/src/session/budgie-desktop.in#L16
-          #
-          # Previously this was unconditionally touched by xsessionWrapper but was
-          # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP).
-          # machine.wait_for_x()
+          machine.wait_for_x()
          machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"')
          machine.wait_for_file("${user.home}/.Xauthority")
          machine.succeed("xauth merge ${user.home}/.Xauthority")
@@ -58,8 +52,9 @@
          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")

      with subtest("Check if Budgie session components actually start"):
-          for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]:
-              machine.wait_until_succeeds(f"pgrep -f {i}")
+          for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "bsd-media-keys", "gsd-xsettings"]:
+              machine.wait_until_succeeds(f"pgrep {i}")
+          machine.wait_until_succeeds("pgrep -xf /run/current-system/sw/bin/org.buddiesofbudgie.budgie-desktop-view")
          # We don't check xwininfo for budgie-wm.
          # See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754
          machine.wait_for_window("budgie-daemon")
@@ -67,7 +62,7 @@

      with subtest("Check if various environment variables are set"):
          cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"
-          machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")
+          machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie'")
          machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")
          # From the nixos/budgie module
          machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
@@ -26,8 +26,17 @@

      services.desktopManager.gnome.enable = true;
      services.desktopManager.gnome.debug = true;
-      services.desktopManager.gnome.flashback.enableMetacity = true;
-      services.displayManager.defaultSession = "gnome-flashback-metacity";
+
+      services.desktopManager.gnome.flashback.customSessions = [
+        {
+          # Intentionally a different name to test mkSystemdTargetForWm.
+          wmName = "metacitytest";
+          wmLabel = "Metacity";
+          wmCommand = "${pkgs.metacity}/bin/metacity";
+          enableGnomePanel = true;
+        }
+      ];
+      services.displayManager.defaultSession = "gnome-flashback-metacitytest";
    };

  testScript =
@@ -40,7 +49,7 @@
    ''
      with subtest("Login to GNOME Flashback with GDM"):
          machine.wait_for_x()
-          machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
+          machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"')
          # Wait for alice to be logged in"
          machine.wait_for_unit("default.target", "${user.name}")
          machine.wait_for_file("${xauthority}")
@@ -66,7 +66,7 @@

      with subtest("Login with elementary-greeter"):
          machine.send_chars("${user.password}\n")
-          machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
+          machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"')

      with subtest("Wait for wayland server"):
          machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
@@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
  postPatch = ''
    sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
    sed -i "s~ -geom 10x10~~g" src/config.cc
+
+    # Switch to girepository-2.0
+    substituteInPlace src/plugin/gir_main.c \
+      --replace-fail "<girepository.h>" "<girepository/girepository.h>" \
+      --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group"
  '';

  nativeBuildInputs = [
@@ -1,7 +1,6 @@
 {
  lib,
  stdenv,
-  fetchpatch,
  cmake,
  ninja,
  intltool,
@@ -47,23 +46,13 @@

 stdenv.mkDerivation rec {
  pname = "evolution";
-  version = "3.56.2";
+  version = "3.58.0";

  src = fetchurl {
    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys=";
+    hash = "sha256-Nz/hdFow9x8RN1XvKvwwp6F2imA2GVpk2wUplacaGr8=";
  };

-  patches = [
-    # fix crash when opening attachment with recent webkitgtk versions
-    # https://gitlab.gnome.org/GNOME/evolution/-/issues/3124
-    # remove when updating to 3.58.0
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/evolution/-/commit/811a6df1f990855e49ecc0ba7b1a7f7a5ec251e6.patch";
-      hash = "sha256-Aj8H7PnAblInX2zRPQH7n0HOdLNuhITNHunWRYCPBsI=";
-    })
-  ];
-
  nativeBuildInputs = [
    cmake
    intltool
@@ -9,11 +9,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "adwaita-fonts";
-  version = "48.2";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/adwaita-fonts/${lib.versions.major finalAttrs.version}/adwaita-fonts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FW9+kvL4LlJ/xzwwnbsjfApKXDqVvF7pSl77aUfFU+A=";
+    hash = "sha256-MVfGIOtbcrJasVbRlKpOsiP5hw1Uf+g/298G0+e+yzc=";
  };

  nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  meta = {
    description = "Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter";
    homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.ofl;
    platforms = lib.platforms.linux;
    maintainers = [ lib.maintainers.qxrein ];
    teams = [ lib.teams.gnome ];
@@ -14,11 +14,11 @@

 stdenv.mkDerivation rec {
  pname = "adwaita-icon-theme";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz";
-    hash = "sha256-hHBoiIZQ2WcxFb5tvyv9wxpGrrxSimqdtEIOYOZWuNQ=";
+    hash = "sha256-ZRZkYdGyeKqUL1mqjQ/M8RCNccZfNyxiZuFyRJeRdVw=";
  };

  nativeBuildInputs = [
@@ -12,6 +12,7 @@
    && stdenv.hostPlatform.emulatorAvailable buildPackages,
  gsettings-desktop-schemas,
  makeWrapper,
+  python3,
  dbus,
  glib,
  dconf,
@@ -27,7 +28,7 @@

 stdenv.mkDerivation rec {
  pname = "at-spi2-core";
-  version = "2.56.2";
+  version = "2.58.0";

  outputs = [
    "out"
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz";
-    hash = "sha256-4bHJg2qJR4UvdEDDLiMXkjTHa9mM2cxAAfN2QF+LeDs=";
+    hash = "sha256-390zANong6IZaf+t4oiYF/t8GQak75JJfrpllps9q1o=";
  };

  nativeBuildInputs = [
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
    ninja
    pkg-config
    makeWrapper
+    python3
  ]
  ++ lib.optionals withIntrospection [
    gobject-introspection
@@ -19,11 +19,11 @@

 stdenv.mkDerivation rec {
  pname = "baobab";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz";
-    hash = "sha256-VFklBNSdgH8jWRvn5+7xDGyd/LesUnuBw6zVh4eyb9o=";
+    hash = "sha256-GVwBgtxNf2lN0LTuNucuD0q3V4JfwjgjNAnuwt9IP64=";
  };

  nativeBuildInputs = [
@@ -8,7 +8,7 @@
  vala,
  budgie-desktop,
  gtk3,
-  libpeas,
+  libpeas2,
  nix-update-script,
 }:

@@ -33,9 +33,15 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    budgie-desktop
    gtk3
-    libpeas
+    libpeas2
  ];

+  postPatch = ''
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+    substituteInPlace meson.build \
+      --replace-fail "dependency('libpeas-1.0')" "dependency('libpeas-2')"
+  '';
+
  passthru = {
    updateScript = nix-update-script { };
  };
@@ -70,14 +70,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "budgie-control-center";
-  version = "1.4.0";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "BuddiesOfBudgie";
    repo = "budgie-control-center";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY=";
+    hash = "sha256-Je3X1V4U2t0LMxWwtoYZKEI56IS4zK/w6OL615tqKkk=";
  };

  patches = [
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  accountsservice,
  alsa-lib,
  budgie-screensaver,
@@ -10,6 +9,7 @@
  glib,
  gnome-desktop,
  gnome-settings-daemon,
+  gobject-introspection,
  graphene,
  gst_all_1,
  gtk-doc,
@@ -19,10 +19,12 @@
  libcanberra-gtk3,
  libgee,
  libGL,
+  libgudev,
  libnotify,
-  libpeas,
+  libpeas2,
  libpulseaudio,
  libuuid,
+  libwacom,
  libwnck,
  magpie,
  libgbm,
@@ -35,6 +37,7 @@
  polkit,
  sassc,
  testers,
+  udev,
  upower,
  vala,
  validatePkgConfig,
@@ -45,14 +48,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "budgie-desktop";
-  version = "10.9.2";
+  version = "10.9.3-unstable-2025-09-13";

  src = fetchFromGitHub {
    owner = "BuddiesOfBudgie";
    repo = "budgie-desktop";
-    tag = "v${finalAttrs.version}";
+    rev = "68d5136613fa1b15d39cc67ada3085590ec162ae";
    fetchSubmodules = true;
-    hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo=";
+    hash = "sha256-xqN06CGS4xyUwnJCsLplYzKtO/V8hDmb6UNJu/nhQHs=";
  };

  outputs = [
@@ -63,31 +66,11 @@ stdenv.mkDerivation (finalAttrs: {

  patches = [
    ./plugins.patch
-
-    # Adapt to libxfce4windowing v4.19.8
-    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/627
-    (fetchpatch {
-      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/ba8170b4f3108f9de28331b6a98a9d92bb0ed4de.patch";
-      hash = "sha256-T//1/NmaV81j0jiIYK7vEp8sgKCgF2i10D+Rk9qAAeE=";
-    })
-
-    # Resolve vala 0.56.18 compact class inheritance removal
-    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/679
-    (fetchpatch {
-      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch";
-      hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws=";
-    })
-
-    # Add override for overlay-key to prevent crash with mutter-common v48-rc
-    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/683
-    (fetchpatch {
-      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/c24091bb424abe99ebcdd33eedd37068f735ad2a.patch";
-      hash = "sha256-4WEkscftOGZmzH7imMTmcTDPH6eHMeEhgto+R5NNlh0=";
-    })
  ];

  nativeBuildInputs = [
    docbook-xsl-nons
+    gobject-introspection
    gtk-doc
    intltool
    meson
@@ -115,21 +98,30 @@ stdenv.mkDerivation (finalAttrs: {
    libcanberra-gtk3
    libgee
    libGL
+    libgudev
    libnotify
    libpulseaudio
    libuuid
+    libwacom
    libwnck
    magpie
    libgbm
    polkit
    sassc
+    udev
    upower
    xfce.libxfce4windowing
  ];

  propagatedBuildInputs = [
    # budgie-1.0.pc, budgie-raven-plugin-1.0.pc
-    libpeas
+    libpeas2
+  ];
+
+  mesonFlags = [
+    # FIXME: The meson option name is confusing
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/739#discussion_r2359421711
+    "-Dbsd-libexecdir=${gnome-settings-daemon}/libexec"
  ];

  passthru = {
@@ -1,175 +1,45 @@
-diff --git a/meson.build b/meson.build
-index 6c6e473e..9b8fb73a 100644
--- a/meson.build
-+++ b/meson.build
-@@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir'))
- localedir = join_paths(prefix, get_option('localedir'))
- podir = join_paths(meson.source_root(), 'po')
+diff --git a/src/panel/plugin/plugin-manager.c b/src/panel/plugin/plugin-manager.c
+index 1f0d32d60..2f46cee6e 100644
+--- a/src/panel/plugin/plugin-manager.c
+++ b/src/panel/plugin/plugin-manager.c
+@@ -115,12 +115,26 @@ static void budgie_panel_plugin_manager_init(BudgiePanelPluginManager *self) {
+ 	}
 
-cdata.set_quoted('DATADIR', datadir)
-cdata.set_quoted('SYSCONFDIR', confdir)
-cdata.set_quoted('LOCALEDIR', localedir)
-cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org')
-
- # Handle i18n on the .desktop file
- # Originally stolem from TingPing:
- # https://github.com/vinszent/gnome-twitch/blob/master/data/meson.build
-@@ -111,23 +106,10 @@ cdata.set_quoted('MODULEDIR', plugin_libdir)
- cdata.set_quoted('MODULE_DATA_DIR', plugin_datadir)
- cdata.set_quoted('RAVEN_PLUGIN_LIBDIR', raven_plugin_libdir)
- cdata.set_quoted('RAVEN_PLUGIN_DATADIR', raven_plugin_datadir)
-
-if prefix == '/usr' or prefix == '/usr/local'
-    cdata.set('HAS_SECONDARY_PLUGIN_DIRS', true)
-
-    if prefix == '/usr'
-        secondary_libdir_root = join_paths(prefix, 'local', get_option('libdir'), meson.project_name())
-        secondary_datadir_root = join_paths(prefix, 'local', get_option('datadir'), meson.project_name())
-    else
-        secondary_libdir_root = join_paths('/usr', get_option('libdir'), meson.project_name())
-        secondary_datadir_root = join_paths('/usr', get_option('datadir'), meson.project_name())
-    endif
-
-    cdata.set_quoted('MODULEDIR_SECONDARY', join_paths(secondary_libdir_root, 'plugins'))
-    cdata.set_quoted('MODULE_DATA_DIR_SECONDARY', join_paths(secondary_datadir_root, 'plugins'))
-    cdata.set_quoted('RAVEN_PLUGIN_LIBDIR_SECONDARY', join_paths(secondary_libdir_root, 'raven-plugins'))
-    cdata.set_quoted('RAVEN_PLUGIN_DATADIR_SECONDARY', join_paths(secondary_datadir_root, 'raven-plugins'))
-endif
-+cdata.set_quoted('DATADIR', datadir)
-+cdata.set_quoted('SYSCONFDIR', confdir)
-+cdata.set_quoted('LOCALEDIR', localedir)
-+cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org')
+ 	/* System path */
+-	peas_engine_add_search_path(self->engine, BUDGIE_MODULE_DIRECTORY, BUDGIE_MODULE_DATA_DIRECTORY);
+	const gchar* libdir = NULL;
+	const gchar* datadir = NULL;
+	libdir = g_getenv("BUDGIE_PLUGIN_LIBDIR");
+	if (libdir != NULL) {
+		g_debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir);
+	} else {
+		g_debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", BUDGIE_MODULE_DIRECTORY);
+		libdir = BUDGIE_MODULE_DIRECTORY;
+	}
 
- with_bluetooth = get_option('with-bluetooth')
- if with_bluetooth == true
-diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c
-index 3ffe3632..da53e054 100644
--- a/src/config/budgie-config.c
-+++ b/src/config/budgie-config.c
-@@ -11,7 +11,6 @@
+-	if (BUDGIE_HAS_SECONDARY_PLUGIN_DIRS) {
+-		peas_engine_add_search_path(self->engine, BUDGIE_MODULE_DIRECTORY_SECONDARY, BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY);
+	datadir = g_getenv("BUDGIE_PLUGIN_DATADIR");
+	if (datadir != NULL) {
+		g_debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir);
+	} else {
+		g_debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", BUDGIE_MODULE_DATA_DIRECTORY);
+		datadir = BUDGIE_MODULE_DATA_DIRECTORY;
+ 	}
 
- #ifndef CONFIG_H_INCLUDED
- #include "config.h"
-#include <stdbool.h>
- #include <stddef.h>
- 
- /**
-@@ -22,20 +21,6 @@ const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR;
- const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR;
- const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR;
- 
-#ifdef HAS_SECONDARY_PLUGIN_DIRS
-const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true;
-const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY;
-const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = MODULE_DATA_DIR_SECONDARY;
-const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = RAVEN_PLUGIN_LIBDIR_SECONDARY;
-const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = RAVEN_PLUGIN_DATADIR_SECONDARY;
-#else
-const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false;
-const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL;
-const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = NULL;
-const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = NULL;
-const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = NULL;
-#endif
-
- const char* BUDGIE_DATADIR = DATADIR;
- const char* BUDGIE_VERSION = PACKAGE_VERSION;
- const char* BUDGIE_WEBSITE = PACKAGE_URL;
-diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h
-index b7581203..11df4347 100644
--- a/src/config/budgie-config.h
-+++ b/src/config/budgie-config.h
-@@ -12,7 +12,6 @@
- #ifndef _BUDGIE_CONFIG_H_
- #define _BUDGIE_CONFIG_H_
- 
-#include <stdbool.h>
- #include <stddef.h>
- 
- /* i.e. /usr/lib/budgie-desktop */
-@@ -27,12 +26,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR;
- /* i.e. /usr/share/budgie-desktop/raven-plugins */
- extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR;
- 
-extern const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS;
-extern const char* BUDGIE_MODULE_DIRECTORY_SECONDARY;
-extern const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY;
-extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY;
-extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY;
-
- /* i.e. /usr/share/ */
- extern const char* BUDGIE_DATADIR;
- 
-diff --git a/src/config/budgie-config.vapi b/src/config/budgie-config.vapi
-index 5eb445d1..7d27e348 100644
--- a/src/config/budgie-config.vapi
-+++ b/src/config/budgie-config.vapi
-@@ -22,21 +22,6 @@ namespace Budgie {
- 	[CCode (cheader_filename="budgie-config.h")]
- 	public extern const string RAVEN_PLUGIN_DATADIR;
- 
-	[CCode (cheader_filename="budgie-config.h")]
-	public extern const bool HAS_SECONDARY_PLUGIN_DIRS;
-
-	[CCode (cheader_filename="budgie-config.h")]
-	public extern const string? MODULE_DIRECTORY_SECONDARY;
-
-	[CCode (cheader_filename="budgie-config.h")]
-    public extern const string? MODULE_DATA_DIRECTORY_SECONDARY;
-
-	[CCode (cheader_filename="budgie-config.h")]
-	public extern const string? RAVEN_PLUGIN_LIBDIR_SECONDARY;
-
-	[CCode (cheader_filename="budgie-config.h")]
-	public extern const string? RAVEN_PLUGIN_DATADIR_SECONDARY;
-
-     [CCode (cheader_filename="budgie-config.h")]
-     public extern const string DATADIR;
- 
-diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala
-index f4f2e4da..3dfee49a 100644
--- a/src/panel/plugin_manager.vala
-+++ b/src/panel/plugin_manager.vala
-@@ -40,13 +40,26 @@ namespace Budgie {
- 			}
- 
- 			/* System path */
-			var dir = Environment.get_user_data_dir();
-			engine.add_search_path(Budgie.MODULE_DIRECTORY, Budgie.MODULE_DATA_DIRECTORY);
-			if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) {
-				engine.add_search_path(Budgie.MODULE_DIRECTORY_SECONDARY, Budgie.MODULE_DATA_DIRECTORY_SECONDARY);
-+			var libdir = Environment.get_variable("BUDGIE_PLUGIN_LIBDIR");
-+			if (libdir != null) {
-+				debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir);
-+			} else {
-+				debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY);
-+				libdir = Budgie.MODULE_DIRECTORY;
-+ 			}
+	peas_engine_add_search_path(self->engine, libdir, datadir);
 +
-+			var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR");
-+			if (datadir != null) {
-+				debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir);
-+			} else {
-+				debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY);
-+				datadir = Budgie.MODULE_DATA_DIRECTORY;
- 			}
- 
-+			engine.add_search_path(libdir, datadir);
-+
- 			/* User path */
-+			var dir = Environment.get_user_data_dir();
- 			var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "plugins");
- 			var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data");
- 			engine.add_search_path(user_mod, hdata);
+ 	/* User path */
+ 	user_data_dir = g_get_user_data_dir();
+ 	user_mod_dir = g_build_path(G_DIR_SEPARATOR_S, user_data_dir, "budgie-desktop", "plugins", NULL);
 diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala
-index 01f32553..2826b7e5 100644
+index 1ff139c9a..809b9b82a 100644
 --- a/src/raven/plugin_manager.vala
 +++ b/src/raven/plugin_manager.vala
-@@ -51,13 +51,26 @@ namespace Budgie {
- 			}
+@@ -51,11 +51,24 @@ namespace Budgie {
 
 			/* System path */
-			var dir = Environment.get_user_data_dir();
+ 			var dir = Environment.get_user_data_dir();
 -			engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR, Budgie.RAVEN_PLUGIN_DATADIR);
 -			if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) {
 -				engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR_SECONDARY, Budgie.RAVEN_PLUGIN_DATADIR_SECONDARY);
@@ -192,7 +62,5 @@ index 01f32553..2826b7e5 100644
 +			engine.add_search_path(libdir, datadir);
 +
 			/* User path */
-+			var dir = Environment.get_user_data_dir();
 			var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-plugins");
 			var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-data");
- 			engine.add_search_path(user_mod, hdata);
@@ -45,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: {

  postPatch = ''
    substituteInPlace meson.build --replace-fail "/usr" "$out"
+
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+    substituteInPlace budgie-media-player-applet.plugin.in \
+      --replace-fail "Loader=@PYTHON@" "Loader=python"
  '';

  postFixup = ''
@@ -7,7 +7,7 @@
  gtk3,
  libgee,
  libgtop,
-  libpeas,
+  libpeas2,
  meson,
  ninja,
  nix-update-script,
@@ -45,9 +45,15 @@ stdenv.mkDerivation (finalAttrs: {
    gtk3
    libgee
    libgtop
-    libpeas
+    libpeas2
  ];

+  postPatch = ''
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+    substituteInPlace meson.build \
+      --replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')"
+  '';
+
  passthru = {
    updateScript = nix-update-script { };
  };
@@ -7,7 +7,7 @@
  gtk3,
  intltool,
  libgee,
-  libpeas,
+  libpeas2,
  meson,
  ninja,
  nix-update-script,
@@ -40,10 +40,16 @@ stdenv.mkDerivation (finalAttrs: {
    budgie-desktop
    gtk3
    libgee
-    libpeas
+    libpeas2
    sassc
  ];

+  postPatch = ''
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+    substituteInPlace meson.build \
+      --replace-fail "dependency('libpeas-1.0', version: '>= 1.26.0')" "dependency('libpeas-2')"
+  '';
+
  passthru = {
    updateScript = nix-update-script { };
  };
@@ -7,6 +7,7 @@
  gettext,
  gtk4,
  libadwaita,
+  libdex,
  meson,
  ninja,
  pkg-config,
@@ -16,7 +17,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "d-spy";
-  version = "48.0";
+  version = "49.1";

  outputs = [
    "out"
@@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz";
-    hash = "sha256-D3oJAZBGGU2X/Dw0KzhOocOA4Qqc/IAlv83lfVlcODA=";
+    hash = "sha256-4m4YEg5k1FG2HyAs+qORNienAxwqlUrs85HIPYPQnYo=";
  };

  nativeBuildInputs = [
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    gtk4
    libadwaita
+    libdex
  ];

  passthru = {
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchurl,
-  fetchpatch,
  desktop-file-utils,
  meson,
  ninja,
@@ -23,20 +22,14 @@

 stdenv.mkDerivation rec {
  pname = "dconf-editor";
-  version = "45.0.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz";
-    hash = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0=";
+    hash = "sha256-kKjM+t9R3/MeACgyT7mjWLLSbFroYaccfb+fTdm905k=";
  };

  patches = [
-    # Fix crash with GSETTINGS_SCHEMA_DIR env var.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/baf183737d459dcde065c9f8f6fe5be7ed874de6.patch";
-      hash = "sha256-Vp0qjJChDr6IarUD+tZPLJhdI8v8r6EzWNfqFSnGvqQ=";
-    })
-
    # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR
    # environment variable, to match what we patched GLib to do.
    ./schema-override-variable.patch
@@ -17,11 +17,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "decibels";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/decibels/${lib.versions.major finalAttrs.version}/decibels-${finalAttrs.version}.tar.xz";
-    hash = "sha256-IpsRqSYxR7y4w+If8NSvZZ+yYmL4rs5Uetz4xl4DH3Q=";
+    hash = "sha256-KbebouKWfmkUHjnwrSxnfjj+P/ufug+lx1MflNP2c8o=";
  };

  nativeBuildInputs = [
@@ -57,6 +57,14 @@ stdenv.mkDerivation rec {
    libical
  ];

+  postPatch = ''
+    # Switch to girepository-2.0
+    # libpeas1 will be dropped in https://gitlab.gnome.org/World/Endeavour/-/merge_requests/153
+    substituteInPlace src/gui/gtd-application.c \
+      --replace-fail "#include <girepository.h>" "#include <girepository/girepository.h>" \
+      --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group"
+  '';
+
  passthru = {
    updateScript = gitUpdater { };
  };
@@ -0,0 +1,39 @@
+diff --git a/src/entangle-main.c b/src/entangle-main.c
+index 970bfee..8bc16eb 100644
+--- a/src/entangle-main.c
+++ b/src/entangle-main.c
+@@ -21,7 +21,7 @@
+ #include <locale.h>
+ #include <stdio.h>
+ 
+-#include <girepository.h>
+#include <girepository/girepository.h>
+ #include <glib/gi18n.h>
+ #include <gst/gst.h>
+ #include <gtk/gtk.h>
+@@ -80,7 +80,11 @@ main(int argc, char **argv)
+     gst_init(NULL, NULL);
+ 
+     if (ins) {
+-        g_irepository_dump(ins, NULL);
+        char **ins_args;
+        ins_args = g_strsplit(ins, ",", 2);
+        if (g_strv_length(ins_args) == 2)
+            gi_repository_dump(ins_args[0], ins_args[1], NULL);
+        g_strfreev(ins_args);
+         return 0;
+     }
+ 
+diff --git a/src/frontend/entangle-application.c b/src/frontend/entangle-application.c
+index 3e3e1af..f7c03d5 100644
+--- a/src/frontend/entangle-application.c
+++ b/src/frontend/entangle-application.c
+@@ -470,7 +470,7 @@ entangle_application_init(EntangleApplication *app)
+     app->activeCameras = entangle_camera_list_new_active();
+     app->supportedCameras = entangle_camera_list_new_supported();
+ 
+-    g_irepository_require(g_irepository_get_default(), "Peas", "1.0", 0, NULL);
+    gi_repository_require(gi_repository_dup_default(), "Peas", "1.0", 0, NULL);
+ 
+     userdir =
+         g_build_filename(g_get_user_config_dir(), "entangle/plugins", NULL);
@@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
  };

  patches = [
+    # Switch to girepository-2.0
+    # https://src.fedoraproject.org/rpms/libpeas1/pull-request/3
+    ./girepository-2.0.patch
+
    # Fix build with meson 0.61, can be removed on next update
    # https://gitlab.com/entangle/entangle/-/issues/67
    (fetchpatch {
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchurl,
+  fetchpatch,
  meson,
  ninja,
  gettext,
@@ -51,6 +52,12 @@ stdenv.mkDerivation rec {
    # We patch gobject-introspection to hardcode absolute paths but
    # our Meson patch will only pass the info when install_dir is absolute as well.
    ./fix-gir-lib-path.patch
+
+    # Switch to girepository-2.0
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/eog/raw/939eee56e5b72b02a8c0f4f867431cf6426adb9e/f/libpeas1_pygobject352.patch";
+      hash = "sha256-5QIkxxUvGKzb0cMCIcfuu7FX9XuY+RrKNunSvRDEDRc=";
+    })
  ];

  nativeBuildInputs = [
@@ -1,6 +1,7 @@
 {
  lib,
  stdenv,
+  blueprint-compiler,
  meson,
  ninja,
  gettext,
@@ -25,6 +26,7 @@
  gcr_4,
  isocodes,
  desktop-file-utils,
+  docutils,
  nettle,
  gdk-pixbuf,
  gst_all_1,
@@ -37,15 +39,17 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "epiphany";
-  version = "48.5";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
-    hash = "sha256-D2ZVKtZZPHlSo93uW/UVZWyMQ0hxB22fGpGnr5NGsbQ=";
+    hash = "sha256-Jx7HNbmDa5dEnjJ5PTVKivtrn40tPXWCGIXV4VVweSk=";
  };

  nativeBuildInputs = [
+    blueprint-compiler
    desktop-file-utils
+    docutils # for rst2man
    gettext
    itstool
    meson
@@ -1,8 +1,8 @@
 diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
-index 5e65ec8..2cae29d 100644
+index c31f3ef..9ebb5f2 100644
 --- a/src/addressbook/libebook/e-book-client.c
 +++ b/src/addressbook/libebook/e-book-client.c
-@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry,
+@@ -1926,7 +1926,18 @@ e_book_client_get_self (ESourceRegistry *registry,
 
 	*out_client = book_client;
 
@@ -22,7 +22,7 @@ index 5e65ec8..2cae29d 100644
 	uid = g_settings_get_string (settings, SELF_UID_KEY);
 	g_object_unref (settings);
 
-@@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client,
+@@ -1994,7 +2005,18 @@ e_book_client_set_self (EBookClient *client,
 	g_return_val_if_fail (
 		e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE);
 
@@ -42,7 +42,7 @@ index 5e65ec8..2cae29d 100644
 	g_settings_set_string (
 		settings, SELF_UID_KEY,
 		e_contact_get_const (contact, E_CONTACT_UID));
-@@ -2028,8 +2050,20 @@ e_book_client_is_self (EContact *contact)
+@@ -2030,8 +2052,20 @@ e_book_client_is_self (EContact *contact)
 	 * unfortunately the API doesn't allow that.
 	 */
 	g_mutex_lock (&mutex);
@@ -66,10 +66,10 @@ index 5e65ec8..2cae29d 100644
 	g_mutex_unlock (&mutex);
 
 diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c
-index a9b68e3..6a13b1b 100644
+index 9d986d2..d63902a 100644
 --- a/src/addressbook/libebook/e-book.c
 +++ b/src/addressbook/libebook/e-book.c
-@@ -2586,7 +2586,18 @@ e_book_get_self (ESourceRegistry *registry,
+@@ -2593,7 +2593,18 @@ e_book_get_self (ESourceRegistry *registry,
 		return FALSE;
 	}
 
@@ -89,7 +89,7 @@ index a9b68e3..6a13b1b 100644
 	uid = g_settings_get_string (settings, SELF_UID_KEY);
 	g_object_unref (settings);
 
-@@ -2641,7 +2652,18 @@ e_book_set_self (EBook *book,
+@@ -2648,7 +2659,18 @@ e_book_set_self (EBook *book,
 	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
 	g_return_val_if_fail (E_IS_CONTACT (contact), FALSE);
 
@@ -109,7 +109,7 @@ index a9b68e3..6a13b1b 100644
 	g_settings_set_string (
 		settings, SELF_UID_KEY,
 		e_contact_get_const (contact, E_CONTACT_UID));
-@@ -2669,7 +2691,18 @@ e_book_is_self (EContact *contact)
+@@ -2676,7 +2698,18 @@ e_book_is_self (EContact *contact)
 
 	g_return_val_if_fail (E_IS_CONTACT (contact), FALSE);
 
@@ -130,10 +130,10 @@ index a9b68e3..6a13b1b 100644
 	g_object_unref (settings);
 
 diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c
-index 752f83f..eaa3dad 100644
+index 2a95a75..950f430 100644
 --- a/src/addressbook/libedata-book/e-book-meta-backend.c
 +++ b/src/addressbook/libedata-book/e-book-meta-backend.c
-@@ -145,7 +145,18 @@ ebmb_is_power_saver_enabled (void)
+@@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void)
 	GSettings *settings;
 	gboolean enabled = FALSE;
 
@@ -178,10 +178,10 @@ index 9f8646a..079aba9 100644
 	cbc->priv->update_alarms_id = 0;
 	cbc->priv->alarm_enabled = FALSE;
 diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
-index 2525856..7ecc1a8 100644
+index 6318854..6b7a88c 100644
 --- a/src/calendar/backends/file/e-cal-backend-file.c
 +++ b/src/calendar/backends/file/e-cal-backend-file.c
-@@ -3682,7 +3682,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
+@@ -3701,7 +3701,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
 			if (is_declined) {
 				GSettings *settings;
 
@@ -204,10 +204,10 @@ index 2525856..7ecc1a8 100644
 				g_clear_object (&settings);
 			}
 diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
-index 026ae80..e3003c2 100644
+index 92d68e2..d1e1fa4 100644
 --- a/src/calendar/libecal/e-reminder-watcher.c
 +++ b/src/calendar/libecal/e-reminder-watcher.c
-@@ -2844,8 +2844,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
+@@ -2882,8 +2882,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
 
 	watcher->priv = e_reminder_watcher_get_instance_private (watcher);
 	watcher->priv->cancellable = g_cancellable_new ();
@@ -244,10 +244,10 @@ index 026ae80..e3003c2 100644
 		g_signal_connect_object (
 			watcher->priv->desktop_settings,
 diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
-index 84ccbb0..9010429 100644
+index df89788..4a1ebd0 100644
 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c
 +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
-@@ -157,7 +157,18 @@ ecmb_is_power_saver_enabled (void)
+@@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void)
 	GSettings *settings;
 	gboolean enabled = FALSE;
 
@@ -267,7 +267,7 @@ index 84ccbb0..9010429 100644
 
 	if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
 		GPowerProfileMonitor *power_monitor;
-@@ -2628,7 +2639,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
+@@ -2654,7 +2665,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
 			if (is_declined) {
 				GSettings *settings;
 
@@ -290,10 +290,10 @@ index 84ccbb0..9010429 100644
 				g_clear_object (&settings);
 			}
 diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c
-index d00fbd5..0f67653 100644
+index 03b5129..3f4256a 100644
 --- a/src/camel/camel-cipher-context.c
 +++ b/src/camel/camel-cipher-context.c
-@@ -1630,7 +1630,18 @@ camel_cipher_can_load_photos (void)
+@@ -1637,7 +1637,18 @@ camel_cipher_can_load_photos (void)
 	GSettings *settings;
 	gboolean load_photos;
 
@@ -314,10 +314,10 @@ index d00fbd5..0f67653 100644
 	g_clear_object (&settings);
 
 diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c
-index 4594ab1..e71ce05 100644
+index c5ac40f..fb8ae19 100644
 --- a/src/camel/camel-gpg-context.c
 +++ b/src/camel/camel-gpg-context.c
-@@ -745,7 +745,18 @@ gpg_ctx_get_executable_name (void)
+@@ -748,7 +748,18 @@ gpg_ctx_get_executable_name (void)
 		GSettings *settings;
 		gchar *path;
 
@@ -338,10 +338,10 @@ index 4594ab1..e71ce05 100644
 		g_clear_object (&settings);
 
 diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c
-index 0c1c7dd..4188934 100644
+index 2c0b6ef..b354332 100644
 --- a/src/camel/camel-utils.c
 +++ b/src/camel/camel-utils.c
-@@ -361,7 +361,19 @@ void
+@@ -363,7 +363,19 @@ void
 _camel_utils_initialize (void)
 {
 	G_LOCK (mi_user_headers);
@@ -363,10 +363,10 @@ index 0c1c7dd..4188934 100644
 		G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
 	G_UNLOCK (mi_user_headers);
 diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
-index 8cf56f0..f4355d5 100644
+index c3c2d7d..e1370db 100644
 --- a/src/camel/providers/imapx/camel-imapx-server.c
 +++ b/src/camel/providers/imapx/camel-imapx-server.c
-@@ -5681,7 +5681,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
+@@ -5671,7 +5671,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
 	if (do_old_flags_update) {
 		GSettings *eds_settings;
 
@@ -411,10 +411,10 @@ index f7c5d3c..67732c3 100644
 	g_clear_object (&settings);
 
 diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c
-index 188f276..939f89b 100644
+index e9cb145..8fc30d5 100644
 --- a/src/libedataserver/e-network-monitor.c
 +++ b/src/libedataserver/e-network-monitor.c
-@@ -256,7 +256,18 @@ e_network_monitor_constructed (GObject *object)
+@@ -260,7 +260,18 @@ e_network_monitor_constructed (GObject *object)
 	/* Chain up to parent's method. */
 	G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object);
 
@@ -531,10 +531,10 @@ index db775f9..fb524db 100644
 	g_object_unref (settings);
 
 diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
-index 1539f8b..77cf123 100644
+index bd9822d..3e021dd 100644
 --- a/src/libedataserver/e-source-registry.c
 +++ b/src/libedataserver/e-source-registry.c
-@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry)
+@@ -1781,7 +1781,19 @@ e_source_registry_init (ESourceRegistry *registry)
 
 	g_mutex_init (&registry->priv->sources_lock);
 
@@ -556,10 +556,10 @@ index 1539f8b..77cf123 100644
 	g_signal_connect (
 		registry->priv->settings, "changed",
 diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c
-index b47a374..e812fbe 100644
+index 02dcd6e..5dfa7ac 100644
 --- a/src/libedataserverui/e-reminders-widget.c
 +++ b/src/libedataserverui/e-reminders-widget.c
-@@ -1985,7 +1985,19 @@ static void
+@@ -2132,7 +2132,19 @@ static void
 e_reminders_widget_init (ERemindersWidget *reminders)
 {
 	reminders->priv = e_reminders_widget_get_instance_private (reminders);
@@ -48,9 +48,9 @@
  makeHardcodeGsettingsPatch,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "evolution-data-server";
-  version = "3.56.2";
+  version = "3.58.0";

  outputs = [
    "out"
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
  ];

  src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
-    hash = "sha256-307CmVDymnbqxvvg+BTEjSzvfT/bkFACpKiD3XYc6Tw=";
+    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz";
+    hash = "sha256-orWguNsRtyjtwdbxwincJxGWK3qHwDhCIdrI2WAAzvc=";
  };

  patches = [
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {

  prePatch = ''
    substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \
-      --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${version}"} \
+      --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${finalAttrs.version}"} \
      --subst-var-by GDS ${glib.getSchemaPath gsettings-desktop-schemas}
    patches="$patches $PWD/hardcode-gsettings.patch"
  '';
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
        "org.gnome.evolution-data-server" = "EDS";
        "org.gnome.desktop.interface" = "GDS";
      };
-      inherit src patches;
+      inherit (finalAttrs) src patches;
    };
    updateScript =
      let
@@ -198,9 +198,9 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Unified backend for programs that work with contacts, tasks, and calendar information";
    homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server";
-    changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags";
+    changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
    license = lib.licenses.lgpl2Plus;
    teams = [ lib.teams.gnome ];
    platforms = lib.platforms.linux; # requires libuuid
  };
-}
+})
@@ -1,7 +1,8 @@
 diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
+index 513b9733d..0c1c8007f 100644
 --- a/daemon/gdm-local-display-factory.c
 +++ b/daemon/gdm-local-display-factory.c
-@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
+@@ -269,10 +269,10 @@ struct GdmDisplayServerConfiguration {
         const char *session_type;
 } display_server_configuration[] = {
 #ifdef ENABLE_WAYLAND_SUPPORT
@@ -15,10 +16,10 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-facto
         { NULL, NULL, NULL },
 };
 diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
-index fc5aef6ac..c61e0046b 100644
+index 9568e963f..b1bc8800a 100644
 --- a/daemon/gdm-manager.c
 +++ b/daemon/gdm-manager.c
-@@ -151,7 +151,7 @@ plymouth_is_running (void)
+@@ -154,7 +154,7 @@ plymouth_is_running (void)
         GError  *error;
 
         error = NULL;
@@ -27,7 +28,7 @@ index fc5aef6ac..c61e0046b 100644
                                          NULL, NULL, &status, &error);
         if (! res) {
                 g_debug ("Could not ping plymouth: %s", error->message);
-@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void)
+@@ -172,7 +172,7 @@ plymouth_prepare_for_transition (void)
         GError  *error;
 
         error = NULL;
@@ -36,7 +37,7 @@ index fc5aef6ac..c61e0046b 100644
                                          NULL, NULL, NULL, &error);
         if (! res) {
                 g_warning ("Could not deactivate plymouth: %s", error->message);
-@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void)
+@@ -187,7 +187,7 @@ plymouth_quit_with_transition (void)
         GError  *error;
 
         error = NULL;
@@ -45,7 +46,7 @@ index fc5aef6ac..c61e0046b 100644
         if (! res) {
                 g_warning ("Could not quit plymouth: %s", error->message);
                 g_error_free (error);
-@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void)
+@@ -203,7 +203,7 @@ plymouth_quit_without_transition (void)
         GError  *error;
 
         error = NULL;
@@ -54,30 +55,32 @@ index fc5aef6ac..c61e0046b 100644
         if (! res) {
                 g_warning ("Could not quit plymouth: %s", error->message);
                 g_error_free (error);
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index a4c4b2dcf..67416b204 100644
--- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self,
-                  */
-                 if (run_launcher) {
-                         if (is_x11) {
-                                program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"",
-+                                program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
-                                                            register_session ? "--register-session " : "",
-                                                            self->selected_program);
-                         } else {
-                                program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"",
-+                                program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
-                                                            register_session ? "--register-session " : "",
-                                                            self->selected_program);
-                         }
-                 } else {
-                        program = g_strdup_printf ("dbus-run-session -- %s",
-+                        program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s",
-                                                    self->selected_program);
-                 }
-         }
+diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c
+index d0404d2c1..e916c2723 100644
+--- a/daemon/gdm-wayland-session.c
+++ b/daemon/gdm-wayland-session.c
+@@ -136,7 +136,7 @@ spawn_bus (State        *state,
+ 
+         bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO);
+ 
+-        g_ptr_array_add (arguments, "dbus-daemon");
+        g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon");
+ 
+         g_ptr_array_add (arguments, "--print-address");
+         g_ptr_array_add (arguments, bus_address_fd_string);
+diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
+index a998d1555..4fe50a2d0 100644
+--- a/daemon/gdm-x-session.c
+++ b/daemon/gdm-x-session.c
+@@ -463,7 +463,7 @@ spawn_bus (State        *state,
+ 
+         bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO);
+ 
+-        g_ptr_array_add (arguments, "dbus-daemon");
+        g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon");
+ 
+         g_ptr_array_add (arguments, "--print-address");
+         g_ptr_array_add (arguments, bus_address_fd_string);
 diff --git a/data/gdm.service.in b/data/gdm.service.in
 index 17e8a8de8..afc709778 100644
 --- a/data/gdm.service.in
@@ -44,7 +44,7 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "gdm";
-  version = "48.0";
+  version = "49.0.1";

  outputs = [
    "out"
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-G8Btr/CT7HteN+y0+S5do0dKGxugdu25FR7pZ9HDCt8=";
+    hash = "sha256-GbpC+GkqC/OlK9WX4amrKMnGpRiWpQgjBOX6GlGE2Bo=";
  };

  mesonFlags = [
@@ -145,6 +145,10 @@ stdenv.mkDerivation (finalAttrs: {
    # installed (mostly just because .passthru.tests can make use of it).
    substituteInPlace meson.build \
      --replace-fail "dconf_prefix = dconf_dep.get_variable(pkgconfig: 'prefix')" "dconf_prefix = gdm_prefix"
+
+    # Disable userdb dynamic users for now
+    substituteInPlace meson.build \
+      --replace-fail 'have_userdb = libsystemd_dep' 'have_userdb = false #'
  '';

  doInstallCheck = true;
@@ -21,7 +21,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ghex";
-  version = "48.0";
+  version = "48.1";

  outputs = [
    "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-qh0KtfdDBKqjGYehgtQh1j8ZzgJGXXxkJpbjFhI+MKg=";
+    hash = "sha256-T+q4r5Z+J2Pyi8d6Tdz1SjZ6odhUlv7wUBmGvYA9ifI=";
  };

  nativeBuildInputs = [
@@ -9,13 +9,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "gi-docgen";
-  version = "2025.3";
+  version = "2025.4";

  format = "other";

  src = fetchurl {
    url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz";
-    hash = "sha256-iomli8D3ffw+iioONJf8OfVBOuNeVZfp7GFgq/juFNg=";
+    hash = "sha256-Zshl1Fn+vfteQHiojfBhg2IMPpH3JtHcYI2I7jYFUm4=";
  };

  depsBuildBuild = [
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchurl,
+  fetchpatch,
  vala,
  pkg-config,
  gtk3,
@@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
    hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA=";
  };

+  patches = [
+    # Switch to girepository-2.0
+    # https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/278
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/gitg/raw/630cf1bdb50ad37fb20b81d76caa8622e7225c58/f/gitg-gir-2.0.patch";
+      hash = "sha256-9pC7wrxWcI1C/8yB5AcaED0RyaVbQzT0Ajuz0TM4hmo=";
+    })
+  ];
+
  nativeBuildInputs = [
    gobject-introspection
    meson
@@ -2,7 +2,7 @@ diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
 index 07759690..43c87c59 100644
 --- a/installed-tests/js/meson.build
 +++ b/installed-tests/js/meson.build
-@@ -123,7 +123,6 @@ jasmine_tests = [
+@@ -34,7 +34,6 @@ jasmine_tests = [
     'GTypeClass',
     'Importer',
     'Importer2',
@@ -2,7 +2,7 @@ diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh
 index 0d118490..54c5507e 100755
 --- a/installed-tests/debugger-test.sh
 +++ b/installed-tests/debugger-test.sh
-@@ -3,7 +3,7 @@
+@@ -6,7 +6,7 @@
 if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then
     gjs="$TOP_BUILDDIR/gjs-console"
 else
@@ -11,7 +11,7 @@ index 98475f7d..942d9eca 100644
     ],
     include_directories: top_include,
     install: get_option('installed_tests'), install_dir: installed_tests_execdir)
-@@ -82,7 +82,7 @@ foreach test : jasmine_tests
+@@ -90,7 +90,7 @@ foreach test : jasmine_tests
 
     test_description_subst = {
         'name': 'test@0@.js'.format(test),
@@ -20,16 +20,16 @@ index 98475f7d..942d9eca 100644
     }
     configure_file(configuration: test_description_subst,
         input: '../minijasmine.test.in',
-@@ -125,7 +125,7 @@ foreach test : dbus_tests
+@@ -122,7 +122,7 @@ foreach test : dbus_tests
 
-     dbus_test_description_subst = {
-         'name': 'test@0@.js'.format(test),
-        'installed_tests_execdir': prefix / installed_tests_execdir,
-+        'installed_tests_execdir': installed_tests_execdir,
-     }
-     configure_file(
-         configuration: dbus_test_description_subst,
-@@ -163,7 +163,7 @@ foreach test : modules_tests
+ dbus_test_description_subst = {
+     'name': 'testGDBus.js',
+-    'installed_tests_execdir': prefix / installed_tests_execdir,
+    'installed_tests_execdir': installed_tests_execdir,
+ }
+ configure_file(
+     configuration: dbus_test_description_subst,
+@@ -159,7 +159,7 @@ foreach test : modules_tests
 
     esm_test_description_subst = {
         'name': 'test@0@.js'.format(test),
@@ -42,7 +42,7 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build
 index 7a7c48ab..52508c2c 100644
 --- a/installed-tests/meson.build
 +++ b/installed-tests/meson.build
-@@ -30,7 +30,7 @@ foreach test : simple_tests
+@@ -34,7 +34,7 @@ foreach test : simple_tests
 
     test_description_subst = {
         'name': 'test@0@.sh'.format(test),
@@ -51,7 +51,7 @@ index 7a7c48ab..52508c2c 100644
     }
     configure_file(configuration: test_description_subst,
         input: 'script.test.in', output: 'test@0@.sh.test'.format(test),
-@@ -85,7 +85,7 @@ foreach test : debugger_tests
+@@ -123,7 +123,7 @@ foreach test : debugger_tests
 
     test_description_subst = {
         'name': '@0@.debugger'.format(test),
@@ -11,7 +11,7 @@
  gtk4,
  atk,
  gobject-introspection,
-  spidermonkey_128,
+  spidermonkey_140,
  pango,
  cairo,
  readline,
@@ -41,7 +41,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "gjs";
-  version = "1.84.2";
+  version = "1.86.0";

  outputs = [
    "out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NRQu3zRXBWNjACkew6fVg/FJaf8/rg/zD0qVseZ0AWY=";
+    hash = "sha256-Y0SPeleATUwqjQx/XpDiJNBNTrLVYBQsB2xlqO2gB5k=";
  };

  patches = [
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
    cairo
    readline
    libsysprof-capture
-    spidermonkey_128
+    spidermonkey_140
  ];

  nativeCheckInputs = [
@@ -74,7 +74,7 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "glib";
-  version = "2.84.4";
+  version = "2.86.1";

  outputs = [
    "bin"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ip6hCUPDb8EX4lP4DJHkd7ZzUlrkV2KUKFiu9XYxu5A=";
+    hash = "sha256-EZ0XCMoCJVbW0pie6QrRuCvZwNFmfgZpRKbQAg4tXlc=";
  };

  patches =
@@ -19,18 +19,25 @@
  pkg-config,
  rustc,
  rustPlatform,
+  common-updater-scripts,
+  _experimental-update-script-combinators,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "glycin-loaders";
-  version = "1.2.3";
+  version = "2.0.2";

  src = fetchurl {
    url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OAqv4r+07KDEW0JmDr/0SWANAKQ7YJ1bHIP3lfXI+zw=";
+    hash = "sha256-ZYAOhWs37byNXDM1rVNBUFgc4/LwhFTdAwKiZHC9nRM=";
  };

-  cargoVendorDir = "vendor";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    name = "glycin-loaders-deps-${finalAttrs.version}";
+    hash = "sha256-9cpvRNqymxkOi6L5oZDGyvB68rzEt97qB8uqzhUYsao=";
+    dontConfigure = true;
+  };

  nativeBuildInputs = [
    cargo
@@ -56,24 +63,49 @@ stdenv.mkDerivation (finalAttrs: {

  mesonFlags = [
    "-Dglycin-loaders=true"
+    "-Dglycin-thumbnailer=false"
    "-Dlibglycin=false"
+    "-Dlibglycin-gtk4=false"
    "-Dvapi=false"
  ];

  strictDeps = true;

  postPatch = ''
-    substituteInPlace loaders/meson.build \
+    substituteInPlace glycin-loaders/meson.build \
      --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader,"
  '';

  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;

  passthru = {
-    updateScript = gnome.updateScript {
-      attrPath = "glycin-loaders";
-      packageName = "glycin";
-    };
+    updateScript =
+      let
+        updateSource = gnome.updateScript {
+          attrPath = "glycin-loaders";
+          packageName = "glycin";
+        };
+        updateLockfile = {
+          command = [
+            "sh"
+            "-c"
+            ''
+              PATH=${
+                lib.makeBinPath [
+                  common-updater-scripts
+                ]
+              }
+              update-source-version glycin-loaders --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null
+            ''
+          ];
+          # Experimental feature: do not copy!
+          supportedFeatures = [ "silent" ];
+        };
+      in
+      _experimental-update-script-combinators.sequence [
+        updateSource
+        updateLockfile
+      ];
  };

  meta = with lib; {
@@ -25,11 +25,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-applets";
-  version = "3.56.0";
+  version = "3.58.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+heu3JVa3ZgaouQ7TAcTU/aGu9HuwdcXqJCnNTIK0XE=";
+    hash = "sha256-5h7bcTRNzV2qbnF137snSnWL6LWEUnc1abs1ZFuFojg=";
  };

  nativeBuildInputs = [
@@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-backgrounds";
-  version = "48.2.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz";
-    hash = "sha256-ahxbey4Nj1zpd5JtVfnC1l3RgIIs3qXlkVDc+1q9Htk=";
+    hash = "sha256-Af4mDeWLoA5Eq6WJqZjjPovHrsxwHfC+5kz0z7pE9LU=";
  };

  patches = [
@@ -50,11 +50,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-boxes";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz";
-    hash = "sha256-0F9fQlaPr79tiHcRYbBu1fc51DEhJ41BjK6VxW5RPq0=";
+    hash = "sha256-+kcmbab173qQTFuHadTYcbzNTmtjmjY8MjVDjXsOdXo=";
  };

  patches = [
@@ -24,6 +24,7 @@
  libspelling,
  libsysprof-capture,
  libxml2,
+  libyaml,
  meson,
  ninja,
  ostree,
@@ -42,7 +43,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-builder";
-  version = "48.2";
+  version = "49.0";

  outputs = [
    "out"
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7BKA1H6BSjE7dMuSfVoFk4BUSqD1bodVKXg5fWx0zGM=";
+    hash = "sha256-1FmQ22gfle4id75PqfKWSYJwfb3zATCgvecCNLN59WI=";
  };

  patches = [
@@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
    libspelling
    libsysprof-capture
    libxml2
+    libyaml
    ostree
    pcre2
    python3
@@ -2,6 +2,7 @@
  stdenv,
  lib,
  appstream,
+  blueprint-compiler,
  meson,
  ninja,
  vala,
@@ -26,15 +27,16 @@

 stdenv.mkDerivation rec {
  pname = "gnome-calculator";
-  version = "48.1";
+  version = "49.0.1";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz";
-    hash = "sha256-vEvUGpuhkPRcvuDYxnUs3F0osM7xxr0MAeLa4fPBkWI=";
+    hash = "sha256-7L4g5jBXX7i8I3kNNfOGrBd5ADxA3FyHfTzS2g/HRT8=";
  };

  nativeBuildInputs = [
    appstream
+    blueprint-compiler
    meson
    ninja
    pkg-config
@@ -2,6 +2,7 @@
  stdenv,
  lib,
  fetchurl,
+  blueprint-compiler,
  meson,
  ninja,
  pkg-config,
@@ -22,14 +23,15 @@

 stdenv.mkDerivation rec {
  pname = "gnome-calendar";
-  version = "48.1";
+  version = "49.0.1";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz";
-    hash = "sha256-Bs6t1cAL6ONYGB1CHs8mgs4K6i/LEtkDsw0pyjMonwI=";
+    hash = "sha256-4L/k6hCUItraB0Xdj4wOAjCriCB3ENHAfiRTIs+RP/I=";
  };

  nativeBuildInputs = [
+    blueprint-compiler
    meson
    ninja
    pkg-config
@@ -22,11 +22,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-characters";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz";
-    hash = "sha256-osMspU2RHbJARCA1DTRC5pGi3Oiw9dAImfZs/4w8jXE=";
+    hash = "sha256-G25UioLiaqTsmv5AnWmiVwk2LAN/pcUzGG1qHbKa9uM=";
  };

  nativeBuildInputs = [
@@ -22,11 +22,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-chess";
-  version = "48.0";
+  version = "49.2";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz";
-    hash = "sha256-eDTEdvCLvyd5BrApNjLtMugDdMuUQyayGeqQVqapXz8=";
+    hash = "sha256-xAoABKRz/nSawvpPrZjbZBGNGPn9msAu7Po2TwPb6bA=";
  };

  nativeBuildInputs = [
@@ -26,11 +26,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-clocks";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YW7h+3UwCx8muXZiGelUdRNgyg+g9JExG8+DvzgIfGI=";
+    hash = "sha256-v3aRXypJLooFkv5As1NGWTqjnk5ogdYXbg79h3HU5vo=";
  };

  nativeBuildInputs = [
@@ -17,16 +17,18 @@
  libxml2,
  gtk-vnc,
  gtk-frdp,
+  spice-gtk,
+  spice-protocol,
  gnome,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-connections";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Nw75QFBrVybG8rfLl5ayI9HW1Chfg8/DOFvWdMMon9A=";
+    hash = "sha256-Oh+UZrpUkUdHI1+uIexuoybJf2+NAJDLmc+worJMc54=";
  };

  nativeBuildInputs = [
@@ -49,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
    libsecret
    libxml2
    gtk-frdp
+    spice-gtk
+    spice-protocol
  ];

  passthru = {
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchurl,
+  appstream,
  gettext,
  gnome,
  libgtop,
@@ -20,14 +21,15 @@

 stdenv.mkDerivation rec {
  pname = "gnome-console";
-  version = "48.0.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-AY6Qjk2uvPyxUNTxuyjZgnKqnRTWgV6vjaRfiJ2wXEk=";
+    hash = "sha256-no6WRvRz0B9LSnvOLEetImtK6D+r8ky7tKyU9qxdXMI=";
  };

  nativeBuildInputs = [
+    appstream
    desktop-file-utils
    gettext
    meson
@@ -3,6 +3,7 @@
  stdenv,
  gettext,
  fetchurl,
+  blueprint-compiler,
  evolution-data-server-gtk4,
  pkg-config,
  libxslt,
@@ -29,14 +30,15 @@

 stdenv.mkDerivation rec {
  pname = "gnome-contacts";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz";
-    hash = "sha256-onYplbWUJ+w/GF8otVlONwd7cqcM18GSF+1jRjfswbU=";
+    hash = "sha256-JfIcZ7wp133vLZzT4i0oRg0StH/ySKIBdzG1TbSF5K8=";
  };

  nativeBuildInputs = [
+    blueprint-compiler
    meson
    ninja
    pkg-config
@@ -5,6 +5,7 @@
  replaceVars,
  accountsservice,
  adwaita-icon-theme,
+  blueprint-compiler,
  colord,
  colord-gtk4,
  cups,
@@ -27,6 +28,7 @@
  gsettings-desktop-schemas,
  gsound,
  gst_all_1,
+  gtk3,
  gtk4,
  ibus,
  json-glib,
@@ -42,7 +44,6 @@
  libsecret,
  libsoup_3,
  libwacom,
-  libXi,
  libxml2,
  libxslt,
  meson,
@@ -75,11 +76,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-control-center";
-  version = "48.4";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KiDu5uBcjTrdru+lJNzh7p+Ip32Djj/R7e88DC5GetI=";
+    hash = "sha256-pdjc4qAooAR+hnQ8J3J33os1oGPUSDNgSuo+ieqFn5c=";
  };

  patches = [
@@ -91,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  nativeBuildInputs = [
+    blueprint-compiler
    docbook-xsl-nons
    gettext
    libxslt
@@ -123,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
    gnome-user-share # optional, sharing panel
    gsettings-desktop-schemas
    gsound
+    gtk3 # org.gtk.Settings.FileChooser schema (datetime panel sets clock-format)
    gtk4
    ibus
    json-glib
@@ -138,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
    libsecret
    libsoup_3
    libwacom
-    libXi
    libxml2
    modemmanager
    mutter # schemas for the keybindings
@@ -1,17 +1,8 @@
 diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
-index f6c84e3d2..cd897f8f5 100644
+index dac0e51..71af3e2 100644
 --- a/panels/color/cc-color-panel.c
 +++ b/panels/color/cc-color-panel.c
-@@ -614,7 +614,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *self)
- 
-   /* run with modal set */
-   argv = g_ptr_array_new_with_free_func (g_free);
-  g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));
-+  g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
-   g_ptr_array_add (argv, g_strdup ("--device"));
-   g_ptr_array_add (argv, g_strdup (cd_device_get_id (self->current_device)));
-   g_ptr_array_add (argv, g_strdup ("--parent-window"));
-@@ -989,7 +989,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile)
+@@ -973,7 +973,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile)
 
   /* open up gcm-viewer as a info pane */
   argv = g_ptr_array_new_with_free_func (g_free);
@@ -20,7 +11,7 @@ index f6c84e3d2..cd897f8f5 100644
   g_ptr_array_add (argv, g_strdup ("--profile"));
   g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
   g_ptr_array_add (argv, g_strdup ("--parent-window"));
-@@ -1221,15 +1221,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device)
+@@ -1141,15 +1141,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device)
 static void
 gcm_prefs_profile_clicked (CcColorPanel *self, CdProfile *profile, CdDevice *device)
 {
@@ -38,7 +29,7 @@ index f6c84e3d2..cd897f8f5 100644
   else
     gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE);
 diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h
-index feef16580..4b88ef7b1 100644
+index feef165..4b88ef7 100644
 --- a/panels/system/datetime/tz.h
 +++ b/panels/system/datetime/tz.h
@@ -27,11 +27,7 @@
@@ -55,10 +46,10 @@ index feef16580..4b88ef7b1 100644
 typedef struct _TzDB TzDB;
 typedef struct _TzLocation TzLocation;
 diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
-index ec5a905a5..689fdbebe 100644
+index f1cae8d..faee22a 100644
 --- a/panels/network/connection-editor/net-connection-editor.c
 +++ b/panels/network/connection-editor/net-connection-editor.c
-@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
+@@ -384,7 +384,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
         GPid child_pid;
 
         builder = g_strv_builder_new ();
@@ -68,7 +59,7 @@ index ec5a905a5..689fdbebe 100644
         if (self->is_new_connection) {
                 g_autofree gchar *type_str = NULL;
 diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
-index 166670224..36f720d36 100644
+index d0b0206..8276af0 100644
 --- a/panels/network/net-device-mobile.c
 +++ b/panels/network/net-device-mobile.c
@@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
@@ -90,7 +81,7 @@ index 166670224..36f720d36 100644
 }
 
 diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
-index a31a606e3..ed5133d29 100644
+index a31a606..ed5133d 100644
 --- a/panels/printers/pp-host.c
 +++ b/panels/printers/pp-host.c
@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask        *task,
@@ -103,7 +94,7 @@ index a31a606e3..ed5133d29 100644
 
   /* Use SNMP to get printer's informations */
 diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c
-index edbc99830..1e1d90141 100644
+index fb9efc6..452486a 100644
 --- a/panels/system/users/run-passwd.c
 +++ b/panels/system/users/run-passwd.c
@@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
@@ -116,10 +107,10 @@ index edbc99830..1e1d90141 100644
 
         envp = g_get_environ ();
 diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c
-index 5b7bc1f02..13ffe6ca8 100644
+index 16dc79e..f543e7b 100644
 --- a/panels/system/users/user-utils.c
 +++ b/panels/system/users/user-utils.c
-@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username,
+@@ -217,7 +217,7 @@ is_valid_username_async (const gchar *username,
          * future, so it would be nice to have some official way for this
          * instead of relying on the current "--login" implementation.
          */
@@ -129,7 +120,7 @@ index 5b7bc1f02..13ffe6ca8 100644
         argv[2] = data->username;
         argv[3] = "--";
 diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
-index 9cb92007a..84d2f0fa3 100644
+index 9cb9200..84d2f0f 100644
 --- a/tests/datetime/test-endianess.c
 +++ b/tests/datetime/test-endianess.c
@@ -26,7 +26,7 @@ test_endianess (void)
@@ -30,7 +30,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-desktop";
-  version = "44.3";
+  version = "44.4";

  outputs = [
    "out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-QO+pqo1Q7/7ZIno9cGceMuncNeIPMxyrO1YpdZePT40=";
+    sha256 = "sha256-HYy5xqMo62ibDBJpz1ODTMhNhR1+cZcM2ruoJwa0SYQ=";
  };

  patches = lib.optionals stdenv.hostPlatform.isLinux [
@@ -21,14 +21,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-firmware";
-  version = "47.0";
+  version = "49.0";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "gnome-firmware";
    rev = finalAttrs.version;
-    sha256 = "sha256-dI9tE/I+14IhYZ+IDLErPunlT4L29AudbZXh0at4jKQ=";
+    sha256 = "sha256-3uU0N40O1eoK5JHWMwacSrBzOTq/c+qYwoH9kBOsqrM=";
  };

  nativeBuildInputs = [
@@ -17,6 +17,7 @@
  libpulseaudio,
  libxkbfile,
  libxml2,
+  metacity,
  pkg-config,
  polkit,
  gdm,
@@ -34,43 +35,13 @@
  buildEnv,
 }:

-let
-  # From data/sessions/Makefile.am
-  requiredComponentsCommon =
-    enableGnomePanel: [ "gnome-flashback" ] ++ lib.optional enableGnomePanel "gnome-panel";
-  requiredComponentsGsd = [
-    "org.gnome.SettingsDaemon.A11ySettings"
-    "org.gnome.SettingsDaemon.Color"
-    "org.gnome.SettingsDaemon.Datetime"
-    "org.gnome.SettingsDaemon.Housekeeping"
-    "org.gnome.SettingsDaemon.Keyboard"
-    "org.gnome.SettingsDaemon.MediaKeys"
-    "org.gnome.SettingsDaemon.Power"
-    "org.gnome.SettingsDaemon.PrintNotifications"
-    "org.gnome.SettingsDaemon.Rfkill"
-    "org.gnome.SettingsDaemon.ScreensaverProxy"
-    "org.gnome.SettingsDaemon.Sharing"
-    "org.gnome.SettingsDaemon.Smartcard"
-    "org.gnome.SettingsDaemon.Sound"
-    "org.gnome.SettingsDaemon.UsbProtection"
-    "org.gnome.SettingsDaemon.Wacom"
-    "org.gnome.SettingsDaemon.XSettings"
-  ];
-  requiredComponents =
-    wmName: enableGnomePanel:
-    "RequiredComponents=${
-      lib.concatStringsSep ";" (
-        [ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd
-      )
-    };";
-in
 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-flashback";
-  version = "3.56.0";
+  version = "3.58.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LQ+iLzc9sIDq7w5Wk7lijN6ETyVjPVqQMTsEndlSkmA=";
+    hash = "sha256-qqI+cEJHfnQfJCebRoudIK9OwZXuQ7PTEs2q+E2YwyE=";
  };

  patches = [
@@ -90,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  postInstall = ''
-    # Check that our expected RequiredComponents match the stock session files, but then don't install them.
-    # They can be installed using mkSessionForWm.
-    grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
-
    rm -r $out/share/gnome-session
    rm -r $out/share/xsessions
    rm $out/libexec/gnome-flashback-metacity
@@ -167,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
      {
        wmName,
        wmLabel,
-        enableGnomePanel,
      }:
      writeTextFile {
        name = "gnome-flashback-${wmName}-gnome-session";
@@ -175,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
        text = ''
          [GNOME Session]
          Name=GNOME Flashback (${wmLabel})
-          ${requiredComponents wmName enableGnomePanel}
        '';
      };

@@ -209,11 +174,33 @@ stdenv.mkDerivation (finalAttrs: {
        wmCommand,
        enableGnomePanel,
      }:
-      runCommand "gnome-flashback-${wmName}.target" { } ''
-        mkdir -p $out/lib/systemd/user
-        cp -r "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
-          "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
-      '';
+      runCommand "gnome-flashback-${wmName}.target" { } (
+        ''
+          if [ "${wmName}" = "metacity" ]; then
+            echo "Use `services.xserver.windowManager.metacity.enable` instead."
+            exit 1
+          fi
+
+          mkdir -p $out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d
+          cp "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d/session.conf" \
+            "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/session.conf"
+
+          substitute ${finalAttrs.finalPackage}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target \
+            "$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target" \
+            --replace-fail "(Metacity)" "(${wmLabel})"
+
+          echo -e "[Unit]\nWants=${wmName}.service" >> "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/${wmName}.conf"
+
+          substitute ${metacity}/lib/systemd/user/metacity.service \
+            "$out/lib/systemd/user/${wmName}.service" \
+            --replace-fail "Description=Metacity" "Description=${wmLabel}" \
+            --replace-fail "ExecStart=${metacity}/bin/metacity" "ExecStart=${wmCommand}"
+        ''
+        + lib.optionalString (!enableGnomePanel) ''
+          substituteInPlace "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/session.conf" \
+            --replace-fail "Wants=gnome-panel.service" ""
+        ''
+      );

    tests = {
      inherit (nixosTests) gnome-flashback;
@@ -18,11 +18,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-font-viewer";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz";
-    hash = "sha256-cyYkIxtiT/XHrAOoznG+Ejk9qlNVHRFVCyDXsKOocqc=";
+    hash = "sha256-fAGJJcKFdxtV19Gm8VcRwMGT10UO2YceINRPJUhWJAQ=";
  };

  doCheck = true;
@@ -25,15 +25,6 @@ index 196abf6..613d0e5 100644
 	g_spawn_command_line_async (commandline, NULL);
 	g_free (commandline);
 
-@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
-                 g_param_spec_string ("showing-extra", "", "", "",
-                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- 
-	signals[CHANGED] = 
-+	signals[CHANGED] =
- 		g_signal_new ("changed",
- 			      G_TYPE_FROM_CLASS (object_class),
- 			      G_SIGNAL_RUN_FIRST,
 diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
 index a2376f8..5cb7bc9 100644
 --- a/gnome-initial-setup/pages/timezone/tz.h
@@ -37,11 +37,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-initial-setup";
-  version = "48.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz";
-    hash = "sha256-s9q/fnm2Zf8SJB+9umFUiVE9iGIkdZmGr49IZXWSMV4=";
+    hash = "sha256-KiixpAugiYaRiTBY9hggfemykj17pXpUeQ5aztztzPg=";
  };

  patches = [
@@ -1,6 +1,7 @@
 {
  lib,
  fetchFromGitLab,
+  fetchpatch,
  python3,
  wrapGAppsHook3,
  gobject-introspection,
@@ -22,6 +23,14 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss=";
  };

+  patches = [
+    # Remove broken future dependency
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-keysign/-/commit/ea197254baf70a499a371678369eda85aff7a4c5.patch";
+      hash = "sha256-Msd0NzNAkoAAxZ/WNiM3xV382lnx+xT6gyQiNGDEMM8=";
+    })
+  ];
+
  nativeBuildInputs = [
    wrapGAppsHook3
    gobject-introspection
@@ -43,7 +52,6 @@ python3.pkgs.buildPythonApplication rec {

  propagatedBuildInputs = with python3.pkgs; [
    dbus-python
-    future
    gpgme
    magic-wormhole
    pygobject3
@@ -2,6 +2,7 @@
  stdenv,
  lib,
  fetchurl,
+  appstream,
  meson,
  ninja,
  pkg-config,
@@ -23,14 +24,15 @@

 stdenv.mkDerivation rec {
  pname = "gnome-logs";
-  version = "45.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz";
-    hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI=";
+    hash = "sha256-+PV56wu22ajWrl7hQj+UR6+RIAeFF4tQu63UrC0lXUU=";
  };

  nativeBuildInputs = [
+    appstream
    meson
    ninja
    pkg-config
@@ -20,11 +20,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-mahjongg";
-  version = "48.1";
+  version = "49.0.1";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.major finalAttrs.version}/gnome-mahjongg-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3Ujg+BrKNL6tpGxdIhsyWRuO2B6dNhw6JY359rIiLIQ=";
+    hash = "sha256-RbOkjcse1hiaY7a/VVCOizjrWpVmV6f+KlIlzC+LwTI=";
  };

  nativeBuildInputs = [
@@ -30,11 +30,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-maps";
-  version = "48.6";
+  version = "49.1";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OtqaMVUXWlGdQV8Ll9D+129PS+uLYCEqAXaXoyy+gaY=";
+    hash = "sha256-QG+qUc5zo/iWpKFTBX+gLqp4y4LUjxHbRECDCUl1a+w=";
  };

  doCheck = !stdenv.hostPlatform.isDarwin;
@@ -14,18 +14,17 @@
  gettext,
  itstool,
  libxml2,
-  libgnome-games-support_2_0,
  libgee,
  desktop-file-utils,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-mines";
-  version = "48.1";
+  version = "49.0.1";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-mines/${lib.versions.major finalAttrs.version}/gnome-mines-${finalAttrs.version}.tar.xz";
-    hash = "sha256-70stLd477GFBV+3eTZGJzGr+aSlSot1VsocOLmLtgQQ=";
+    hash = "sha256-iwygXAM7PCWZyZL4jr2UyysMjjiOoMAq5x2yb0P1bIQ=";
  };

  nativeBuildInputs = [
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    gtk4
    libadwaita
-    libgnome-games-support_2_0
    librsvg
    libgee
  ];
@@ -31,13 +31,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "gnome-music";
-  version = "48.1";
+  version = "49.0.2";

  format = "other";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz";
-    hash = "sha256-QL9XMC2l2zNraIVS7dAU2/vitEUEGWYAcpTGwrDAeN4=";
+    hash = "sha256-m5dJQgC7qoew7YhJJVQw1WwVjVG03qe+aIn3dWGpVKc=";
  };

  nativeBuildInputs = [
@@ -14,7 +14,6 @@
  libxml2,
  libadwaita,
  libgee,
-  libgnome-games-support_2_0,
  meson,
  ninja,
  desktop-file-utils,
@@ -22,11 +21,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-nibbles";
-  version = "4.2.2";
+  version = "4.4.1";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Pkofm68cV7joNd7fCGnjJy5lNKHdacTib64QxCAKrwA=";
+    hash = "sha256-uIK4n2v9bRX96yr5edkYui8cHMjto5yviCe1Z9N/r5U=";
  };

  nativeBuildInputs = [
@@ -47,16 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
    librsvg
    libadwaita
    libgee
-    libgnome-games-support_2_0
  ];

-  # The "we can link with libadwaita?" valac.links() check fails otherwise.
-  # Command line: `valac testfile.vala --pkg=libadwaita-1 --Xcc=-w --Xcc=-DVALA_STRICT_C` -> 1
-  # testfile.vala.c:50:46: error: passing argument 2 of 'adw_about_dialog_set_developers'
-  # from incompatible pointer type [-Wincompatible-pointer-types]
-  # 50 |         adw_about_dialog_set_developers (ad, s);
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-
  passthru = {
    updateScript = gnome.updateScript { packageName = "gnome-nibbles"; };
  };
@@ -32,7 +32,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-online-accounts";
-  version = "3.54.5";
+  version = "3.56.0";

  outputs = [
    "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6PEntTIpWimRLRwAc0kx35r/pOv8RK0N5cKWw9J9LJU=";
+    hash = "sha256-MdagF9Fxsn/5NkeP2weSogDIFC6vwYslUHPOnftBdXI=";
  };

  mesonFlags = [
@@ -25,7 +25,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-panel";
-  version = "3.56.0";
+  version = "3.58.1";

  outputs = [
    "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-UoptZ92E7a5sgKXuZW+E+9lC87Nx1g+XottgZc9P0XA=";
+    hash = "sha256-fovKQ6gaE0xmazp4uvKv+wxdMO+xvKZTiH/EGzHdXmQ=";
  };

  patches = [
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
  dontUnpack = true;
  dontConfigure = true;
  dontBuild = true;
+  # $output/lib/systemd/user is already a symlink
+  dontMoveSystemdUserUnits = true;

  preferLocalBuild = true;
  allowSubstitutes = false;
@@ -52,10 +54,10 @@ stdenv.mkDerivation {
    rm -r $out/lib/gnome-panel/modules
    ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out

-    rm $out/share/applications/gnome-panel.desktop
-
-    ln -s ${gnome-panel}/share/applications/gnome-panel.desktop \
-      $out/share/applications/gnome-panel.desktop
+    rm $out/share/systemd/user/gnome-panel.service
+    substitute ${gnome-panel}/share/systemd/user/gnome-panel.service \
+      $out/share/systemd/user/gnome-panel.service \
+      --replace-fail "ExecStart=${gnome-panel}/bin/gnome-panel" "ExecStart=$out/bin/gnome-panel"

    runHook postInstall
  '';
@@ -1,89 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitLab,
-  fetchpatch,
-  meson,
-  ninja,
-  pkg-config,
-  desktop-file-utils,
-  gettext,
-  itstool,
-  python3,
-  wrapGAppsHook3,
-  gtk3,
-  glib,
-  libsoup_2_4,
-  gnome-online-accounts,
-  librest,
-  json-glib,
-  gnome-autoar,
-  gspell,
-  libcanberra,
-  nix-update-script,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-recipes";
-  version = "2.0.4";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "recipes";
-    rev = version;
-    fetchSubmodules = true;
-    sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw=";
-  };
-
-  patches = [
-    # gcc-14 build failure fix
-    (fetchpatch {
-      name = "gcc-14.patch";
-      url = "https://gitlab.gnome.org/GNOME/recipes/-/commit/c0304675f63a33737b24fdf37e06c6b154a91a31.patch";
-      hash = "sha256-YTf4NDwUiU/q96RAXKTO499pW9sPrgh8IvdPBPEnV6Q=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    desktop-file-utils
-    gettext
-    itstool
-    python3
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    gtk3
-    glib
-    libsoup_2_4
-    gnome-online-accounts
-    librest
-    json-glib
-    gnome-autoar
-    gspell
-    libcanberra
-  ];
-
-  postPatch = ''
-    chmod +x src/list_to_c.py
-    patchShebangs src/list_to_c.py
-    patchShebangs meson_post_install.py
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Recipe management application for GNOME";
-    mainProgram = "gnome-recipes";
-    homepage = "https://gitlab.gnome.org/GNOME/recipes";
-    teams = [ teams.gnome ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-  };
-}
@@ -34,11 +34,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-remote-desktop";
-  version = "48.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
-    hash = "sha256-vPN3D8oPrtovrjsaP/by6QoCd492pC6P0QPK4YYo9PI=";
+    hash = "sha256-1HrdnZcPIkrMd+/lohZIbUBFHivCG4W/7FOX1CD9oYo=";
  };

  nativeBuildInputs = [
@@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "gnome-session-ctl";
-  version = "47.0.1";
+  version = "49.0";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = "gnome-session-ctl";
    rev = version;
-    hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ=";
+    hash = "sha256-rudb7ioTE5iaou0tzU5i2gWFW06NyWF5W5tjx2b5/0Y=";
  };

  nativeBuildInputs = [
@@ -1,35 +0,0 @@
-diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
-index b4b1f8fa..99d52cba 100755
--- a/gnome-session/gnome-session.in
-+++ b/gnome-session/gnome-session.in
-@@ -4,13 +4,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
-    [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
-    [  -n "$SHELL" ]; then
-   if [ "$1" != '-l' ]; then
-    exec bash -c "exec -l '$SHELL' -c 'exec $0 -l $*'"
-+    # Make sure the shell actually sets up the environment.
-+    unset __NIXOS_SET_ENVIRONMENT_DONE
-+    exec @bash@ -c "exec -l '$SHELL' -c 'exec $0 -l $*'"
-   else
-     shift
-   fi
- fi
- 
-SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
-+SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region)
- REGION=${SETTING#\'}
- REGION=${REGION%\'}
- 
-diff --git a/gnome-session/main.c b/gnome-session/main.c
-index a460a849..9d07898f 100644
--- a/gnome-session/main.c
-+++ b/gnome-session/main.c
-@@ -215,7 +215,7 @@ require_dbus_session (int      argc,
-         }
-         new_argv[i + 2] = NULL;
-         
-        if (!execvp ("dbus-launch", new_argv)) {
-+        if (!execvp ("@dbusLaunch@", new_argv)) {
-                 g_set_error (error, 
-                              G_SPAWN_ERROR,
-                              G_SPAWN_ERROR_FAILED,
@@ -0,0 +1,14 @@
+diff --git a/gnome-session/leader-main.c b/gnome-session/leader-main.c
+index 511166d6..8bac2912 100644
+--- a/gnome-session/leader-main.c
+++ b/gnome-session/leader-main.c
+@@ -92,6 +92,9 @@ maybe_reexec_with_login_shell (GStrv argv)
+ 
+         g_debug ("Relaunching with login shell %s (%s)", login_shell, shell);
+ 
+        /* Make sure the shell actually sets up the environment */
+        g_unsetenv ("__NIXOS_SET_ENVIRONMENT_DONE");
+
+         /* First, we construct the command executed by the login shell */
+         builder = g_strv_builder_new ();
+         g_strv_builder_add (builder, "exec");
@@ -7,9 +7,10 @@
  ninja,
  pkg-config,
  gnome,
+  gobject-introspection,
  adwaita-icon-theme,
  glib,
-  gtk3,
+  gtk4,
  gsettings-desktop-schemas,
  gnome-desktop,
  gnome-settings-daemon,
@@ -19,22 +20,21 @@
  libICE,
  xmlto,
  docbook_xsl,
-  docbook_xml_dtd_412,
+  docbook_xml_dtd_45,
  python3,
  libxslt,
  gettext,
-  makeWrapper,
  systemd,
  xorg,
  libepoxy,
-  bash,
  gnome-session-ctl,
+  wrapGAppsHook4,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-session";
  # Also bump ./ctl.nix when bumping major version.
-  version = "48.0";
+  version = "49.0";

  outputs = [
    "out"
@@ -43,34 +43,32 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3ZCfvFsizb2y/E3xpH140bWUPMxeYeaiChhGJGNHxBc=";
+    hash = "sha256-WnViLmPRt1FFyevmfoKDZ6dfWs5LYjf2TlRmHmpUXvM=";
  };

  patches = [
-    (replaceVars ./fix-paths.patch {
-      gsettings = "${glib.bin}/bin/gsettings";
-      dbusLaunch = "${dbus.lib}/bin/dbus-launch";
-      bash = "${bash}/bin/bash";
-    })
+    # https://github.com/NixOS/nixpkgs/pull/48517
+    ./nixos_set_environment_done.patch
  ];

  nativeBuildInputs = [
+    gobject-introspection.setupHook
    meson
    ninja
    pkg-config
    gettext
-    makeWrapper
    xmlto
    libxslt
    docbook_xsl
-    docbook_xml_dtd_412
+    docbook_xml_dtd_45
    python3
    dbus # for DTD
+    wrapGAppsHook4
  ];

  buildInputs = [
    glib
-    gtk3
+    gtk4
    libICE
    gnome-desktop
    json-glib
@@ -107,15 +105,11 @@ stdenv.mkDerivation (finalAttrs: {
    rm -rf $out/libexec/gnome-session-ctl
  '';

-  # `bin/gnome-session` will reset the environment when run in wayland, we
-  # therefor wrap `libexec/gnome-session-binary` instead which is the actual
-  # binary needing wrapping
  preFixup = ''
-    wrapProgram "$out/libexec/gnome-session-binary" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-      --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \
+    gappsWrapperArgs+=(
+      --suffix XDG_DATA_DIRS : "${gnome-shell}/share"
      --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
+    )
  '';

  separateDebugInfo = true;
@@ -126,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: {
    };
    providedSessions = [
      "gnome"
-      "gnome-xorg"
    ];
  };

@@ -10,13 +10,12 @@
  gnome,
  perl,
  gettext,
-  gtk3,
  glib,
  libnotify,
  libgnomekbd,
  libpulseaudio,
  alsa-lib,
-  libcanberra-gtk3,
+  libcanberra,
  upower,
  colord,
  libgweather,
@@ -25,15 +24,14 @@
  geoclue2,
  systemd,
  libgudev,
-  libwacom,
  libxslt,
  libxml2,
  modemmanager,
  networkmanager,
  gnome-desktop,
  geocode-glib_2,
-  docbook_xsl,
-  wrapGAppsHook3,
+  docbook-xsl-nons,
+  wrapGAppsNoGuiHook,
  python3,
  tzdata,
  gcr_4,
@@ -44,11 +42,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-settings-daemon";
-  version = "48.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4=";
+    hash = "sha256-IBvUrAxHFHkYLvN15ZneYApRo8CwSehXFaIkRx5bMiY=";
  };

  patches = [
@@ -74,14 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    libxml2
    libxslt
-    docbook_xsl
-    wrapGAppsHook3
+    docbook-xsl-nons
+    wrapGAppsNoGuiHook
    python3
    udevCheckHook
  ];

  buildInputs = [
-    gtk3
    glib
    gsettings-desktop-schemas
    modemmanager
@@ -91,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
    gnome-desktop
    libpulseaudio
    alsa-lib
-    libcanberra-gtk3
+    libcanberra
    upower
    colord
    libgweather
@@ -99,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
    geocode-glib_2
    geoclue2
    libgudev
-    libwacom
    gcr_4
  ]
  ++ lib.optionals withSystemd [
@@ -15,11 +15,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-shell-extensions";
-  version = "48.3";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
-    hash = "sha256-rd40wI9AtjQRvm8dF+I1VQoAkElIceZIHDEpidf0otQ=";
+    hash = "sha256-FXDgZHhstDiXWeBIPzob29W5s48GJG600dUJKSqcamI=";
  };

  patches = [
@@ -51,16 +51,20 @@
  pipewire,
  gst_all_1,
  adwaita-icon-theme,
+  glycin-loaders,
  gnome-bluetooth,
  gnome-clocks,
  gnome-settings-daemon,
  gnome-autoar,
  gnome-tecla,
  bash-completion,
+  lcms2,
  libgbm,
  libGL,
  libXi,
  libX11,
+  libxkbcommon,
+  libsoup_3,
  libxml2,
 }:

@@ -69,7 +73,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-shell";
-  version = "48.4";
+  version = "49.0";

  outputs = [
    "out"
@@ -78,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
-    hash = "sha256-QOLtdLRTZ/DKOPv6oKtHCGjSNZHQPcQNCr1v930jtwc=";
+    hash = "sha256-/whrnDIYCZQw2RhSQ7Z3ajaiy3vLcFqYxhLyz0dCcIo=";
  };

  patches = [
@@ -152,10 +156,13 @@ stdenv.mkDerivation (finalAttrs: {
    ibus
    gnome-desktop
    gnome-settings-daemon
+    lcms2 # required by mutter-clutter
    libgbm
    libGL # for egl, required by mutter-clutter
    libXi # required by libmutter
    libX11
+    libxkbcommon
+    libsoup_3
    libxml2

    # recording
@@ -185,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
  postPatch = ''
    patchShebangs \
      src/data-to-c.py \
-      meson/generate-app-list.py
+      build-aux/generate-app-list.py

    # We can generate it ourselves.
    rm -f man/gnome-shell.1
@@ -215,9 +222,15 @@ stdenv.mkDerivation (finalAttrs: {

  preFixup = ''
    gappsWrapperArgs+=(
-      # Until glib’s xdgmime is patched
-      # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
-      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+      --prefix XDG_DATA_DIRS : ${
+        lib.makeSearchPath "share" [
+          # Until glib’s xdgmime is patched
+          # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
+          shared-mime-info
+          # For background images https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4554
+          glycin-loaders
+        ]
+      }
    )
  '';

@@ -1,5 +1,5 @@
--- a/subprojects/shew/src/meson.build
-+++ b/subprojects/shew/src/meson.build
+--- a/subprojects/libshew/src/meson.build
+++ b/subprojects/libshew/src/meson.build
@@ -13,7 +13,7 @@ shew_sources = [
 libshew = library(full_name,
   sources: shew_sources,
@@ -48,11 +48,11 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-software";
-  version = "48.4";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
-    hash = "sha256-nNEwvGLNCLY6Ii6yZmG8xxfnXVjuGzwYgMTRt2zNJjs=";
+    hash = "sha256-NpzXVD8KS+mjNzPeCvFWNIJmw7XKyqTkc3lZ59FOBB8=";
  };

  patches = [
@@ -23,11 +23,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-sudoku";
-  version = "48.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz";
-    hash = "sha256-eXE62CpZkEzWlv8CJV627ZNk6I8+eDNDsfnQygnyx+M=";
+    hash = "sha256-CzfN4geSLJpKiiIV4s3+nzL0AWHSi2An+aaRMCW1CrU=";
  };

  nativeBuildInputs = [
@@ -5,7 +5,6 @@
  fetchurl,
  pkg-config,
  gtkmm4,
-  libxml2,
  bash,
  catch2_3,
  gtk4,
@@ -26,11 +25,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-system-monitor";
-  version = "48.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Ezw6bihjZuZZ/S2AWCQJp71e2uRW5jxPacz2btb8Zjg=";
+    hash = "sha256-3MhE3XDkoHfwZlJNvRT5z+BLCYMdcLfWmlGBZyPNSqA=";
  };

  patches = [
@@ -54,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
    gtk4
    libadwaita
    glib
-    libxml2
    gtkmm4
    libgtop
    gdk-pixbuf
@@ -64,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
    systemd
  ];

+  mesonFlags = [
+    # <artificial>:(.text.startup+0x56): undefined reference to `GsmApplication::get()'
+    "-Db_lto=false"
+  ];
+
  doCheck = true;

  passthru = {
@@ -16,11 +16,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tecla";
-  version = "48.0.2";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz";
-    hash = "sha256-eD00ZNKiz36xUHZJ29n/Cc4khSwqbJoNNl24QGPT1AE=";
+    hash = "sha256-LKQk5AK69gzWsTd3cDtwHrsfr489Dy+XEUTYI/ZRJJ8=";
  };

  nativeBuildInputs = [
@@ -30,11 +30,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-terminal";
-  version = "3.56.2";
+  version = "3.58.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz";
-    hash = "sha256-I1vAnfo0zF8elRIum/YCA6hNr4Yc+s9+RJbF9UgjmXg=";
+    hash = "sha256-B+vHrxNRa+Wzd3f1INJkCzMSBiDpm7sF3upfgoD9ac4=";
  };

  nativeBuildInputs = [
@@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchurl,
-  fetchpatch,
  pkg-config,
  gnome,
  adwaita-icon-theme,
@@ -20,24 +19,13 @@

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

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/gnome-tetravex-${version}.tar.xz";
-    hash = "sha256-H83xCXm5o1JgCdeDociKOJkY82DaTttE+6JccfGGkRs=";
+    hash = "sha256-g4SawGTUVuHdRrbiAcaGFSYkw9HsS5mTWYWkmqeRcss=";
  };

-  patches = [
-    # Fix build with meson 0.61
-    # data/meson.build:37:0: ERROR: Function does not take positional arguments.
-    # data/meson.build:59:0: ERROR: Function does not take positional arguments.
-    # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch";
-      hash = "sha256-2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I=";
-    })
-  ];
-
  nativeBuildInputs = [
    wrapGAppsHook3
    itstool
@@ -68,7 +56,7 @@ stdenv.mkDerivation rec {
    description = "Complete the puzzle by matching numbered tiles";
    mainProgram = "gnome-tetravex";
    teams = [ teams.gnome ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
    platforms = platforms.unix;
  };
 }
@@ -12,7 +12,6 @@
  wrapGAppsHook4,
  ninja,
  gnome,
-  cairo,
  icu,
  itstool,
  libadwaita,
@@ -24,11 +23,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-text-editor";
-  version = "48.3";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-P56XIjlO200hRcBtaSELPT/KXNK5DWMmQ751CEPVVro=";
+    hash = "sha256-jkOwz6gVLNPHYw3lZd4taTDoh88ti4RID7+FOivCyKY=";
  };

  nativeBuildInputs = [
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    cairo
    icu
    glib
    gsettings-desktop-schemas
@@ -22,11 +22,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-tour";
-  version = "48.1";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz";
-    hash = "sha256-uKA7JXTrlWq+mvFBQWHMsX+DDVNgC5wEmc7zu29BJ8U=";
+    hash = "sha256-LX2KKgzRF4BjpBTaWAk9JsD7GndgjYrX+9eRGl1iZNM=";
  };

  cargoVendorDir = "vendor";
@@ -28,12 +28,12 @@

 python3Packages.buildPythonApplication rec {
  pname = "gnome-tweaks";
-  version = "46.1";
+  version = "49.0";
  format = "other";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-LxkqcIX71oQ+z4JXFtnaIeyScgKRSeo18+FZ4Kwwm4A=";
+    hash = "sha256-s5Cb3LSQW2hCfWq1geAfQ23/jlwKOJseCxRQDxiAbrs=";
  };

  nativeBuildInputs = [
@@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec {

  passthru = {
    updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnome-tweaks";
    };
  };

@@ -11,11 +11,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-user-docs";
-  version = "48.2";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-Z4Kfdkumctf5n/cu9lE7QMyTH7QBv3vX21+AXnv6Pbk=";
+    hash = "sha256-7BGNRNoYZuQXONoZz128PZpCklovO/SO5sN+bj5G3fM=";
  };

  nativeBuildInputs = [
@@ -17,15 +17,16 @@
  geoclue2,
  python3,
  gsettings-desktop-schemas,
+  typescript,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-weather";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz";
-    hash = "sha256-TAVps9gVri+UFtRxNMvTBWNAZA/xhtMalMhlgTtL27U=";
+    url = "mirror://gnome/sources/gnome-weather/${lib.versions.major finalAttrs.version}/gnome-weather-${finalAttrs.version}.tar.xz";
+    hash = "sha256-7h92uF66nbDI1cAgQanYXs3SKrtexrs/8yIlkpwPzl8=";
  };

  nativeBuildInputs = [
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
    python3
    gobject-introspection
    gjs
+    typescript
  ];

  buildInputs = [
@@ -62,7 +64,9 @@ stdenv.mkDerivation rec {
  '';

  passthru = {
-    updateScript = gnome.updateScript { packageName = "gnome-weather"; };
+    updateScript = gnome.updateScript {
+      packageName = "gnome-weather";
+    };
  };

  meta = with lib; {
@@ -73,4 +77,4 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    platforms = platforms.unix;
  };
-}
+})
@@ -15,7 +15,7 @@

 stdenv.mkDerivation rec {
  pname = "gom";
-  version = "0.5.3";
+  version = "0.5.4";

  outputs = [
    "out"
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz";
-    sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc=";
+    sha256 = "V7qAb+CAqTfVZkF40hutdlOyxWHqEoGHp7ELwXYrf2U=";
  };

  patches = [
@@ -17,11 +17,11 @@

 stdenv.mkDerivation rec {
  pname = "gsettings-desktop-schemas";
-  version = "48.0";
+  version = "49.0";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-5o8VWBO/GPhlqLLI6dRzWItsytyvu2Zqt4iFfGwtG9M=";
+    hash = "sha256-kSkFzEU4KIikdwLtEQHGsI69ASKjKmfZQKuBFqlsUg0=";
  };

  strictDeps = true;
--- a/Show More
+++ b/Show More