GNOME: 3.22 -> 3.24

This is a squash commit of the joint work from:

* Jan Tojnar (@jtojnar)
* Linus Heckemann (@lheckemann)
* Ryan Mulligan (@ryantm)
* romildo (@romildo)
* Tom Hunger (@teh)

359 files changed, 913 insertions, 922 deletions

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index fc7fd49907e..a8932a90803 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -12,6 +12,11 @@ has the following highlights: </para>
 <itemizedlist>
   <listitem>
     <para>
+      The Gnome version is now 3.24.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
       The user handling now keeps track of deallocated UIDs/GIDs. When a user
       or group is revived, this allows it to be allocated the UID/GID it had before.
       A consequence is that UIDs and GIDs are no longer reused.
@@ -207,7 +212,7 @@ rmdir /var/lib/ipfs/.ipfs
   <listitem>
     <para>
       Nixpkgs overlays may now be specified with a file as well as a directory. The
-      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and 
+      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
       <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the
       <filename>~/.config/nixpkgs/overalys</filename> directory.
     </para>
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c63fede857..0e3b05cc592 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -103,14 +103,29 @@ in
             (filter (arg: arg != "-terminate") cfg.xserverArgs);
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
-          XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
+          XCURSOR_PATH = "~/.icons:${gnome3.adwaita-icon-theme}/share/icons";
         };
         execCmd = "exec ${gdm}/bin/gdm";
       };
 
     # Because sd_login_monitor_new requires /run/systemd/machines
     systemd.services.display-manager.wants = [ "systemd-machined.service" ];
-    systemd.services.display-manager.after = [ "systemd-machined.service" ];
+    systemd.services.display-manager.after = [
+      "rc-local.service"
+      "systemd-machined.service"
+      "systemd-user-sessions.service"
+      "getty@tty1.service"
+    ];
+
+    systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
+    systemd.services.display-manager.serviceConfig = {
+        # Restart = "always"; - already defined in xserver.nix
+        KillMode = "mixed";
+        IgnoreSIGPIPE = "no";
+        BusName = "org.gnome.DisplayManager";
+        StandardOutput = "syslog";
+        StandardError = "inherit";
+    };
 
     systemd.services.display-manager.path = [ gnome3.gnome_session ];
 
diff --git a/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
deleted file mode 100644
index b2c36c3d7ae..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "bijiben-3.21.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/bijiben/3.21/bijiben-3.21.2.tar.xz;
-    sha256 = "d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
deleted file mode 100644
index 4a25b015393..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "cheese-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/cheese/3.22/cheese-3.22.0.tar.xz;
-    sha256 = "0b52e4b0021cfb86a5abbd17356b72693f724892165d91b3ff7f5031a1ce53ea";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
deleted file mode 100644
index a3e0121f6f1..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evolution-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evolution/3.22/evolution-3.22.0.tar.xz;
-    sha256 = "3e4742032b450cd8752097ba7e56302134e3653d510d4c53196654fb353ebbeb";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
deleted file mode 100644
index 029cdc2064d..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "file-roller-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/file-roller/3.22/file-roller-3.22.0.tar.xz;
-    sha256 = "5065b71d43deb3dc3c7af6efa3f3b1188a63bfafb213be86af1d262b1dc11d42";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
deleted file mode 100644
index ff43d41c53a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-boxes-3.22.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz;
-    sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
deleted file mode 100644
index b1ff598acaf..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-calendar-3.22.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calendar/3.22/gnome-calendar-3.22.1.tar.xz;
-    sha256 = "e6a3670c63122c4b37fbe243a54486e019c1bfd9a27c709234fb81b9e0c13360";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
deleted file mode 100644
index d4b90eb4768..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-characters-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-characters/3.22/gnome-characters-3.22.0.tar.xz;
-    sha256 = "0778b625646d6d934cf252d58a2e16403889da6bfc237bdca1d3cb3258f63d4e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
deleted file mode 100644
index 81a857cf1c0..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-clocks-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-clocks/3.22/gnome-clocks-3.22.0.tar.xz;
-    sha256 = "cdcd4ccd9716e7f12487a80d1b173aa28d9bde536d6274fbbc31acd6606c0511";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
deleted file mode 100644
index ca9dca1ff4c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-documents-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-documents/3.22/gnome-documents-3.22.0.tar.xz;
-    sha256 = "edf5cd6b7b7f5847217b60885358030598e551010087d2a9d1765ae6777041ad";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
deleted file mode 100644
index 4cb82624254..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-getting-started-docs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-getting-started-docs/3.22/gnome-getting-started-docs-3.22.0.tar.xz;
-    sha256 = "22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
deleted file mode 100644
index 995120855d5..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-logs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-logs/3.22/gnome-logs-3.22.0.tar.xz;
-    sha256 = "114da79579d69840904970b2b3a72dc8f6be76a5673174b6628b42fd6781eb4f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
deleted file mode 100644
index ef8c7a1287d..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gnome-maps-3.18.0/configure.ac.orig	2015-09-24 18:38:31.912498368 +0200
-+++ gnome-maps-3.18.0/configure.ac	2015-09-24 18:38:40.783320413 +0200
-@@ -50,8 +50,9 @@
-     folks                        >= $FOLKS_MIN_VERSION
-     geocode-glib-1.0             >= $GEOCODE_MIN_VERSION
-     champlain-0.12               >= $CHAMPLAIN_MIN_VERSION
-     libxml-2.0
-     rest-0.7
-+    libsoup-2.4
- ])
- AC_SUBST(GNOME_MAPS_LIB_CFLAGS)
- AC_SUBST(GNOME_MAPS_LIB_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
deleted file mode 100644
index ef668faef53..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-maps-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-maps/3.22/gnome-maps-3.22.0.tar.xz;
-    sha256 = "7ce98a683f1c38d3ba1b5d68c7d05add9f9366774678fd50fdeeda6987163c39";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
deleted file mode 100644
index 5b3a79a111a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-music-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-music/3.22/gnome-music-3.22.0.tar.xz;
-    sha256 = "170685ffa89556951b9fb0b9225b2bca863e54348d4079a56b8e5c4eeafa9b03";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
deleted file mode 100644
index f28d626ff94..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-photos-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-photos/3.22/gnome-photos-3.22.0.tar.xz;
-    sha256 = "568329142855901a85f325ee014176e24f735b15a496842bcd31f5cb2615ba53";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
deleted file mode 100644
index 8cfab25381e..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-weather-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz;
-    sha256 = "7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
deleted file mode 100644
index a8c4b303c38..00000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "polari-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/polari/3.22/polari-3.22.0.tar.xz;
-    sha256 = "90ea3db7ed0a03d46d9376e3201b4332f56d6149bc284379c367159094b73818";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
deleted file mode 100644
index a48b404ceb6..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "adwaita-icon-theme-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz;
-    sha256 = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
deleted file mode 100644
index df4cefc4816..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "baobab-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/baobab/3.22/baobab-3.22.0.tar.xz;
-    sha256 = "796e784886d5bdf2e9d8ac94d74d5f94e055f4285ef54dc16552fb9c9b9c3e99";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/src.nix b/pkgs/desktops/gnome-3/3.22/core/eog/src.nix
deleted file mode 100644
index f3995e6bc2c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/eog/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "eog-3.20.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz;
-    sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
deleted file mode 100644
index 2ec9189964a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "epiphany-3.22.6";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz;
-    sha256 = "0ib7z8x65gcr6vc6709df1rngcfrp3xn5ywqlrnc2xrsynrhghz9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
deleted file mode 100644
index 07997a5c095..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evince-3.22.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz;
-    sha256 = "f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
deleted file mode 100644
index 84817846f72..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evolution-data-server-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.0.tar.xz;
-    sha256 = "8653a9a28980e661e8b91ba335dae04a0553e12611ad155bc48fb3fb3c98653d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
deleted file mode 100644
index e100e013b78..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200
-+++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200
-@@ -369,8 +369,9 @@
-                 gdm_error_trap_push ();
- 
-                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
--                        XAddHost (slave->priv->server_display, &host_entries[i]);
-+                        //XAddHost (slave->priv->server_display, &host_entries[i]);
-                 }
-+                XDisableAccessControl(slave->priv->server_display);
- 
-                 XSync (slave->priv->server_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
deleted file mode 100644
index 4556f418cc8..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd
---- a/configure.ac	2016-05-27 11:10:44.589740789 +0200
-+++ b/configure.ac	2016-05-27 11:11:00.146427723 +0200
-@@ -888,7 +888,7 @@
- dnl ---------------------------------------------------------------------------
- 
- PKG_CHECK_MODULES(SYSTEMD,
--                  [libsystemd-login >= 186 libsystemd-daemon],
-+                  [libsystemd],
-                   [have_systemd=yes], [have_systemd=no])
- 
- if test "x$with_systemd" = "xauto" ; then
-@@ -912,7 +912,7 @@
- AC_SUBST(SYSTEMD_LIBS)
- 
- PKG_CHECK_MODULES(JOURNALD,
--                  [libsystemd-journal],
-+                  [libsystemd],
-                   [have_journald=yes], [have_journald=no])
- 
- if test "x$enable_systemd_journal" = "xauto" ; then
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
deleted file mode 100644
index c87554078c7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000
-+++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000
-@@ -48,8 +48,6 @@
- #include "gdm-session-enum-types.h"
- #include "gdm-launch-environment.h"
- 
--#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
--
- extern char **environ;
- 
- #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
-@@ -512,7 +510,7 @@
-                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
-         } else {
-                 /* wrap it in dbus-launch */
--                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
-+                char *command = g_strdup (launch_environment->priv->command);
- 
-                 gdm_session_select_program (launch_environment->priv->session, command);
-                 g_free (command);
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
deleted file mode 100644
index 9714a68600a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/daemon/gdm-session.c.orig b/daemon/gdm-session.c
-index b839fea..053d4ac 100644
---- a/daemon/gdm-session.c.orig
-+++ b/daemon/gdm-session.c
-@@ -344,12 +344,16 @@ get_system_session_dirs (GdmSession *self)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                "/var/empty",
-                 "/etc/X11/sessions/",
-                 DMCONFDIR "/Sessions/",
-                 DATADIR "/gdm/BuiltInSessions/",
-                 DATADIR "/xsessions/",
-                 NULL
-         };
-+        if (getenv("GDM_SESSIONS_DIR") != NULL) {
-+                search_dirs[1] = getenv("GDM_SESSIONS_DIR");
-+        };
- 
- #ifdef ENABLE_WAYLAND_SUPPORT
-         if (self->priv->ignore_wayland) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
deleted file mode 100644
index 795be7f4cfe..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gdm-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gdm/3.22/gdm-3.22.0.tar.xz;
-    sha256 = "b9180d07c6a4a3fb0e8df6bcb4f333008cb3071f0ef81e02f081ff8a144f62d4";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
deleted file mode 100644
index 3f2ec808cd6..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-server.c.orig b/daemon/gdm-server.c
-index 6357d34..5bef5c8 100644
---- a/daemon/gdm-server.c.orig
-+++ b/daemon/gdm-server.c
-@@ -264,7 +264,11 @@ gdm_server_init_command (GdmServer *server)
-         return;
- 
- fallback:
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- 
- }
-
diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
deleted file mode 100644
index 135e05e90e9..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "geocode-glib-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz;
-    sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
deleted file mode 100644
index 7af8d7c531b..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  name = "gjs-${major}.4";
-  major = "1.47";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";
-    sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
deleted file mode 100644
index 2b20cae9cda..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-backgrounds-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-backgrounds/3.22/gnome-backgrounds-3.22.0.tar.xz;
-    sha256 = "6c83e01647375d5c409312d7215d038d705a3f214179227ed37d3158afdd001f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
deleted file mode 100644
index 891ce5c58f6..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-calculator-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calculator/3.22/gnome-calculator-3.22.0.tar.xz;
-    sha256 = "fa0f192fc0cad43a8520d4015780ce008d9fc6201bd2dd6dc06365ba45458728";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
deleted file mode 100644
index bbe7f5a009d..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-control-center-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.0.tar.xz;
-    sha256 = "d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
deleted file mode 100644
index 8efa20f01dc..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-desktop-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-desktop/3.22/gnome-desktop-3.22.0.tar.xz;
-    sha256 = "cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
deleted file mode 100644
index 249cb314c2a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-dictionary-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz;
-    sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
deleted file mode 100644
index c0a0798cd27..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-disk-utility-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-disk-utility/3.22/gnome-disk-utility-3.22.0.tar.xz;
-    sha256 = "757d4ff438e63ac337a8681c9ef184a36143b39494381b609cdf889128d7fb22";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
deleted file mode 100644
index ee87655bba7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-font-viewer-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-font-viewer/3.22/gnome-font-viewer-3.22.0.tar.xz;
-    sha256 = "bd27cbc523016711508d7913878f32e262893cfcc7e10795171dbf8e35af9be0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
deleted file mode 100644
index 3c1c426d264..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-online-accounts-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.0.tar.xz;
-    sha256 = "aacce93a71bf5e687a45ae0d00f31ea0625ddd8143235d6d8c64c4ec21bbfa33";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
deleted file mode 100644
index 2bafae9967e..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-online-miners-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-miners/3.22/gnome-online-miners-3.22.0.tar.xz;
-    sha256 = "bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
deleted file mode 100644
index 29f1ad93abb..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-session-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.0.tar.xz;
-    sha256 = "ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
deleted file mode 100644
index 1457aab1d01..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-settings-daemon-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.0.tar.xz;
-    sha256 = "430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
deleted file mode 100644
index e17d02a011f..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-extensions-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell-extensions/3.22/gnome-shell-extensions-3.22.0.tar.xz;
-    sha256 = "317b35f6f1299d5162e693d39b21031f5fe875083c4020217db3ec056e245fc5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
deleted file mode 100644
index b835eea019c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.0.tar.xz;
-    sha256 = "d8d22cc19e28641f2eac47e812065c209e4866b6e5f9d636647a0a8c96e5dca9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
deleted file mode 100644
index a05e6bd09e5..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-software-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.0.tar.xz;
-    sha256 = "22e30c84851b0768bd46dbb90de6d3308acdc2973d3ca4ee52a19cdb5a0182ba";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
deleted file mode 100644
index e8e9ba37501..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-system-monitor-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-system-monitor/3.22/gnome-system-monitor-3.22.0.tar.xz;
-    sha256 = "4339d36c2f7b702652ee03424a241f855992c583bb437d7083c61d8dcfe3fff8";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
deleted file mode 100644
index 5d8088d78d3..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-terminal-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-terminal/3.22/gnome-terminal-3.22.0.tar.xz;
-    sha256 = "97e6b1b4128ac133d8917b3940c71ddf9b89d189c5ac8402b1060126733993ed";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
deleted file mode 100644
index e7e67e0b4fb..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-user-docs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-user-docs/3.22/gnome-user-docs-3.22.0.tar.xz;
-    sha256 = "7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
deleted file mode 100644
index 50a54eab7eb..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gsettings-desktop-schemas-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.tar.xz;
-    sha256 = "0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
deleted file mode 100644
index 6e010227fc3..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gtksourceview-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/3.22/gtksourceview-3.22.0.tar.xz;
-    sha256 = "70657f48732427984dce6cc812bdd3f2b701c0a49e0a0a08889705b3dadcf8e5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
deleted file mode 100644
index 94657351946..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "libgweather-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libgweather/3.20/libgweather-3.20.3.tar.xz;
-    sha256 = "fb6bc5b64ef5db3dc40a9798f072b83ebcafe7ff5af472aaee70600619b56c0b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
deleted file mode 100644
index 02e9b6e0d84..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "mutter-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/mutter/3.22/mutter-3.22.0.tar.xz;
-    sha256 = "a5acdde788f5d137ec6dfe218a214c1f6cfb7e2e851fbcebe0b2d67b4c96e5f3";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
deleted file mode 100644
index e0c7f3034f9..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "nautilus-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/nautilus/3.22/nautilus-3.22.0.tar.xz;
-    sha256 = "7671d9cf9df0321f5ad03abce03ab35ab6d643e1b3392a84f3c1d7c23ce29816";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
deleted file mode 100644
index e1fc1011b56..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "sushi-3.21.91";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/sushi/3.21/sushi-3.21.91.tar.xz;
-    sha256 = "db71c9ec3dd2dde6aed03b469253ce7d9f30c60ff50c2a8dc9f7776b70d15d55";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/src.nix b/pkgs/desktops/gnome-3/3.22/core/totem/src.nix
deleted file mode 100644
index 11e20f665b7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/totem/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "totem-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/totem/3.22/totem-3.22.0.tar.xz;
-    sha256 = "026a5b5b1674bdb941bc28e1ee95ecc168627e0fc323b6ec8d73407d21964fea";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
deleted file mode 100644
index 6889f6ee09e..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-fetchurl: rec {
-  major = "1.10";
-  minor = "0";
-  name = "tracker-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz";
-    sha256 = "df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb";
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix
deleted file mode 100644
index d80749a2566..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  name = "vte-${major}.0";
-  major = "0.46";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vte/${major}/${name}.tar.xz";
-    sha256 = "5f7122e7860eb2470d310fc63df91d3ee32bab233729c2dc181a0cbc9b3249d7";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
deleted file mode 100644
index 75476b43b95..00000000000
--- a/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "zenity-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/zenity/3.22/zenity-3.22.0.tar.xz;
-    sha256 = "1ecdfa1071d383b373b8135954b3ec38d402d671dcd528e69d144aff36a0e466";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
deleted file mode 100644
index 02747b9153c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "devhelp-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/devhelp/3.22/devhelp-3.22.0.tar.xz;
-    sha256 = "59cae02e12d238cc5fc3f049d779895ba89701426d9173f5b534d4ab90c5ffb0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
deleted file mode 100644
index 1cced81517d..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-chess-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-chess/3.22/gnome-chess-3.22.0.tar.xz;
-    sha256 = "838040c120af08aaa8ef1a6a284e2de296b998b37e49adb9436a12b6a428154a";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
deleted file mode 100644
index 67db003d99a..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-mines-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-mines/3.22/gnome-mines-3.22.0.tar.xz;
-    sha256 = "ee6df05b36fdff0376371887c1375e63d9e90655146a9a787db3c3aa2b74908a";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
deleted file mode 100644
index e2948db9e4c..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-nibbles-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-nibbles/3.22/gnome-nibbles-3.22.0.tar.xz;
-    sha256 = "9cbc0aa458af0a4c00fd1bd528c4c3fecaea713390e2cbee796b0a6930e0cb49";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
deleted file mode 100644
index 085cf2ffb20..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-sudoku-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-sudoku/3.22/gnome-sudoku-3.22.0.tar.xz;
-    sha256 = "0f39a7afb864c6cffa1991cc5fda958e0eb03329eebe21ca2d965588cf5fa0d5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
deleted file mode 100644
index c79aa1582a1..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "lightsoff-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/lightsoff/3.22/lightsoff-3.22.0.tar.xz;
-    sha256 = "0458e0ff99a10a99573db4d3e1ea5abde186056d8e32cf1f0bd76e25ff2c4fca";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
deleted file mode 100644
index e0644e539fb..00000000000
--- a/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "swell-foop-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/swell-foop/3.22/swell-foop-3.22.0.tar.xz;
-    sha256 = "e7bb6f4c7932a17c3f48e5b7df66f4e3953642e8126389531592a79fdf71e0a4";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
deleted file mode 100644
index 5a78b8d0ca6..00000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gitg-3.23.90";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gitg/3.23/gitg-3.23.90.tar.xz;
-    sha256 = "0m3g8ag8nh6vj5m188l7sgkm7p8mrs094mjijqaaav3r6cz91fdg";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
deleted file mode 100644
index c9f10fa8cd7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  pname = "gnome-autoar";
-  version = "0.1";
-  name = "${pname}-${version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz";
-    sha256 = "f65cb810b562dc038ced739fbf59739fd5df1a8e848636e21f363ded9f349ac9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
deleted file mode 100644
index 8937b7dd1a7..00000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-packagekit-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-packagekit/3.22/gnome-packagekit-3.22.0.tar.xz;
-    sha256 = "0b28d4928f9767a512723b49656266aaa2a7909d880e5e4238c0e3436ac4908c";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
deleted file mode 100644
index 88f3b3069f1..00000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-tweak-tool-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz;
-    sha256 = "3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
index 7a5ab769cc9..7a5ab769cc9 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
index 20bd0083964..20bd0083964 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
index 00895f9a2bb..00895f9a2bb 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
new file mode 100644
index 00000000000..ea2c063647f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "bijiben-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz;
+    sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
index b5f70d84e52..b5f70d84e52 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
new file mode 100644
index 00000000000..e10f79e8312
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "cheese-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz;
+    sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
index 8da7fab9037..3d152221a39 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
@@ -2,7 +2,8 @@
 , pkgconfig, gtk3, glib, libnotify, gtkspell3
 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
 , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap}:
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap
+, cmake}:
 
 let
   majVer = gnome3.version;
@@ -24,7 +25,9 @@ in stdenv.mkDerivation rec {
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
                   nss nspr libnotify procps highlight gnome3.libgweather
                   gnome3.gsettings_desktop_schemas
-                  gnome3.libgnome_keyring gnome3.glib_networking openldap ];
+                  gnome3.libgnome_keyring gnome3.glib_networking openldap
+                  cmake
+                ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
@@ -32,6 +35,10 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" "--with-openldap"];
 
+  cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF"
+                 "-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF"
+               ];
+
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
new file mode 100644
index 00000000000..2aab7967d8a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evolution-3.24.5";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz;
+    sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
index 18188829377..18188829377 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
new file mode 100644
index 00000000000..10a82877bcd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "file-roller-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz;
+    sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
index 69056e28c26..69056e28c26 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
index 3fdc6cfaa68..3fdc6cfaa68 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix b/pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
index 1179b2fdc5c..1179b2fdc5c 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix b/pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
index edaa51d9478..edaa51d9478 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
index a0f8d966955..a0f8d966955 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/glade/src.nix b/pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
index d32dbd94d05..d32dbd94d05 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/glade/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
index cb8bf49254b..cb8bf49254b 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
new file mode 100644
index 00000000000..dbed4617850
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-boxes-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz;
+    sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
index fbd5d748f5e..fbd5d748f5e 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
new file mode 100644
index 00000000000..5d0eeadcc0a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-calendar-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz;
+    sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
index 4571a5d50e8..0c7adcb0319 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
-    librsvg gnome3.defaultIconTheme
+    librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
new file mode 100644
index 00000000000..db14a10d65a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-characters-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz;
+    sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
index e39614e765d..e39614e765d 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
new file mode 100644
index 00000000000..2497fe83c1e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-clocks-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz;
+    sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
index 4840d200cf9..4840d200cf9 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
new file mode 100644
index 00000000000..c1ca08a064b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-documents-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz;
+    sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
index 0c75ebd7c78..0c75ebd7c78 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
new file mode 100644
index 00000000000..027cbb59d88
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-getting-started-docs-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz;
+    sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
index d4135fdb1ba..2fc27617d98 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd gnome3.defaultIconTheme
+    systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
new file mode 100644
index 00000000000..53e303f3856
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-logs-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz;
+    sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
index 8625f21f3db..5af407ef15c 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
-, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook
+, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook
 , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
 , webkitgtk }:
 
@@ -11,12 +11,20 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
                   gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
                   gnome3.geocode_glib libchamplain file libsoup
-                  gdk_pixbuf librsvg autoreconfHook
+                  gdk_pixbuf librsvg libgweather autoreconfHook
                   gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
                   gnome3.gnome_online_accounts gnome3.defaultIconTheme
                   webkitgtk ];
 
-  patches = [ ./soup.patch ];
+  # The .service file isn't wrapped with the correct environment
+  # so misses GIR files when started. By re-pointing from the gjs
+  # entry point to the wrapped binary we get back to a wrapped
+  # binary.
+  preConfigure = ''
+    substituteInPlace "data/org.gnome.Maps.service.in" \
+        --replace "Exec=@pkgdatadir@/org.gnome.Maps" \
+                  "Exec=$out/bin/gnome-maps"
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Maps;
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
new file mode 100644
index 00000000000..e45d7be3fb7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-maps-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz;
+    sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
index 4f11e7a2843..4f11e7a2843 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
new file mode 100644
index 00000000000..615c54583f2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-music-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz;
+    sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
index 4c152777f2c..4c152777f2c 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
index df7e23ef9d4..6e8394950a6 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib
 , makeWrapper, itstool, gegl, babl, lcms2
 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook
-, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }:
+, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
                   gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
                   gnome3.gnome_online_accounts gnome3.gnome_desktop
                   lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  wrapGAppsHook gexiv2 ];
+                  wrapGAppsHook gexiv2 geocode_glib ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
new file mode 100644
index 00000000000..78f3b7d672a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-photos-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.2.tar.xz;
+    sha256 = "31ddc078ad2f6bc4bbfa2f71eb23377782750b9cb2ad2b0e6ff2a1971548cdf9";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
index dbd5377d5bf..3b5542544d5 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
@@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
     libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas
   ];
 
+  # The .service file isn't wrapped with the correct environment
+  # so misses GIR files when started. By re-pointing from the gjs
+  # entry point to the wrapped binary we get back to a wrapped
+  # binary.
+  preConfigure = ''
+    substituteInPlace "data/org.gnome.Weather.Application.service.in" \
+        --replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \
+                  "Exec=$out/bin/gnome-weather"
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Weather;
     description = "Access current weather conditions and forecasts";
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
new file mode 100644
index 00000000000..eef77b23504
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-weather-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz;
+    sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
index 093900dcb7a..093900dcb7a 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
index f14a1ef3c47..fc97d1b6d6e 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
 , telepathy_glib, gjs, itstool, telepathy_idle, libxml2
 , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup
-, gnome3, wrapGAppsHook, telepathy_logger }:
+, gnome3, wrapGAppsHook, telepathy_logger, gspell }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
-                  telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];
+                  telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
new file mode 100644
index 00000000000..da7a37031f5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "polari-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz;
+    sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
index 58d5a5b8cdc..58d5a5b8cdc 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
index 0ae195a0a7b..0ae195a0a7b 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
index 8b8b6248642..8b8b6248642 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
index 3d1357c4989..3d1357c4989 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
index 62cc4da6ba1..62cc4da6ba1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
new file mode 100644
index 00000000000..5700cb56913
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "adwaita-icon-theme-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz;
+    sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
index 15db270e80c..15db270e80c 100644
--- a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
new file mode 100644
index 00000000000..8a2e35d454e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "baobab-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz;
+    sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
index 2d71f1da592..e405d8edfba 100644
--- a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
   buildInputs = with gnome3;
     [ glib gtk clutter at_spi2_core dbus pythonPackages.python
       pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
index 6e0184e134e..6e0184e134e 100644
--- a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
index 64e19864536..64e19864536 100644
--- a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
index 9200c4180bd..9200c4180bd 100644
--- a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
index 9a29d11f1ae..9a29d11f1ae 100644
--- a/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/default.nix b/pkgs/desktops/gnome-3/3.24/core/eog/default.nix
index 23759e3bf90..23759e3bf90 100644
--- a/pkgs/desktops/gnome-3/3.22/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/eog/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/eog/src.nix b/pkgs/desktops/gnome-3/3.24/core/eog/src.nix
new file mode 100644
index 00000000000..72b02d0bba5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/eog/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "eog-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz;
+    sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
index 015f8213b44..ec8cf118815 100644
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
@@ -2,7 +2,7 @@
 , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
 , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }:
+, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
                   gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
                   gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
-                  gst_all_1.gst-libav];
+                  gst_all_1.gst-libav json_glib ];
 
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
new file mode 100644
index 00000000000..85596c07fad
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "epiphany-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz;
+    sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.24/core/evince/default.nix
index 559e9b8575a..aca10516a38 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/evince/default.nix
@@ -10,13 +10,6 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2017-1000083"; # https://bugzilla.gnome.org/show_bug.cgi?id=784630
-      url = "https://git.gnome.org/browse/evince/patch/?id=fa072dbbfd96";
-      sha256 = "12xg00jvbsh54dr2dyq2ha5a05x2bpzd1lh2k3sppq3h7a02lsjy";
-    })
-  ];
   # missing help for now; fixing the autogen phase seemed too difficult
   postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am";
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/evince/src.nix b/pkgs/desktops/gnome-3/3.24/core/evince/src.nix
new file mode 100644
index 00000000000..aa45a79536a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/evince/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evince-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz;
+    sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
index c2038ecdce6..9d51dc969d3 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
@@ -1,20 +1,25 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python, dconf
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true,
+vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts (stdenv.lib.getLib dconf)
-      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
+      (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper
+      icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk
+      libaccounts-glib ]
     ++ stdenv.lib.optional valaSupport vala_0_32;
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];
 
   # uoa irrelevant for now
-  configureFlags = [ "--disable-uoa" "--disable-google-auth" ]
-                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
+  cmakeFlags = [ "-DENABLE_UOA=OFF" "-DENABLE_GOA=OFF" ]
+                   ++ stdenv.lib.optionals valaSupport [
+                     "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON"
+                     "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
new file mode 100644
index 00000000000..655fffe0eb9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evolution-data-server-3.24.5";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz;
+    sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix b/pkgs/desktops/gnome-3/3.24/core/folks/default.nix
index 171ad077450..171ad077450 100644
--- a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/folks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
index 1729ec06623..1729ec06623 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
index 55eebf77be5..55eebf77be5 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
index d166f033266..d166f033266 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
index 51b67afb01f..51b67afb01f 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
index 7691a9e86f0..7691a9e86f0 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
index b8fbad4d731..b8fbad4d731 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
index b451d129391..b451d129391 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
index 0d8e46aeece..59f0381f2e8 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }:
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth
+, librsvg }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -18,17 +19,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
                   accountsservice gnome3.dconf systemd
                   gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool plymouth ];
+                  libcanberra_gtk3 pam libtool plymouth librsvg ];
 
   enableParallelBuilding = true;
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch
-              ./sessions_dir.patch
+  patches = [ ./sessions_dir.patch
               ./gdm-x-session_extra_args.patch
               ./gdm-session-worker_xserver-path.patch
-             # ./disable_x_access_control.patch ./no-dbus-launch.patch
-             # ./libsystemd.patch
              ];
 
   installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
index d020752fef3..d020752fef3 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
index 66071aa4af8..66071aa4af8 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
index 84081f4786c..84081f4786c 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
new file mode 100644
index 00000000000..bbc803d49c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
@@ -0,0 +1,23 @@
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index ff3a1acb..b8705d8f 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self)
+         char **search_dirs;
+ 
+         static const char *x_search_dirs[] = {
++                "/var/empty",
+                 "/etc/X11/sessions/",
+                 DMCONFDIR "/Sessions/",
+                 DATADIR "/gdm/BuiltInSessions/",
+@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self)
+                 NULL
+         };
+ 
++        if (getenv("GDM_SESSIONS_DIR") != NULL) {
++                x_search_dirs[0] = getenv("GDM_SESSIONS_DIR");
++        };
++
+         static const char *wayland_search_dir = DATADIR "/wayland-sessions/";
+ 
+         search_array = g_array_new (TRUE, TRUE, sizeof (char *));
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
new file mode 100644
index 00000000000..0dd7680467f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gdm-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz;
+    sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
index 4d75bdc4996..4d75bdc4996 100644
--- a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
new file mode 100644
index 00000000000..394e3a68c35
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "geocode-glib-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz;
+    sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
index 1141db03c40..10d9c46123d 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
@@ -1,12 +1,17 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_31, pango, readline, glib, libxml2, dbus }:
+, spidermonkey_38, pango, readline, glib, libxml2, dbus }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
 
-  propagatedBuildInputs = [ spidermonkey_31 ];
+  propagatedBuildInputs = [ spidermonkey_38 ];
+
+  # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc
+  preConfigure = ''
+    sed -i s/mozjs-38/js/ configure
+  '';
 
   postInstall = ''
     sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
new file mode 100644
index 00000000000..27162fcbfd4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gjs-1.48.6";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz;
+    sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
index eb801caf565..eb801caf565 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
new file mode 100644
index 00000000000..dce56f2341e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-backgrounds-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz;
+    sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
index 7fae0b5c67f..7fae0b5c67f 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
index 474d4722b4a..5129b87e542 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-bluetooth-3.20.0";
+  name = "gnome-bluetooth-3.20.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz;
-    sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53";
+    url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz;
+    sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
index 0a177fbab31..12b8af206ea 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, libxml2
 , bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:
+, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash gtk3 glib intltool itstool
                   libxml2 gnome3.gtksourceview mpfr gmp
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];
+                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
new file mode 100644
index 00000000000..9279cdb13af
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-calculator-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz;
+    sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
index f9261e183ef..f9261e183ef 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
index 8ffe7e20e1a..8ffe7e20e1a 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
index 66cc2cb24c7..66cc2cb24c7 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
index f1b3d3c94ac..f1b3d3c94ac 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
index 4409747169b..4409747169b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
index b116c2902da..b116c2902da 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
new file mode 100644
index 00000000000..85dfcd2ef31
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-control-center-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz;
+    sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
index 7265f09731f..7265f09731f 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
new file mode 100644
index 00000000000..83c2979656c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-desktop-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz;
+    sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
index c94c178558d..c94c178558d 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
new file mode 100644
index 00000000000..3c0a188c7b2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-dictionary-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz;
+    sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
index f22f4665c14..f22f4665c14 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
new file mode 100644
index 00000000000..602b9eb340e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-disk-utility-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz;
+    sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
index 16d7151ea09..16d7151ea09 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
new file mode 100644
index 00000000000..f4e37d476dd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-font-viewer-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz;
+    sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
index df47c1a477b..df47c1a477b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
index 88179fff3c7..88179fff3c7 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
index ee8c3a902d5..ee8c3a902d5 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
index 29f6ae3e860..29f6ae3e860 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
new file mode 100644
index 00000000000..2c51429cd0c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-online-accounts-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz;
+    sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
index 90fc3a8737a..90fc3a8737a 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
new file mode 100644
index 00000000000..00558f25295
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-online-miners-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz;
+    sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
index 34f8cee625a..34f8cee625a 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
index 3668417d280..3668417d280 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
index 8dec630354c..2cd92ce39ca 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
+, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
   buildInputs = with gnome3;
     [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt
       gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
-      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd
+      epoxy
+    ];
 
   # FIXME: glib binaries shouldn't be in .dev!
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
new file mode 100644
index 00000000000..d323fea7631
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-session-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz;
+    sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
index ff5670935bd..ff5670935bd 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
new file mode 100644
index 00000000000..03c213f2162
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-settings-daemon-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz;
+    sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
index e9eae87f14e..e9eae87f14e 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
new file mode 100644
index 00000000000..cb9bf57ce4a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-shell-extensions-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz;
+    sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
index 2ce3f9e3927..a694da0844d 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
@@ -1,14 +1,15 @@
 { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core
 , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, sqlite, libgweather, libcanberra_gtk3
+, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2
 , libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
 
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
 
 let
   pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+
 in stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
@@ -17,24 +18,29 @@ in stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg
+      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf
+      (librsvg.override { enableIntrospection = true; })
       clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
       libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
       libical libtool nss gtk gstreamer makeWrapper gdm
-      libcanberra_gtk3 gnome_control_center
+      libcanberra_gtk3 gnome_control_center geoclue2
       defaultIconTheme sqlite gnome3.gnome-bluetooth
       libgweather # not declared at build time, but typelib is needed at runtime
       gnome3.gnome-clocks # schemas needed
       at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
-      pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ];
+      gobjectIntrospection (stdenv.lib.getLib dconf) ];
 
   installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
 
   preBuild = ''
     patchShebangs src/data-to-c.pl
     substituteInPlace data/Makefile --replace " install-keysDATA" ""
+
+    substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
+    substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
   '';
 
+
   preFixup = with gnome3; ''
     wrapProgram "$out/bin/gnome-shell" \
       --prefix PATH : "${unzip}/bin" \
@@ -44,6 +50,9 @@ in stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
       --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
 
+    wrapProgram "$out/bin/gnome-shell-extension-prefs" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
new file mode 100644
index 00000000000..7cb2bd89221
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-shell-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz;
+    sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
index a6a196625b4..2f4a1427ec0 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
 , appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
-, json_glib, libsecret }:
+, json_glib, libsecret, valgrind-light }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
                   gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
                   gtkspell3 json_glib libsecret
-                  polkit attr acl libyaml ];
+                  polkit attr acl libyaml valgrind-light ];
   propagatedBuildInputs = [ isocodes ];
 
   postInstall = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
new file mode 100644
index 00000000000..9d847b3af7d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-software-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz;
+    sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
index aa6f48ac420..aa6f48ac420 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
index 8c3bf86edcf..3164e4dd74b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
 , bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
+, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
                   gtkmm3 libgtop wrapGAppsHook
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas ];
+                  gnome3.gsettings_desktop_schemas systemd ];
 
   preFixup = ''
     gappsWrapperArgs+=(
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  # fails to build without --enable-static
+  configureFlags = ["--enable-systemd" "--enable-static"];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
new file mode 100644
index 00000000000..aab373b9715
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-system-monitor-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz;
+    sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
index 073a791ac3c..073a791ac3c 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
new file mode 100644
index 00000000000..2aa084cc493
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-terminal-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz;
+    sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
index 5cc3385ad84..5cc3385ad84 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
index a5ccd23b9fc..a5ccd23b9fc 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
index 4f02673e036..4f02673e036 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
new file mode 100644
index 00000000000..f617d41ff30
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-user-docs-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz;
+    sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
index 587165e107b..587165e107b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
index 2d06f9e7a7c..2d06f9e7a7c 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
index 4b8fc90adad..4b8fc90adad 100644
--- a/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
index 0deac26c259..b4a794812a5 100644
--- a/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   major = "0.3"; # if you change this, also change ./setup-hook.sh
-  minor = "2";
+  minor = "3";
   name = "grilo-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
-    sha256 = "f26f684a5d76aea8dbce136750bc67d2170b36575f109292fbb78ae99ec87f5b";
+    sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw";
   };
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
index 3291e38addb..3291e38addb 100644
--- a/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh
+++ b/pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
index 5123cadbdaf..5123cadbdaf 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
new file mode 100644
index 00000000000..22760d2be11
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gsettings-desktop-schemas-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz;
+    sha256 = "f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
index 95785d9ed4d..95785d9ed4d 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
index 3dfbe6fbf0b..3dfbe6fbf0b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
index c87350167c2..c87350167c2 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
new file mode 100644
index 00000000000..8648c595bb9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gtksourceview-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.3.tar.xz;
+    sha256 = "3eed05486a6420c3e2fdda0bbb19a0d905ed09ebf442302a026ab7e574204cbd";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
index 43e27cdb481..43e27cdb481 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
index 21618c45e05..21618c45e05 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
index 05aff866606..05aff866606 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
index 69c0dd60025..69c0dd60025 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
index 4141afeb821..4141afeb821 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
index 08f05bcaedc..08f05bcaedc 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
index d4697c99a93..d4697c99a93 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
index 67003f45164..67003f45164 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
index 47cb96de6c3..47cb96de6c3 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
index 689ece9ad78..689ece9ad78 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
index 2bcbefc8dbf..2bcbefc8dbf 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
index 02fa2716987..02fa2716987 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
index 79ede15df8f..9dbed05523c 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
@@ -4,8 +4,6 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
   configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
   propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
new file mode 100644
index 00000000000..6324a27b612
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "libgweather-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz;
+    sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
index b39e1f6fa56..b39e1f6fa56 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
index 9f1f3096533..9f1f3096533 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
index cd440858946..cd440858946 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
index 5a8117528b6..5a8117528b6 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
index 4818d05517b..ebceb4ef706 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
-, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libudev, libinput
+, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
 , libgudev, xwayland }:
 
 stdenv.mkDerivation rec {
@@ -11,11 +11,17 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
 
+  propagatedBuildInputs = [
+    # required for pkgconfig to detect mutter-clutter
+    libXtst
+  ];
+
   buildInputs = with gnome3;
     [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
       gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
       gnome3.geocode_glib libudev libinput libgudev
-      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
+      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
+      libxkbcommon ];
 
   preFixup = ''
     wrapProgram "$out/bin/mutter" \
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
index dbdfd93f5e1..dbdfd93f5e1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
new file mode 100644
index 00000000000..579ee0689e8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "mutter-3.24.4";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz;
+    sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
index 93df1e7f283..93df1e7f283 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
index d508f148359..d508f148359 100644
--- a/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
index e1313999675..e1313999675 100644
--- a/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
new file mode 100644
index 00000000000..37c81a54a31
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "nautilus-3.24.2.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz;
+    sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/rest/default.nix b/pkgs/desktops/gnome-3/3.24/core/rest/default.nix
index d467cad93b4..d467cad93b4 100644
--- a/pkgs/desktops/gnome-3/3.22/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/rest/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
index fb010756f29..fb010756f29 100644
--- a/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
new file mode 100644
index 00000000000..a713aef6f7f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "sushi-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz;
+    sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
index 63f36004bcd..63f36004bcd 100644
--- a/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
index 6e62a2d522f..b3e9e5dd1fe 100644
--- a/pkgs/desktops/gnome-3/3.22/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
 
   GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
-
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/src.nix b/pkgs/desktops/gnome-3/3.24/core/totem/src.nix
new file mode 100644
index 00000000000..2067945f99e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/totem/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "totem-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz;
+    sha256 = "9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
index b086e386059..a60c38015c0 100644
--- a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
@@ -5,7 +5,8 @@
 , evolution_data_server, gst_all_1, poppler
 , icu, taglib, libjpeg, libtiff, giflib, libcue
 , libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
+, libpng, libexif, libgsf, libuuid, bzip2
+, libsoup, json_glib, libseccomp }:
 
 stdenv.mkDerivation rec {
 
@@ -24,7 +25,9 @@ stdenv.mkDerivation rec {
                   upower libnotify evolution_data_server gnome3.libgee
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
                   poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid ];
+                  exempi networkmanager libpng libexif libgsf libuuid
+                  libsoup json_glib libseccomp
+                ];
 
   preConfigure = ''
     substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
new file mode 100644
index 00000000000..7a9b9ce3e38
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "tracker-1.12.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz;
+    sha256 = "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.24/core/vino/default.nix
index bd446623fc2..bd446623fc2 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vino/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/src.nix b/pkgs/desktops/gnome-3/3.24/core/vino/src.nix
index 8cf55272da9..8cf55272da9 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vino/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vino/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
index 4f56439311e..4f56439311e 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
index 09b83e14923..7eabe6ad9d4 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
-                  gnome3.gtk3 ncurses vala_0_32 libxml2 ];
+                  gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ];
 
   propagatedBuildInputs = [ gnutls pcre2 ];
 
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
index 4c5696d4e17..4c5696d4e17 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
index 70ef7faa782..70ef7faa782 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/ng.nix b/pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
index ad0188b0053..ad0188b0053 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/ng.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/src.nix b/pkgs/desktops/gnome-3/3.24/core/vte/src.nix
new file mode 100644
index 00000000000..841798848e6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "vte-0.48.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz;
+    sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
index 9111802eb6a..9111802eb6a 100644
--- a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
index f03c6d1bc31..f03c6d1bc31 100644
--- a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
index 0a3976f35a1..0a3976f35a1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
index de5d68d1fab..de5d68d1fab 100644
--- a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
index 4ee79bbc3dc..4ee79bbc3dc 100644
--- a/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
index 7f38bab736f..7f38bab736f 100644
--- a/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
index 80f2dde534e..80f2dde534e 100644
--- a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
new file mode 100644
index 00000000000..cb12262725a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "zenity-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz;
+    sha256 = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.24/default.nix
index 1944cc98cfb..e3d53d3a24e 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/default.nix
@@ -13,7 +13,7 @@ let
 
   callPackage = pkgs.newScope self;
 
-  version = "3.22";
+  version = "3.24";
   maintainers = with pkgs.lib.maintainers; [ lethalman ];
 
   corePackages = with gnome3; [
@@ -255,10 +255,7 @@ let
 
   accerciser = callPackage ./apps/accerciser { };
 
-  bijiben = callPackage ./apps/bijiben {
-    # https://bugzilla.gnome.org/show_bug.cgi?id=728293
-    webkitgtk = pkgs.webkitgtk24x-gtk3;
-  };
+  bijiben = callPackage ./apps/bijiben { };
 
   cheese = callPackage ./apps/cheese { };
 
diff --git a/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
index a1b38b21869..a1b38b21869 100644
--- a/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
index 6a50834f105..6a50834f105 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
index bbb7696d91c..bbb7696d91c 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
index f6e67be8d53..f6e67be8d53 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
new file mode 100644
index 00000000000..b13de444c7e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "devhelp-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz;
+    sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
index 156d91b3eae..156d91b3eae 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
index c8b65884e08..c8b65884e08 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
index 50960f41a31..50960f41a31 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
index 7f39aabda02..7f39aabda02 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
index 83423122110..83423122110 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch
+++ b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
index cf200cb3292..cf200cb3292 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
index e3413b22497..e3413b22497 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch
+++ b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
index 2fcf639fe1b..2fcf639fe1b 100644
--- a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
index 9e5d256741f..9e5d256741f 100644
--- a/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
index fbe6505b9a0..fbe6505b9a0 100644
--- a/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
index 50a7d2906a7..50a7d2906a7 100644
--- a/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
index 597db69a5dc..597db69a5dc 100644
--- a/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
index 68228750cd8..68228750cd8 100644
--- a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
index e0e11bc2124..e0e11bc2124 100644
--- a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
index a96dae3c12c..a96dae3c12c 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
new file mode 100644
index 00000000000..3fb218ab602
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-chess-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz;
+    sha256 = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
index dc2289daff8..dc2289daff8 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
index 447bc1eff13..447bc1eff13 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
index 43db32e8857..43db32e8857 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
index c021136ee30..c021136ee30 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
index c55650e705a..c55650e705a 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
new file mode 100644
index 00000000000..4b0e85fdef1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-mines-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz;
+    sha256 = "e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
index cf228218878..cf228218878 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
new file mode 100644
index 00000000000..133e9651fa7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-nibbles-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz;
+    sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
index 9eafb166eee..9eafb166eee 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
index 17fabe2de26..17fabe2de26 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
index c8ba82c7246..c8ba82c7246 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
new file mode 100644
index 00000000000..597196a5ec8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-sudoku-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz;
+    sha256 = "04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
index 78eaa23e63b..78eaa23e63b 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
index 6828e56a911..6828e56a911 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
index d6feab93dba..d6feab93dba 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
index e79b18263b9..e79b18263b9 100644
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
index bd6be7d43c5..bd6be7d43c5 100644
--- a/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix b/pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
index 47989cf2eae..47989cf2eae 100644
--- a/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
index 1b6f08d1fd6..1b6f08d1fd6 100644
--- a/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
index 6c20a8f7844..6c20a8f7844 100644
--- a/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
index 8ec54b48972..8ec54b48972 100644
--- a/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
new file mode 100644
index 00000000000..2a26df6615b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "lightsoff-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz;
+    sha256 = "5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
index f319608764d..f319608764d 100644
--- a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
index 57bdb4771dd..57bdb4771dd 100644
--- a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
index a4cad01488d..a4cad01488d 100644
--- a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
new file mode 100644
index 00000000000..7fa5f724de2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "swell-foop-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz;
+    sha256 = "1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/default.nix b/pkgs/desktops/gnome-3/3.24/games/tali/default.nix
index c2b1f585712..c2b1f585712 100644
--- a/pkgs/desktops/gnome-3/3.22/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/tali/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/src.nix b/pkgs/desktops/gnome-3/3.24/games/tali/src.nix
index 108144cc3ee..108144cc3ee 100644
--- a/pkgs/desktops/gnome-3/3.22/games/tali/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/tali/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/installer.nix b/pkgs/desktops/gnome-3/3.24/installer.nix
index 4999e1f3343..4999e1f3343 100644
--- a/pkgs/desktops/gnome-3/3.22/installer.nix
+++ b/pkgs/desktops/gnome-3/3.24/installer.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
index c229cc96094..c229cc96094 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/default.nix b/pkgs/desktops/gnome-3/3.24/misc/california/default.nix
index ca0450dc7f9..ca0450dc7f9 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/california/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
index e0622b17621..e0622b17621 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
index 69d89bd5879..69d89bd5879 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
index 46fa9bc39e5..46fa9bc39e5 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
index b3646abd6dd..b3646abd6dd 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
new file mode 100644
index 00000000000..9c6dd2148cc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gitg-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gitg/3.24/gitg-3.24.0.tar.xz;
+    sha256 = "3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
index 3a35a87ceaf..3a35a87ceaf 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
new file mode 100644
index 00000000000..ee2ade83ee6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-autoar-0.2.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz;
+    sha256 = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
index ee3dd60e59a..ee3dd60e59a 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
new file mode 100644
index 00000000000..992badf1f4f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-packagekit-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz;
+    sha256 = "8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
index 7a16d2c24e5..d236730282a 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
@@ -1,6 +1,6 @@
-From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001
+From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sat, 1 Aug 2015 21:01:11 +0200
+Date: Sun, 25 Jun 2017 11:32:30 +0100
 Subject: [PATCH 1/3] Search for themes and icons in system data dirs
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 1/3] Search for themes and icons in system data dirs
  gtweak/utils.py                        | 17 +++++++++++++++++
  3 files changed, 23 insertions(+), 18 deletions(-)
 
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index 97751ed..db89b85 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
 @@ -26,7 +26,7 @@ from gi.repository import Gtk
  from gi.repository import GLib
  
@@ -22,7 +22,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
  from gtweak.gshellwrapper import GnomeShellFactory
  from gtweak.gsettings import GSettingsSetting
-@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
          if gtk_ver % 2: # Want even number
              gtk_ver += 1
  
@@ -34,7 +34,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.exists(os.path.join(d, "gtk-2.0")) and \
                          (os.path.exists(os.path.join(d, "gtk-3.0")) or \
                           os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
-@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTw
+@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_icon_themes(self):
@@ -46,7 +46,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.isdir(d) and \
  			os.path.exists(os.path.join(d, "index.theme")))
          return valid
-@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsCombo
+@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_cursor_themes(self):
@@ -58,20 +58,20 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.isdir(d) and \
                          os.path.exists(os.path.join(d, "cursors")))
          return valid
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
+diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
+index 69c4b7e..b06900c 100644
+--- a/gtweak/tweaks/tweak_group_keymouse.py
++++ b/gtweak/tweaks/tweak_group_keymouse.py
+@@ -21,7 +21,7 @@ from gi.repository import GLib
  
  import gtweak
+ from gtweak.gshellwrapper import GnomeShellFactory
 -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
 +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
  from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
  
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+ _shell = GnomeShellFactory().get_shell()
+@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_key_themes(self):
@@ -83,10 +83,10 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
                      os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
                      os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
          return valid
-Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+diff --git a/gtweak/utils.py b/gtweak/utils.py
+index 39f8833..b0993b6 100644
+--- a/gtweak/utils.py
++++ b/gtweak/utils.py
 @@ -21,6 +21,7 @@ import tempfile
  import shutil
  import subprocess
@@ -95,7 +95,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  
  import gtweak
  from gtweak.gsettings import GSettingsSetting
-@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, bl
+@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True):
          stdout, stderr = p.communicate()
          return stdout, stderr, p.returncode
  
@@ -118,3 +118,6 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  @singleton
  class AutostartManager:
  
+-- 
+2.12.2
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
index 5ddc13949cb..40c0969d588 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
@@ -1,6 +1,6 @@
-From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001
+From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sat, 1 Aug 2015 21:26:57 +0200
+Date: Sun, 25 Jun 2017 11:35:10 +0100
 Subject: [PATCH 2/3] Don't show multiple entries for a single theme
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 2/3] Don't show multiple entries for a single theme
  gtweak/utils.py                        | 16 ++++++++++++++++
  3 files changed, 22 insertions(+), 6 deletions(-)
 
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index db89b85..4697fe3 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
 @@ -26,7 +26,7 @@ from gi.repository import Gtk
  from gi.repository import GLib
  
@@ -22,7 +22,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
  from gtweak.gshellwrapper import GnomeShellFactory
  from gtweak.gsettings import GSettingsSetting
-@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
                      os.path.exists(os.path.join(d, "gtk-2.0")) and \
                          (os.path.exists(os.path.join(d, "gtk-3.0")) or \
                           os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
@@ -31,7 +31,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class IconThemeSwitcher(GSettingsComboTweak):
      def __init__(self, **options):
-@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw
+@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("icons"), lambda d:
                      os.path.isdir(d) and \
  			os.path.exists(os.path.join(d, "index.theme")))
@@ -40,7 +40,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class CursorThemeSwitcher(GSettingsComboTweak):
      def __init__(self, **options):
-@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo
+@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("icons"), lambda d:
                      os.path.isdir(d) and \
                          os.path.exists(os.path.join(d, "cursors")))
@@ -49,20 +49,20 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class ShellThemeTweak(Gtk.Box, Tweak):
  
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
+diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
+index b06900c..d34793e 100644
+--- a/gtweak/tweaks/tweak_group_keymouse.py
++++ b/gtweak/tweaks/tweak_group_keymouse.py
+@@ -21,7 +21,7 @@ from gi.repository import GLib
  
  import gtweak
+ from gtweak.gshellwrapper import GnomeShellFactory
 -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
 +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
  from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
  
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+ _shell = GnomeShellFactory().get_shell()
+@@ -44,7 +44,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("themes"), lambda d:
                      os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
                      os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
@@ -71,10 +71,10 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
  
  TWEAK_GROUPS = [
      ListBoxTweakGroup(_("Keyboard and Mouse"),
-Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+diff --git a/gtweak/utils.py b/gtweak/utils.py
+index b0993b6..0d995bc 100644
+--- a/gtweak/utils.py
++++ b/gtweak/utils.py
 @@ -133,6 +133,22 @@ def get_resource_dirs(resource):
  
      return [dir for dir in dirs if os.path.isdir(dir)]
@@ -98,3 +98,6 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  @singleton
  class AutostartManager:
  
+-- 
+2.12.2
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
index b25b2d6dc4a..5082a55387a 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
@@ -1,19 +1,17 @@
-From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001
+From ba2eb4be6c69ee8206e0139268c896e6a2b278d8 Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sun, 2 Aug 2015 12:01:20 +0200
+Date: Sun, 25 Jun 2017 11:50:33 +0100
 Subject: [PATCH 3/3] Create config dir if it doesn't exist
 
-Otherwise gnome-tweak-tool can't enable the dark theme and fails
-without a clear error message.
 ---
  gtweak/gtksettings.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
-index bcec9f1..f39991b 100644
+index a0c163b..f5883ec 100644
 --- a/gtweak/gtksettings.py
 +++ b/gtweak/gtksettings.py
-@@ -35,6 +35,10 @@ class GtkSettingsManager:
+@@ -36,6 +36,10 @@ class GtkSettingsManager:
      def _get_keyfile(self):
          keyfile = None
          try:
@@ -25,5 +23,5 @@ index bcec9f1..f39991b 100644
              keyfile.load_from_file(self._path, 0)
          except MemoryError:
 -- 
-2.7.0
+2.12.2
 
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
index 5a1baa5e330..1df3c1ffdb7 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
@@ -1,11 +1,9 @@
 { stdenv, intltool, fetchurl, atk
 , pkgconfig, gtk3, glib, libsoup
-, bash, makeWrapper, itstool, libxml2, python2Packages
+, bash, itstool, libxml2, python2Packages
 , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
-let
-  pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   doCheck = true;
@@ -15,16 +13,17 @@ in stdenv.mkDerivation rec {
   makeFlags = [ "DESTDIR=/" ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gnome3.gsettings_desktop_schemas file
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  libnotify gnome3.gnome_shell
+                  libnotify gnome3.gnome_shell python2Packages.pygobject3
                   libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop wrapGAppsHook
-                  python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
+                  gnome3.gnome_desktop wrapGAppsHook gobjectIntrospection
+                ];
 
-  PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PYTHONPATH : "$out/${python2Packages.python.sitePackages}:$PYTHONPATH")
+  '';
 
   patches = [
     ./find_gsettings.patch
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
index 3e68c04cb3a..3e68c04cb3a 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
new file mode 100644
index 00000000000..0af83053fa8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-tweak-tool-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz;
+    sha256 = "19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
index c0bd2fed3f2..c0bd2fed3f2 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
index 99766ad898e..2bfc6c73eb4 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala_0_32, glib, gjs, mutter
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.20.4";
+  version = "3.24.2";
   name = "gpaste-${version}";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax";
+    sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340";
   };
 
-  buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib
+  buildInputs = [ autoreconfHook pkgconfig vala_0_32 glib gjs mutter
                   gtk3 gnome3.gnome_control_center dbus
                   clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];
 
-  preConfigure = "intltoolize -f";
-
   configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
                      "--with-dbusservicesdir=$(out)/share/dbus-1/services"
                      "--with-systemduserunitdir=$(out)/etc/systemd/user" ];
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
index 3024d3ed59f..44573d1a5bb 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
@@ -3,7 +3,9 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ];
+  propagatedBuildInputs = [ enchant ]; # required for pkgconfig
+
+  buildInputs = [ pkgconfig glib gtk3 isocodes vala ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
index 850e13fb011..fd55e654d55 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
@@ -1,10 +1,10 @@
 fetchurl: rec {
-  major = "1.2";
+  major = "1.4";
   minor = "1";
   name = "gspell-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";
-    sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z";
+    sha256 = "1ghh1xdzf04mfgb13zqpj88krpa44xv2vbyhm6k017kzrpz8hbs4";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
index 89703b61932..89703b61932 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
index 21876ec9c39..21876ec9c39 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
index 98b71c9d9c9..98b71c9d9c9 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
index 2e5b0a4af84..2e5b0a4af84 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix b/pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
index 8812ccc8ccd..8812ccc8ccd 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
index 6915ede4ad5..6915ede4ad5 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
index b9abde42cbd..b9abde42cbd 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
index b8648012573..9988541e0f5 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
@@ -4,11 +4,11 @@ let
   majorVersion = "1.9";
 in
 stdenv.mkDerivation rec {
-  name = "libmediaart-${majorVersion}.0";
+  name = "libmediaart-${majorVersion}.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
-    sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
+    sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v";
   };
 
   buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
index a5dd1480d3d..a5dd1480d3d 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
index 37cdfc730ab..37cdfc730ab 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
index 8a99932e830..bda356cf4c3 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
@@ -7,24 +7,24 @@ name="chrome-gnome-shell";
     rev = "7d99523e90805cb65027cc2f5f1191a957dcf276";
     sha256 = "0qc34dbhsz5yf4z5bx6py08h561rcxw9928drgk9256g3vnygnbc";
   };
- 
+
  buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection
  python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook];
 
  preConfigure = ''
- mkdir build usr etc
- cd build
- ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../
- substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc"  
+   mkdir build usr etc
+   cd build
+   ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../
+   substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc"
  '';
 
  postInstall = ''
     rm $out/etc/opt/chrome/policies/managed/chrome-gnome-shell.json
     rm $out/etc/chromium/policies/managed/chrome-gnome-shell.json
     wrapProgram $out/usr/bin/chrome-gnome-shell \
-      --prefix PATH '"${dbus}/bin/dbus:$PATH"' \
-      --prefix PATH '"${gnome3.gnome_shell}:$PATH"' \
-      --prefix PYTHONPATH : "$PYTHONPATH" 
+      --prefix PATH : '"${dbus}/bin"' \
+      --prefix PATH : '"${gnome3.gnome_shell}/bin"' \
+      --prefix PYTHONPATH : "$PYTHONPATH"
 
   '';
 
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 4d5b29f6cc6..4d788e909e2 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-dash-to-dock-${version}";
-  version = "v57";
+  version = "v60";
 
   src = fetchFromGitHub {
     owner = "micheleg";
     repo = "dash-to-dock";
-    rev = "97f6a0bb95b9f87d7a34a074c9b3624b65111794";
-    sha256 = "0b9i89hpn9k63zcrbl4bhs7qfb70wh09870fwv2ik7hajm64kynn";
+    rev = "extensions.gnome.org-" + version;
+    sha256 = "0w9km1zcxcskrsfr392zx945k227qajnw09pxc20d1vwv78wlgy3";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 45be1d8710d..3967a8c9ca2 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   name = "mate-themes-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = gnome3.version;
+  # There is no 3.24 release.
+  major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22";
   minor-ver = {
     "3.20" = "22";
     "3.22" = "13";
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 03853192531..4230e1e7d6e 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib
 , gtk_doc, autoconf, automake, libtool, libarchive, libyaml
 , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
-, libuuid, json_glib, autoconf-archive
+, libuuid, json_glib, autoconf-archive, gperf
 }:
 
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.6.3";
+  name = "appstream-glib-0.6.13";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "12l0vzhi9vpyrnf7vrpq21rb26mb6yskp5zgngdjyjanwhzmc617";
+    sha256 = "1csscszdp1imd0hiib6xx7mfylfl1r64xmma14p5jq1yprprpa9h";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool autoconf-archive ];
   buildInputs = [ glib gtk_doc gettext sqlite libsoup
                   gcab attr acl docbook_xsl libuuid json_glib
-                  libarchive libyaml gobjectIntrospection ];
+                  libarchive libyaml gobjectIntrospection gperf ];
   propagatedBuildInputs = [ gtk3 ];
   configureScript = "./autogen.sh";
 
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 545612d5c15..54a84487671 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.24";
+  name = "babl-0.1.28";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "02wxyaa9kjfypmg31avp2dxh16sfx9701ww6dmp0ggz5vnng2as7";
+    sha256 = "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3";
   };
 
   meta = with stdenv.lib; { 
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 41c7f8db6d2..2b5f7069681 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   major = "3.0";
-  minor = "20";
+  minor = "24";
   name = "clutter-gst-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
-    sha256 = "1jb6q0f6vbh8nskz88siny70pm43wbnw2wzr2klsyb9axn3if0d0";
+    sha256 = "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9";
   };
 
   propagatedBuildInputs = [ clutter gtk3 glib cogl ];
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index a0479d9d73c..3292c8e353f 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
+, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, 
 gobjectIntrospection, gtk3
 }:
 
 let
   ver_maj = "1.26";
-  ver_min = "0";
+  ver_min = "2";
 in
 stdenv.mkDerivation rec {
   name = "clutter-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
+    sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
   };
 
   buildInputs = [ gtk3 ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
+      atk json_glib gobjectIntrospection libxcb
     ];
 
   configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
index df68eecd137..48b1e47e0ed 100644
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -2,11 +2,11 @@
 , librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }:
 
 stdenv.mkDerivation rec {
-  name = "gegl-0.3.6";
+  name = "gegl-0.3.18";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
-    sha256 = "08m7dlf2kwmp7jw3qskwxas192swhn1g4jcd8aldg9drfjygprvh";
+    sha256 = "1ywihjav9yhmsvbrdyx9c5q71rqdkjg8l66ywca6s4yydvr8x1fp";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 9aba42fdf4b..433a1722e76 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, libxslt }:
+{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2,
+  libxslt, glib_networking }:
 
 stdenv.mkDerivation rec {
   name = "geoclue-0.12.0";
@@ -7,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
   };
 
-  buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt ];
+  buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt glib_networking ];
 
   propagatedBuildInputs = [dbus glib dbus_glib];
 
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 071941d66c3..e76e48ad8fc 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -43,7 +43,7 @@ let
   '';
 
   ver_maj = "2.52";
-  ver_min = "1";
+  ver_min = "3";
 in
 
 stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f";
+    sha256 = "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 4773cc38000..4c1f6135b49 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -7,8 +7,8 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.50";
-  ver_min = "0";
+  ver_maj = "1.52";
+  ver_min = "1";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5";
+    sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 4037de5a9cf..67302f330b9 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite
-, clutter_gtk, libsoup /*, libmemphis */ }:
+, clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
   major = "0.12";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildInputs = [ pkgconfig gobjectIntrospection ];
 
   propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
 
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 22ed76b9e59..4673e5461d3 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, requests, pyjwt }:
+, requests, pyjwt, dateutil }:
 
 buildPythonPackage rec {
   pname = "adal";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325";
   };
 
-  propagatedBuildInputs =  [ requests pyjwt ];
+  propagatedBuildInputs =  [ requests pyjwt dateutil ];
 
   meta = with stdenv.lib; {
     description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 984b1184434..ce7210391c6 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
 
 buildPythonPackage rec {
-  major = "3.22";
-  minor = "0";
+  major = "3.24";
+  minor = "1";
   name = "pygobject-${major}.${minor}";
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
-    sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7";
+    sha256 = "1zdzznrj2s1gsrv2z4r0n88fzba8zjc1n2r313xi77lhl1daja56";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 222b04db0d0..46f3786a6df 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, bash-completion
 , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
-, gtk_doc, gobjectIntrospection, argyllcms
+, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook
 , libgudev, sane-backends }:
 
 stdenv.mkDerivation rec {
@@ -10,9 +10,16 @@ stdenv.mkDerivation rec {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
     sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
   };
+   nativeBuildInputs = [ autoreconfHook intltool ];
 
   enableParallelBuilding = true;
 
+  # Version mismatch requires intltoolize to overwrite
+  # with newer version.
+  preConfigure = ''
+    intltoolize --force
+  '';
+
   configureFlags = [
     "--enable-sane"
     "--with-udevrulesdir=$(out)/lib/udev/rules.d"
@@ -21,12 +28,13 @@ stdenv.mkDerivation rec {
     "--disable-bash-completion"
   ];
 
+
   # don't touch /var at install time, colord creates what it needs at runtime
   postPatch = ''
     sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
   '';
 
-  buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
+  buildInputs = [ glib polkit pkgconfig gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
                   bash-completion argyllcms libgudev sane-backends ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e51bc545aec..f76948f7086 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17749,9 +17749,9 @@ with pkgs;
     libcanberra = self.libcanberra_gtk2;
   });
 
-  gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { });
+  gnome3_24 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.24 { });
 
-  gnome3 = gnome3_22;
+  gnome3 = gnome3_24;
 
   gnomeExtensions = {
     caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };