From 69698ec11cc0619d84b14764fa9e708fe7e7223c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 24 Sep 2017 13:15:50 +0200
Subject: [PATCH] gnome3: only maintain single GNOME 3 package set (#29397)

* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.
---
 maintainers/scripts/gnome.sh                  |  8 ++---
 nixos/maintainers/option-usages.nix           |  1 -
 .../desktops/gnome3/evolution-data-server.nix |  9 ++----
 .../services/desktops/gnome3/gnome-disks.nix  |  7 ++--
 .../desktops/gnome3/gnome-documents.nix       |  7 ++--
 .../desktops/gnome3/gnome-keyring.nix         |  7 ++--
 .../desktops/gnome3/gnome-online-accounts.nix |  7 ++--
 .../desktops/gnome3/gnome-online-miners.nix   |  7 ++--
 .../desktops/gnome3/gnome-terminal-server.nix |  9 ++----
 .../desktops/gnome3/gnome-user-share.nix      |  7 ++--
 .../services/desktops/gnome3/gpaste.nix       | 13 +++-----
 .../modules/services/desktops/gnome3/gvfs.nix |  9 ++----
 .../services/desktops/gnome3/seahorse.nix     |  7 ++--
 .../services/desktops/gnome3/sushi.nix        |  7 ++--
 .../services/desktops/gnome3/tracker.nix      |  9 ++----
 .../services/x11/desktop-managers/gnome3.nix  | 32 +++++++------------
 .../services/x11/display-managers/gdm.nix     | 15 ++++-----
 .../{3.24 => }/apps/accerciser/default.nix    |  0
 .../{3.24 => }/apps/accerciser/src.nix        |  0
 .../{3.24 => }/apps/bijiben/default.nix       |  0
 .../gnome-3/{3.24 => }/apps/bijiben/src.nix   |  0
 .../{3.24 => }/apps/cheese/default.nix        |  0
 .../gnome-3/{3.24 => }/apps/cheese/src.nix    |  0
 .../{3.24 => }/apps/evolution/default.nix     |  0
 .../gnome-3/{3.24 => }/apps/evolution/src.nix |  0
 .../{3.24 => }/apps/file-roller/default.nix   |  0
 .../{3.24 => }/apps/file-roller/src.nix       |  0
 .../gnome-3/{3.24 => }/apps/gedit/default.nix |  0
 .../gnome-3/{3.24 => }/apps/gedit/src.nix     |  0
 .../gnome-3/{3.24 => }/apps/ghex/default.nix  |  0
 .../gnome-3/{3.24 => }/apps/ghex/src.nix      |  0
 .../gnome-3/{3.24 => }/apps/glade/default.nix |  0
 .../gnome-3/{3.24 => }/apps/glade/src.nix     |  0
 .../{3.24 => }/apps/gnome-boxes/default.nix   |  0
 .../{3.24 => }/apps/gnome-boxes/src.nix       |  0
 .../apps/gnome-calendar/default.nix           |  0
 .../{3.24 => }/apps/gnome-calendar/src.nix    |  0
 .../apps/gnome-characters/default.nix         |  0
 .../{3.24 => }/apps/gnome-characters/src.nix  |  0
 .../{3.24 => }/apps/gnome-clocks/default.nix  |  0
 .../{3.24 => }/apps/gnome-clocks/src.nix      |  0
 .../apps/gnome-documents/default.nix          |  0
 .../{3.24 => }/apps/gnome-documents/src.nix   |  0
 .../gnome-getting-started-docs/default.nix    |  0
 .../apps/gnome-getting-started-docs/src.nix   |  0
 .../{3.24 => }/apps/gnome-logs/default.nix    |  0
 .../{3.24 => }/apps/gnome-logs/src.nix        |  0
 .../{3.24 => }/apps/gnome-maps/default.nix    |  0
 .../{3.24 => }/apps/gnome-maps/src.nix        |  0
 .../{3.24 => }/apps/gnome-music/default.nix   |  0
 .../{3.24 => }/apps/gnome-music/src.nix       |  0
 .../{3.24 => }/apps/gnome-nettool/default.nix |  0
 .../{3.24 => }/apps/gnome-photos/default.nix  |  0
 .../{3.24 => }/apps/gnome-photos/src.nix      |  0
 .../{3.24 => }/apps/gnome-weather/default.nix |  0
 .../{3.24 => }/apps/gnome-weather/src.nix     |  0
 .../apps/nautilus-sendto/default.nix          |  0
 .../{3.24 => }/apps/polari/default.nix        |  0
 .../gnome-3/{3.24 => }/apps/polari/src.nix    |  0
 .../{3.24 => }/apps/seahorse/default.nix      |  0
 .../gnome-3/{3.24 => }/apps/seahorse/src.nix  |  0
 .../{3.24 => }/apps/vinagre/default.nix       |  0
 .../gnome-3/{3.24 => }/apps/vinagre/src.nix   |  0
 .../core/adwaita-icon-theme/default.nix       |  0
 .../core/adwaita-icon-theme/src.nix           |  0
 .../{3.24 => }/core/baobab/default.nix        |  0
 .../gnome-3/{3.24 => }/core/baobab/src.nix    |  0
 .../{3.24 => }/core/caribou/default.nix       |  0
 .../{3.24 => }/core/dconf-editor/default.nix  |  0
 .../{3.24 => }/core/dconf-editor/src.nix      |  0
 .../gnome-3/{3.24 => }/core/dconf/default.nix |  0
 .../{3.24 => }/core/empathy/default.nix       |  0
 .../gnome-3/{3.24 => }/core/eog/default.nix   |  0
 .../gnome-3/{3.24 => }/core/eog/src.nix       |  0
 .../{3.24 => }/core/epiphany/default.nix      |  0
 .../gnome-3/{3.24 => }/core/epiphany/src.nix  |  0
 .../{3.24 => }/core/evince/default.nix        |  0
 .../gnome-3/{3.24 => }/core/evince/src.nix    |  0
 .../core/evolution-data-server/default.nix    |  0
 .../core/evolution-data-server/src.nix        |  0
 .../gnome-3/{3.24 => }/core/folks/default.nix |  0
 .../gnome-3/{3.24 => }/core/gconf/default.nix |  0
 .../gnome-3/{3.24 => }/core/gcr/default.nix   |  0
 .../gnome-3/{3.24 => }/core/gcr/src.nix       |  0
 .../gnome-3/{3.24 => }/core/gdm/default.nix   |  0
 .../gdm/gdm-session-worker_xserver-path.patch |  0
 .../core/gdm/gdm-x-session_extra_args.patch   |  0
 .../core/gdm/gdm-x-session_path.patch         |  0
 .../{3.24 => }/core/gdm/sessions_dir.patch    |  0
 .../gnome-3/{3.24 => }/core/gdm/src.nix       |  0
 .../{3.24 => }/core/geocode-glib/default.nix  |  0
 .../{3.24 => }/core/geocode-glib/src.nix      |  0
 .../gnome-3/{3.24 => }/core/gjs/default.nix   |  0
 .../gnome-3/{3.24 => }/core/gjs/src.nix       |  0
 .../core/gnome-backgrounds/default.nix        |  0
 .../{3.24 => }/core/gnome-backgrounds/src.nix |  0
 .../core/gnome-bluetooth/default.nix          |  0
 .../{3.24 => }/core/gnome-bluetooth/src.nix   |  0
 .../core/gnome-calculator/default.nix         |  0
 .../{3.24 => }/core/gnome-calculator/src.nix  |  0
 .../{3.24 => }/core/gnome-common/default.nix  |  0
 .../{3.24 => }/core/gnome-common/src.nix      |  0
 .../core/gnome-contacts/default.nix           |  0
 .../core/gnome-contacts/gio_unix.patch        |  0
 .../{3.24 => }/core/gnome-contacts/src.nix    |  0
 .../core/gnome-control-center/default.nix     |  0
 .../core/gnome-control-center/src.nix         |  0
 .../{3.24 => }/core/gnome-desktop/default.nix |  0
 .../{3.24 => }/core/gnome-desktop/src.nix     |  0
 .../core/gnome-dictionary/default.nix         |  0
 .../{3.24 => }/core/gnome-dictionary/src.nix  |  0
 .../core/gnome-disk-utility/default.nix       |  0
 .../core/gnome-disk-utility/src.nix           |  0
 .../core/gnome-font-viewer/default.nix        |  0
 .../{3.24 => }/core/gnome-font-viewer/src.nix |  0
 .../{3.24 => }/core/gnome-keyring/default.nix |  0
 .../{3.24 => }/core/gnome-keyring/src.nix     |  0
 .../{3.24 => }/core/gnome-menus/default.nix   |  0
 .../core/gnome-online-accounts/default.nix    |  0
 .../core/gnome-online-accounts/src.nix        |  0
 .../core/gnome-online-miners/default.nix      |  0
 .../core/gnome-online-miners/src.nix          |  0
 .../core/gnome-screenshot/default.nix         |  0
 .../{3.24 => }/core/gnome-screenshot/src.nix  |  0
 .../{3.24 => }/core/gnome-session/default.nix |  0
 .../{3.24 => }/core/gnome-session/src.nix     |  0
 .../core/gnome-settings-daemon/default.nix    |  0
 .../core/gnome-settings-daemon/src.nix        |  0
 .../core/gnome-shell-extensions/default.nix   |  0
 .../core/gnome-shell-extensions/src.nix       |  0
 .../{3.24 => }/core/gnome-shell/default.nix   |  0
 .../{3.24 => }/core/gnome-shell/src.nix       |  0
 .../core/gnome-software/default.nix           |  0
 .../{3.24 => }/core/gnome-software/src.nix    |  0
 .../core/gnome-system-log/default.nix         |  0
 .../core/gnome-system-monitor/default.nix     |  0
 .../core/gnome-system-monitor/src.nix         |  0
 .../core/gnome-terminal/default.nix           |  0
 .../{3.24 => }/core/gnome-terminal/src.nix    |  0
 .../core/gnome-themes-standard/default.nix    |  0
 .../core/gnome-themes-standard/src.nix        |  0
 .../core/gnome-user-docs/default.nix          |  0
 .../{3.24 => }/core/gnome-user-docs/src.nix   |  0
 .../core/gnome-user-share/default.nix         |  0
 .../{3.24 => }/core/gnome-user-share/src.nix  |  0
 .../{3.24 => }/core/grilo-plugins/default.nix |  0
 .../gnome-3/{3.24 => }/core/grilo/default.nix |  0
 .../{3.24 => }/core/grilo/setup-hook.sh       |  0
 .../gsettings-desktop-schemas/default.nix     |  0
 .../core/gsettings-desktop-schemas/src.nix    |  0
 .../{3.24 => }/core/gsound/default.nix        |  0
 .../{3.24 => }/core/gtksourceview/default.nix |  0
 .../core/gtksourceview/nix_share_path.patch   |  0
 .../{3.24 => }/core/gtksourceview/src.nix     |  0
 .../core/gtksourceviewmm/default.nix          |  0
 .../{3.24 => }/core/gtksourceviewmm/src.nix   |  0
 .../{3.24 => }/core/gucharmap/default.nix     |  0
 .../gnome-3/{3.24 => }/core/gucharmap/src.nix |  0
 .../{3.24 => }/core/libcroco/default.nix      |  0
 .../{3.24 => }/core/libgdata/default.nix      |  0
 .../{3.24 => }/core/libgee/default.nix        |  0
 .../core/libgee/fix_introspection_paths.patch |  0
 .../{3.24 => }/core/libgepub/default.nix      |  0
 .../core/libgnome-keyring/default.nix         |  0
 .../{3.24 => }/core/libgnomekbd/default.nix   |  0
 .../{3.24 => }/core/libgnomekbd/src.nix       |  0
 .../{3.24 => }/core/libgweather/default.nix   |  0
 .../{3.24 => }/core/libgweather/src.nix       |  0
 .../{3.24 => }/core/libgxps/default.nix       |  0
 .../{3.24 => }/core/libpeas/default.nix       |  0
 .../gnome-3/{3.24 => }/core/libpeas/src.nix   |  0
 .../{3.24 => }/core/libzapojit/default.nix    |  0
 .../{3.24 => }/core/mutter/default.nix        |  0
 .../gnome-3/{3.24 => }/core/mutter/math.patch |  0
 .../gnome-3/{3.24 => }/core/mutter/src.nix    |  0
 .../gnome-3/{3.24 => }/core/mutter/x86.patch  |  0
 .../{3.24 => }/core/nautilus/default.nix      |  0
 .../core/nautilus/extension_dir.patch         |  0
 .../gnome-3/{3.24 => }/core/nautilus/src.nix  |  0
 .../gnome-3/{3.24 => }/core/rest/default.nix  |  0
 .../gnome-3/{3.24 => }/core/sushi/default.nix |  0
 .../gnome-3/{3.24 => }/core/sushi/src.nix     |  0
 .../core/totem-pl-parser/default.nix          |  0
 .../gnome-3/{3.24 => }/core/totem/default.nix |  0
 .../gnome-3/{3.24 => }/core/totem/src.nix     |  0
 .../{3.24 => }/core/tracker/default.nix       |  0
 .../gnome-3/{3.24 => }/core/tracker/src.nix   |  0
 .../gnome-3/{3.24 => }/core/vino/default.nix  |  0
 .../gnome-3/{3.24 => }/core/vino/src.nix      |  0
 .../gnome-3/{3.24 => }/core/vte/2.90.nix      |  0
 .../gnome-3/{3.24 => }/core/vte/default.nix   |  0
 .../core/vte/fix_g_test_init_calls.patch      |  0
 .../vte/fix_vteseq_n_lookup_declaration.patch |  0
 .../gnome-3/{3.24 => }/core/vte/ng.nix        |  0
 .../gnome-3/{3.24 => }/core/vte/src.nix       |  0
 .../{3.24 => }/core/yelp-tools/default.nix    |  0
 .../{3.24 => }/core/yelp-tools/src.nix        |  0
 .../{3.24 => }/core/yelp-xsl/default.nix      |  0
 .../gnome-3/{3.24 => }/core/yelp-xsl/src.nix  |  0
 .../gnome-3/{3.24 => }/core/yelp/default.nix  |  0
 .../gnome-3/{3.24 => }/core/yelp/src.nix      |  0
 .../{3.24 => }/core/zenity/default.nix        |  0
 .../gnome-3/{3.24 => }/core/zenity/src.nix    |  0
 pkgs/desktops/gnome-3/{3.24 => }/default.nix  |  0
 .../{3.24 => }/desktop/rarian/default.nix     |  0
 .../{3.24 => }/devtools/anjuta/default.nix    |  0
 .../{3.24 => }/devtools/anjuta/src.nix        |  0
 .../{3.24 => }/devtools/devhelp/default.nix   |  0
 .../{3.24 => }/devtools/devhelp/src.nix       |  0
 .../{3.24 => }/devtools/gdl/default.nix       |  0
 .../gnome-3/{3.24 => }/devtools/gdl/src.nix   |  0
 .../devtools/gnome-devel-docs/default.nix     |  0
 .../devtools/gnome-devel-docs/src.nix         |  0
 .../devtools/nemiver/bool_slot.patch          |  0
 .../{3.24 => }/devtools/nemiver/default.nix   |  0
 .../devtools/nemiver/safe_ptr.patch           |  0
 .../{3.24 => }/devtools/nemiver/src.nix       |  0
 .../{3.24 => }/games/aisleriot/default.nix    |  0
 .../{3.24 => }/games/aisleriot/src.nix        |  0
 .../{3.24 => }/games/five-or-more/default.nix |  0
 .../{3.24 => }/games/five-or-more/src.nix     |  0
 .../games/four-in-a-row/default.nix           |  0
 .../{3.24 => }/games/four-in-a-row/src.nix    |  0
 .../{3.24 => }/games/gnome-chess/default.nix  |  0
 .../{3.24 => }/games/gnome-chess/src.nix      |  0
 .../games/gnome-klotski/default.nix           |  0
 .../{3.24 => }/games/gnome-klotski/src.nix    |  0
 .../games/gnome-mahjongg/default.nix          |  0
 .../{3.24 => }/games/gnome-mahjongg/src.nix   |  0
 .../{3.24 => }/games/gnome-mines/default.nix  |  0
 .../{3.24 => }/games/gnome-mines/src.nix      |  0
 .../games/gnome-nibbles/default.nix           |  0
 .../{3.24 => }/games/gnome-nibbles/src.nix    |  0
 .../{3.24 => }/games/gnome-robots/default.nix |  0
 .../{3.24 => }/games/gnome-robots/src.nix     |  0
 .../{3.24 => }/games/gnome-sudoku/default.nix |  0
 .../{3.24 => }/games/gnome-sudoku/src.nix     |  0
 .../{3.24 => }/games/gnome-taquin/default.nix |  0
 .../{3.24 => }/games/gnome-taquin/src.nix     |  0
 .../games/gnome-tetravex/default.nix          |  0
 .../{3.24 => }/games/gnome-tetravex/src.nix   |  0
 .../{3.24 => }/games/hitori/default.nix       |  0
 .../gnome-3/{3.24 => }/games/hitori/src.nix   |  0
 .../{3.24 => }/games/iagno/default.nix        |  0
 .../gnome-3/{3.24 => }/games/iagno/src.nix    |  0
 .../{3.24 => }/games/lightsoff/default.nix    |  0
 .../{3.24 => }/games/lightsoff/src.nix        |  0
 .../{3.24 => }/games/quadrapassel/default.nix |  0
 .../{3.24 => }/games/quadrapassel/src.nix     |  0
 .../{3.24 => }/games/swell-foop/default.nix   |  0
 .../{3.24 => }/games/swell-foop/src.nix       |  0
 .../gnome-3/{3.24 => }/games/tali/default.nix |  0
 .../gnome-3/{3.24 => }/games/tali/src.nix     |  0
 .../desktops/gnome-3/{3.24 => }/installer.nix |  0
 ...d-with-evolution-data-server-3.13.90.patch |  0
 .../{3.24 => }/misc/california/default.nix    |  0
 .../gnome-3/{3.24 => }/misc/geary/default.nix |  0
 .../{3.24 => }/misc/gexiv2/default.nix        |  0
 .../{3.24 => }/misc/gfbgraph/default.nix      |  0
 .../gnome-3/{3.24 => }/misc/gitg/default.nix  |  0
 .../gnome-3/{3.24 => }/misc/gitg/src.nix      |  0
 .../{3.24 => }/misc/gnome-autoar/default.nix  |  0
 .../{3.24 => }/misc/gnome-autoar/src.nix      |  0
 .../misc/gnome-packagekit/default.nix         |  0
 .../{3.24 => }/misc/gnome-packagekit/src.nix  |  0
 ...themes-and-icons-in-system-data-dirs.patch |  0
 ...-multiple-entries-for-a-single-theme.patch |  0
 ...reate-config-dir-if-it-doesn-t-exist.patch |  0
 .../misc/gnome-tweak-tool/default.nix         |  0
 .../gnome-tweak-tool/find_gsettings.patch     |  0
 .../{3.24 => }/misc/gnome-tweak-tool/src.nix  |  0
 .../misc/gnome-video-effects/default.nix      |  0
 .../{3.24 => }/misc/gpaste/default.nix        |  0
 .../{3.24 => }/misc/gspell/default.nix        |  0
 .../gnome-3/{3.24 => }/misc/gspell/src.nix    |  0
 .../{3.24 => }/misc/gtkhtml/default.nix       |  0
 .../gnome-3/{3.24 => }/misc/gtkhtml/src.nix   |  0
 .../misc/libgames-support/default.nix         |  0
 .../{3.24 => }/misc/libgda/default.nix        |  0
 .../gnome-3/{3.24 => }/misc/libgda/src.nix    |  0
 .../{3.24 => }/misc/libgit2-glib/default.nix  |  0
 .../{3.24 => }/misc/libgit2-glib/src.nix      |  0
 .../{3.24 => }/misc/libmediaart/default.nix   |  0
 .../{3.24 => }/misc/pidgin/default.nix        |  0
 .../{3.24 => }/misc/pomodoro/default.nix      |  0
 pkgs/top-level/all-packages.nix               |  4 +--
 286 files changed, 56 insertions(+), 109 deletions(-)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/accerciser/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/accerciser/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/bijiben/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/bijiben/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/cheese/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/cheese/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/evolution/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/evolution/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/file-roller/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/file-roller/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gedit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gedit/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/ghex/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/ghex/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/glade/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/glade/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-boxes/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-boxes/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-calendar/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-calendar/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-characters/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-characters/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-clocks/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-clocks/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-documents/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-documents/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-getting-started-docs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-getting-started-docs/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-logs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-logs/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-maps/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-maps/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-music/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-music/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-nettool/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-photos/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-photos/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-weather/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/gnome-weather/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/nautilus-sendto/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/polari/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/polari/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/seahorse/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/seahorse/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/vinagre/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/apps/vinagre/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/adwaita-icon-theme/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/adwaita-icon-theme/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/baobab/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/baobab/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/caribou/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/dconf-editor/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/dconf-editor/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/dconf/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/empathy/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/eog/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/eog/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/epiphany/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/epiphany/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/evince/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/evince/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/evolution-data-server/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/evolution-data-server/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/folks/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gconf/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gcr/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gcr/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gdm/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gdm/gdm-session-worker_xserver-path.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gdm/gdm-x-session_extra_args.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gdm/gdm-x-session_path.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gdm/sessions_dir.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gdm/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/geocode-glib/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/geocode-glib/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gjs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gjs/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-backgrounds/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-backgrounds/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-bluetooth/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-bluetooth/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-calculator/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-calculator/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-common/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-common/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-contacts/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-contacts/gio_unix.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-contacts/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-control-center/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-control-center/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-desktop/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-desktop/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-dictionary/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-dictionary/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-disk-utility/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-disk-utility/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-font-viewer/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-font-viewer/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-keyring/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-keyring/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-menus/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-online-accounts/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-online-accounts/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-online-miners/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-online-miners/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-screenshot/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-screenshot/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-session/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-session/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-settings-daemon/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-settings-daemon/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-shell-extensions/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-shell-extensions/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-shell/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-shell/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-software/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-software/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-system-log/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-system-monitor/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-system-monitor/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-terminal/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-terminal/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-themes-standard/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-themes-standard/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-user-docs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-user-docs/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-user-share/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gnome-user-share/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/grilo-plugins/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/grilo/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/grilo/setup-hook.sh (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gsettings-desktop-schemas/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gsettings-desktop-schemas/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gsound/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gtksourceview/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gtksourceview/nix_share_path.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gtksourceview/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gtksourceviewmm/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gtksourceviewmm/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gucharmap/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/gucharmap/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libcroco/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgdata/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgee/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgee/fix_introspection_paths.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgepub/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgnome-keyring/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgnomekbd/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgnomekbd/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgweather/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgweather/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libgxps/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libpeas/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libpeas/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/libzapojit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/mutter/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/mutter/math.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/mutter/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/mutter/x86.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/nautilus/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/nautilus/extension_dir.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/nautilus/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/rest/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/sushi/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/sushi/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/totem-pl-parser/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/totem/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/totem/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/tracker/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/tracker/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/vino/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/vino/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/vte/2.90.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/vte/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/vte/fix_g_test_init_calls.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/vte/fix_vteseq_n_lookup_declaration.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/vte/ng.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/vte/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/yelp-tools/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/yelp-tools/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/yelp-xsl/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/yelp-xsl/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/yelp/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/yelp/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/zenity/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/core/zenity/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/desktop/rarian/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/anjuta/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/anjuta/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/devhelp/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/devhelp/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/gdl/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/gdl/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/gnome-devel-docs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/gnome-devel-docs/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/nemiver/bool_slot.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/nemiver/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/nemiver/safe_ptr.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/devtools/nemiver/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/aisleriot/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/aisleriot/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/five-or-more/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/five-or-more/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/four-in-a-row/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/four-in-a-row/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-chess/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-chess/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-klotski/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-klotski/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-mahjongg/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-mahjongg/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-mines/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-mines/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-nibbles/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-nibbles/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-robots/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-robots/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-sudoku/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-sudoku/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-taquin/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-taquin/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-tetravex/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/gnome-tetravex/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/hitori/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/hitori/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/iagno/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/iagno/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/lightsoff/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/lightsoff/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/quadrapassel/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/quadrapassel/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/swell-foop/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/swell-foop/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/tali/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/games/tali/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/installer.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/california/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/geary/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gexiv2/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gfbgraph/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gitg/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gitg/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-autoar/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-autoar/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-packagekit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-packagekit/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-tweak-tool/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-tweak-tool/find_gsettings.patch (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-tweak-tool/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gnome-video-effects/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gpaste/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gspell/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gspell/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gtkhtml/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/gtkhtml/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/libgames-support/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/libgda/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/libgda/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/libgit2-glib/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/libgit2-glib/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/libmediaart/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/pidgin/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.24 => }/misc/pomodoro/default.nix (100%)

diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh
index e5a8d606f1a3..f77dc5a9e64c 100755
--- a/maintainers/scripts/gnome.sh
+++ b/maintainers/scripts/gnome.sh
@@ -9,17 +9,15 @@ GNOME_FTP=ftp.gnome.org/pub/GNOME/sources
 NO_GNOME_MAJOR="ghex gtkhtml gdm"
 
 usage() {
-  echo "Usage: $0 gnome_dir <show project>|<update project>|<update-all> [major.minor]" >&2
-  echo "gnome_dir is for example pkgs/desktops/gnome-3/3.18" >&2
+  echo "Usage: $0 <show project>|<update project>|<update-all> [major.minor]" >&2
   exit 0
 }
 
-if [ "$#" -lt 2 ]; then
+if [ "$#" -lt 1 ]; then
   usage
 fi
 
-GNOME_TOP=$1
-shift
+GNOME_TOP=pkgs/desktops/gnome-3
 
 action=$1
 
diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 854ecf7eac51..7be0255b35ac 100644
--- a/nixos/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
@@ -77,7 +77,6 @@ let
   excludedOptions = [
     "boot.systemd.services"
     "systemd.services"
-    "environment.gnome3.packageSet"
     "kde.extraPackages"
   ];
   excludeOptions = list:
diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index 2db2e2fe1c34..86a47488d865 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,11 +30,11 @@ in
 
   config = mkIf config.services.gnome3.evolution-data-server.enable {
 
-    environment.systemPackages = [ gnome3.evolution_data_server ];
+    environment.systemPackages = [ pkgs.gnome3.evolution_data_server ];
 
-    services.dbus.packages = [ gnome3.evolution_data_server ];
+    services.dbus.packages = [ pkgs.gnome3.evolution_data_server ];
 
-    systemd.packages = [ gnome3.evolution_data_server ];
+    systemd.packages = [ pkgs.gnome3.evolution_data_server ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-disks.nix b/nixos/modules/services/desktops/gnome3/gnome-disks.nix
index 33c4bc49f982..139534cdb892 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-disks.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-disks.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-disks.enable {
 
-    environment.systemPackages = [ gnome3.gnome-disk-utility ];
+    environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ];
 
-    services.dbus.packages = [ gnome3.gnome-disk-utility ];
+    services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
index 88bbdadfcbdd..f6efb6684240 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-documents.enable {
 
-    environment.systemPackages = [ gnome3.gnome-documents ];
+    environment.systemPackages = [ pkgs.gnome3.gnome-documents ];
 
-    services.dbus.packages = [ gnome3.gnome-documents ];
+    services.dbus.packages = [ pkgs.gnome3.gnome-documents ];
 
     services.gnome3.gnome-online-accounts.enable = true;
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index a36643a1cfb3..2a68af5a7dd8 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -34,9 +31,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-keyring.enable {
 
-    environment.systemPackages = [ gnome3.gnome_keyring ];
+    environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];
 
-    services.dbus.packages = [ gnome3.gnome_keyring gnome3.gcr ];
+    services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
index 82d04c62c70d..0da4aca73ecb 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-online-accounts.enable {
 
-    environment.systemPackages = [ gnome3.gnome_online_accounts ];
+    environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];
 
-    services.dbus.packages = [ gnome3.gnome_online_accounts ];
+    services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
index 6acd633b62c9..d406bf6f5e39 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-online-miners.enable {
 
-    environment.systemPackages = [ gnome3.gnome-online-miners ];
+    environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ];
 
-    services.dbus.packages = [ gnome3.gnome-online-miners ];
+    services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
index 384cede679c6..3ac767bfa00d 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,11 +30,11 @@ in
 
   config = mkIf config.services.gnome3.gnome-terminal-server.enable {
 
-    environment.systemPackages = [ gnome3.gnome_terminal ];
+    environment.systemPackages = [ pkgs.gnome3.gnome_terminal ];
 
-    services.dbus.packages = [ gnome3.gnome_terminal ];
+    services.dbus.packages = [ pkgs.gnome3.gnome_terminal ];
 
-    systemd.packages = [ gnome3.gnome_terminal ];
+    systemd.packages = [ pkgs.gnome3.gnome_terminal ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
index e5c94cff7c84..1f6ce2ae968e 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,9 +30,9 @@ in
 
   config = mkIf config.services.gnome3.gnome-user-share.enable {
 
-    environment.systemPackages = [ gnome3.gnome-user-share ];
+    environment.systemPackages = [ pkgs.gnome3.gnome-user-share ];
 
-    services.xserver.displayManager.sessionCommands = with gnome3; ''
+    services.xserver.displayManager.sessionCommands = with pkgs.gnome3; ''
       # Don't let gnome-control-center depend upon gnome-user-share
       export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name}
     '';
diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/services/desktops/gnome3/gpaste.nix
index 0954cd2713aa..5a8258775e0a 100644
--- a/nixos/modules/services/desktops/gnome3/gpaste.nix
+++ b/nixos/modules/services/desktops/gnome3/gpaste.nix
@@ -1,11 +1,8 @@
 # GPaste daemon.
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
   ###### interface
   options = {
@@ -22,9 +19,9 @@ in
 
   ###### implementation
   config = mkIf config.services.gnome3.gpaste.enable {
-    environment.systemPackages = [ gnome3.gpaste ];
-    services.dbus.packages = [ gnome3.gpaste ];
-    services.xserver.desktopManager.gnome3.sessionPath = [ gnome3.gpaste ];
-    systemd.packages = [ gnome3.gpaste ];
+    environment.systemPackages = [ pkgs.gnome3.gpaste ];
+    services.dbus.packages = [ pkgs.gnome3.gpaste ];
+    services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ];
+    systemd.packages = [ pkgs.gnome3.gpaste ];
   };
 }
diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix
index 6bbabe8d3c56..4e99d191f18c 100644
--- a/nixos/modules/services/desktops/gnome3/gvfs.nix
+++ b/nixos/modules/services/desktops/gnome3/gvfs.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,11 +30,11 @@ in
 
   config = mkIf config.services.gnome3.gvfs.enable {
 
-    environment.systemPackages = [ gnome3.gvfs ];
+    environment.systemPackages = [ pkgs.gnome3.gvfs ];
 
-    services.dbus.packages = [ gnome3.gvfs ];
+    services.dbus.packages = [ pkgs.gnome3.gvfs ];
 
-    systemd.packages = [ gnome3.gvfs ];
+    systemd.packages = [ pkgs.gnome3.gvfs ];
 
     services.udev.packages = [ pkgs.libmtp.bin ];
 
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
index 45925aaca9b9..e9ad738269e4 100644
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ b/nixos/modules/services/desktops/gnome3/seahorse.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -32,9 +29,9 @@ in
 
   config = mkIf config.services.gnome3.seahorse.enable {
 
-    environment.systemPackages = [ gnome3.seahorse ];
+    environment.systemPackages = [ pkgs.gnome3.seahorse ];
 
-    services.dbus.packages = [ gnome3.seahorse ];
+    services.dbus.packages = [ pkgs.gnome3.seahorse ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix
index ff7f484602c7..7a4389038b22 100644
--- a/nixos/modules/services/desktops/gnome3/sushi.nix
+++ b/nixos/modules/services/desktops/gnome3/sushi.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -32,9 +29,9 @@ in
 
   config = mkIf config.services.gnome3.sushi.enable {
 
-    environment.systemPackages = [ gnome3.sushi ];
+    environment.systemPackages = [ pkgs.gnome3.sushi ];
 
-    services.dbus.packages = [ gnome3.sushi ];
+    services.dbus.packages = [ pkgs.gnome3.sushi ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix
index dcaa60103a3b..c061f7890499 100644
--- a/nixos/modules/services/desktops/gnome3/tracker.nix
+++ b/nixos/modules/services/desktops/gnome3/tracker.nix
@@ -4,9 +4,6 @@
 
 with lib;
 
-let
-  gnome3 = config.environment.gnome3.packageSet;
-in
 {
 
   ###### interface
@@ -33,11 +30,11 @@ in
 
   config = mkIf config.services.gnome3.tracker.enable {
 
-    environment.systemPackages = [ gnome3.tracker ];
+    environment.systemPackages = [ pkgs.gnome3.tracker ];
 
-    services.dbus.packages = [ gnome3.tracker ];
+    services.dbus.packages = [ pkgs.gnome3.tracker ];
 
-    systemd.packages = [ gnome3.tracker ];
+    systemd.packages = [ pkgs.gnome3.tracker ];
 
   };
 
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0abdc27bbfc6..ecf0abb1efd2 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.xserver.desktopManager.gnome3;
-  gnome3 = config.environment.gnome3.packageSet;
 
   # Remove packages of ys from xs, based on their names
   removePackagesByName = xs: ys:
@@ -28,7 +27,7 @@ let
   nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}
     ''
      mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
-     cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+     cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
 
      ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
 
@@ -61,7 +60,7 @@ in {
         example = literalExample "[ pkgs.gnome3.gpaste ]";
         description = "Additional list of packages to be added to the session search path.
                        Useful for gnome shell extensions or gsettings-conditionated autostart.";
-        apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
+        apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ];
       };
 
       extraGSettingsOverrides = mkOption {
@@ -79,13 +78,6 @@ in {
       debug = mkEnableOption "gnome-session debug messages";
     };
 
-    environment.gnome3.packageSet = mkOption {
-      default = null;
-      example = literalExample "pkgs.gnome3_22";
-      description = "Which GNOME 3 package set to use.";
-      apply = p: if p == null then pkgs.gnome3 else p;
-    };
-
     environment.gnome3.excludePackages = mkOption {
       default = [];
       example = literalExample "[ pkgs.gnome3.totem ]";
@@ -169,26 +161,26 @@ in {
           # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
           ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
 
-          ${gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
+          ${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
           waitPID=$!
         '';
       };
 
     services.xserver.updateDbusEnvironment = true;
 
-    environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib gnome3.dconf}/lib/gio/modules"
-                                                "${gnome3.glib_networking.out}/lib/gio/modules"
-                                                "${gnome3.gvfs}/lib/gio/modules" ];
-    environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
-      ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages);
+    environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
+                                                "${pkgs.gnome3.glib_networking.out}/lib/gio/modules"
+                                                "${pkgs.gnome3.gvfs}/lib/gio/modules" ];
+    environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
+      ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);
 
     # Use the correct gnome3 packageSet
     networking.networkmanager.basePackages =
       { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
-        inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
-                         networkmanager_openconnect networkmanager_fortisslvpn
-                         networkmanager_pptp networkmanager_iodine
-                         networkmanager_l2tp; };
+        inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc
+                              networkmanager_openconnect networkmanager_fortisslvpn
+                              networkmanager_pptp networkmanager_iodine
+                              networkmanager_l2tp; };
 
     # Needed for themes and backgrounds
     environment.pathsToLink = [ "/share" ];
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index bd16f2210592..b0a3ff1bb753 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -5,8 +5,7 @@ with lib;
 let
 
   cfg = config.services.xserver.displayManager;
-  gnome3 = config.environment.gnome3.packageSet;
-  gdm = gnome3.gdm;
+  gdm = pkgs.gnome3.gdm;
 
 in
 
@@ -103,7 +102,7 @@ in
             (filter (arg: arg != "-terminate") cfg.xserverArgs);
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
-          XCURSOR_PATH = "~/.icons:${gnome3.adwaita-icon-theme}/share/icons";
+          XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
         };
         execCmd = "exec ${gdm}/bin/gdm";
       };
@@ -127,7 +126,7 @@ in
       StandardError = "inherit";
     };
 
-    systemd.services.display-manager.path = [ gnome3.gnome_session ];
+    systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ];
 
     services.dbus.packages = [ gdm ];
 
@@ -186,7 +185,7 @@ in
         auth     required       pam_env.so envfile=${config.system.build.pamEnvironment}
 
         auth     required       pam_succeed_if.so uid >= 1000 quiet
-        auth     optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+        auth     optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
         auth     ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
         ${optionalString config.security.pam.enableEcryptfs
           "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -206,7 +205,7 @@ in
           "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
         session  required       pam_loginuid.so
         session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so
-        session  optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+        session  optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
       '';
 
       gdm-password.text = ''
@@ -214,7 +213,7 @@ in
         auth     required       pam_env.so envfile=${config.system.build.pamEnvironment}
 
         auth     required       pam_succeed_if.so uid >= 1000 quiet
-        auth     optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+        auth     optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
         auth     ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
         ${optionalString config.security.pam.enableEcryptfs
           "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -233,7 +232,7 @@ in
           "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
         session  required       pam_loginuid.so
         session  optional       ${pkgs.systemd}/lib/security/pam_systemd.so
-        session  optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+        session  optional       ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
       '';
 
       gdm-autologin.text = ''
diff --git a/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
rename to pkgs/desktops/gnome-3/apps/accerciser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/apps/accerciser/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
rename to pkgs/desktops/gnome-3/apps/accerciser/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
rename to pkgs/desktops/gnome-3/apps/bijiben/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/apps/bijiben/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
rename to pkgs/desktops/gnome-3/apps/bijiben/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
rename to pkgs/desktops/gnome-3/apps/cheese/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix b/pkgs/desktops/gnome-3/apps/cheese/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
rename to pkgs/desktops/gnome-3/apps/cheese/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
rename to pkgs/desktops/gnome-3/apps/evolution/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix b/pkgs/desktops/gnome-3/apps/evolution/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
rename to pkgs/desktops/gnome-3/apps/evolution/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
rename to pkgs/desktops/gnome-3/apps/file-roller/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/apps/file-roller/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
rename to pkgs/desktops/gnome-3/apps/file-roller/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
rename to pkgs/desktops/gnome-3/apps/gedit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix b/pkgs/desktops/gnome-3/apps/gedit/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
rename to pkgs/desktops/gnome-3/apps/gedit/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
rename to pkgs/desktops/gnome-3/apps/ghex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix b/pkgs/desktops/gnome-3/apps/ghex/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
rename to pkgs/desktops/gnome-3/apps/ghex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
rename to pkgs/desktops/gnome-3/apps/glade/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/glade/src.nix b/pkgs/desktops/gnome-3/apps/glade/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
rename to pkgs/desktops/gnome-3/apps/glade/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-characters/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-documents/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
rename to pkgs/desktops/gnome-3/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/apps/gnome-getting-started-docs/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-logs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-maps/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-music/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/apps/gnome-music/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-music/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-photos/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
rename to pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
rename to pkgs/desktops/gnome-3/apps/gnome-weather/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
rename to pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
rename to pkgs/desktops/gnome-3/apps/polari/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix b/pkgs/desktops/gnome-3/apps/polari/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
rename to pkgs/desktops/gnome-3/apps/polari/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
rename to pkgs/desktops/gnome-3/apps/seahorse/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/apps/seahorse/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
rename to pkgs/desktops/gnome-3/apps/seahorse/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
rename to pkgs/desktops/gnome-3/apps/vinagre/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/apps/vinagre/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
rename to pkgs/desktops/gnome-3/apps/vinagre/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
rename to pkgs/desktops/gnome-3/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/core/adwaita-icon-theme/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
rename to pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
rename to pkgs/desktops/gnome-3/core/baobab/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix b/pkgs/desktops/gnome-3/core/baobab/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
rename to pkgs/desktops/gnome-3/core/baobab/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
rename to pkgs/desktops/gnome-3/core/caribou/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
rename to pkgs/desktops/gnome-3/core/dconf-editor/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
rename to pkgs/desktops/gnome-3/core/dconf-editor/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
rename to pkgs/desktops/gnome-3/core/dconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
rename to pkgs/desktops/gnome-3/core/empathy/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/eog/default.nix
rename to pkgs/desktops/gnome-3/core/eog/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/eog/src.nix b/pkgs/desktops/gnome-3/core/eog/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/eog/src.nix
rename to pkgs/desktops/gnome-3/core/eog/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
rename to pkgs/desktops/gnome-3/core/epiphany/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix b/pkgs/desktops/gnome-3/core/epiphany/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
rename to pkgs/desktops/gnome-3/core/epiphany/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/evince/default.nix
rename to pkgs/desktops/gnome-3/core/evince/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/evince/src.nix b/pkgs/desktops/gnome-3/core/evince/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/evince/src.nix
rename to pkgs/desktops/gnome-3/core/evince/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
rename to pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
rename to pkgs/desktops/gnome-3/core/evolution-data-server/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/folks/default.nix
rename to pkgs/desktops/gnome-3/core/folks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
rename to pkgs/desktops/gnome-3/core/gconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
rename to pkgs/desktops/gnome-3/core/gcr/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gcr/src.nix b/pkgs/desktops/gnome-3/core/gcr/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
rename to pkgs/desktops/gnome-3/core/gcr/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
rename to pkgs/desktops/gnome-3/core/gdm/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
rename to pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
rename to pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
rename to pkgs/desktops/gnome-3/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/core/gdm/sessions_dir.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
rename to pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix b/pkgs/desktops/gnome-3/core/gdm/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
rename to pkgs/desktops/gnome-3/core/gdm/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
rename to pkgs/desktops/gnome-3/core/geocode-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/core/geocode-glib/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
rename to pkgs/desktops/gnome-3/core/geocode-glib/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
rename to pkgs/desktops/gnome-3/core/gjs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
rename to pkgs/desktops/gnome-3/core/gjs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-calculator/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/core/gnome-common/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-common/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
rename to pkgs/desktops/gnome-3/core/gnome-contacts/gio_unix.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-contacts/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
rename to pkgs/desktops/gnome-3/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/core/gnome-control-center/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-control-center/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-desktop/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
rename to pkgs/desktops/gnome-3/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/core/gnome-disk-utility/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
rename to pkgs/desktops/gnome-3/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/core/gnome-font-viewer/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-keyring/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-menus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
rename to pkgs/desktops/gnome-3/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/core/gnome-online-accounts/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
rename to pkgs/desktops/gnome-3/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/core/gnome-online-miners/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-session/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/core/gnome-session/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-session/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
rename to pkgs/desktops/gnome-3/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/core/gnome-settings-daemon/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
rename to pkgs/desktops/gnome-3/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/core/gnome-shell-extensions/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-shell/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-shell/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-software/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/core/gnome-software/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-software/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-terminal/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
rename to pkgs/desktops/gnome-3/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/core/gnome-user-docs/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
rename to pkgs/desktops/gnome-3/core/gnome-user-share/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
rename to pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
rename to pkgs/desktops/gnome-3/core/grilo/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
rename to pkgs/desktops/gnome-3/core/grilo/setup-hook.sh
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
rename to pkgs/desktops/gnome-3/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/core/gsettings-desktop-schemas/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
rename to pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
rename to pkgs/desktops/gnome-3/core/gsound/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
rename to pkgs/desktops/gnome-3/core/gtksourceview/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
rename to pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
rename to pkgs/desktops/gnome-3/core/gtksourceview/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
rename to pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
rename to pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
rename to pkgs/desktops/gnome-3/core/gucharmap/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
rename to pkgs/desktops/gnome-3/core/gucharmap/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
rename to pkgs/desktops/gnome-3/core/libcroco/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
rename to pkgs/desktops/gnome-3/core/libgdata/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
rename to pkgs/desktops/gnome-3/core/libgee/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
rename to pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
rename to pkgs/desktops/gnome-3/core/libgepub/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
rename to pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
rename to pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
rename to pkgs/desktops/gnome-3/core/libgnomekbd/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
rename to pkgs/desktops/gnome-3/core/libgweather/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
rename to pkgs/desktops/gnome-3/core/libgweather/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
rename to pkgs/desktops/gnome-3/core/libgxps/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
rename to pkgs/desktops/gnome-3/core/libpeas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
rename to pkgs/desktops/gnome-3/core/libpeas/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
rename to pkgs/desktops/gnome-3/core/libzapojit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
rename to pkgs/desktops/gnome-3/core/mutter/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/math.patch b/pkgs/desktops/gnome-3/core/mutter/math.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
rename to pkgs/desktops/gnome-3/core/mutter/math.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix b/pkgs/desktops/gnome-3/core/mutter/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
rename to pkgs/desktops/gnome-3/core/mutter/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch b/pkgs/desktops/gnome-3/core/mutter/x86.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
rename to pkgs/desktops/gnome-3/core/mutter/x86.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
rename to pkgs/desktops/gnome-3/core/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
rename to pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix b/pkgs/desktops/gnome-3/core/nautilus/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
rename to pkgs/desktops/gnome-3/core/nautilus/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/rest/default.nix
rename to pkgs/desktops/gnome-3/core/rest/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
rename to pkgs/desktops/gnome-3/core/sushi/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix b/pkgs/desktops/gnome-3/core/sushi/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
rename to pkgs/desktops/gnome-3/core/sushi/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
rename to pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/totem/default.nix
rename to pkgs/desktops/gnome-3/core/totem/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/src.nix b/pkgs/desktops/gnome-3/core/totem/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/totem/src.nix
rename to pkgs/desktops/gnome-3/core/totem/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
rename to pkgs/desktops/gnome-3/core/tracker/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
rename to pkgs/desktops/gnome-3/core/tracker/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/vino/default.nix
rename to pkgs/desktops/gnome-3/core/vino/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vino/src.nix b/pkgs/desktops/gnome-3/core/vino/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/vino/src.nix
rename to pkgs/desktops/gnome-3/core/vino/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix b/pkgs/desktops/gnome-3/core/vte/2.90.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
rename to pkgs/desktops/gnome-3/core/vte/2.90.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/vte/default.nix
rename to pkgs/desktops/gnome-3/core/vte/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
rename to pkgs/desktops/gnome-3/core/vte/fix_g_test_init_calls.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
rename to pkgs/desktops/gnome-3/core/vte/fix_vteseq_n_lookup_declaration.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
rename to pkgs/desktops/gnome-3/core/vte/ng.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/vte/src.nix
rename to pkgs/desktops/gnome-3/core/vte/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
rename to pkgs/desktops/gnome-3/core/yelp-tools/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/core/yelp-tools/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
rename to pkgs/desktops/gnome-3/core/yelp-tools/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
rename to pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
rename to pkgs/desktops/gnome-3/core/yelp-xsl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
rename to pkgs/desktops/gnome-3/core/yelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp/src.nix b/pkgs/desktops/gnome-3/core/yelp/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
rename to pkgs/desktops/gnome-3/core/yelp/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
rename to pkgs/desktops/gnome-3/core/zenity/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix b/pkgs/desktops/gnome-3/core/zenity/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
rename to pkgs/desktops/gnome-3/core/zenity/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/default.nix b/pkgs/desktops/gnome-3/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/default.nix
rename to pkgs/desktops/gnome-3/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
rename to pkgs/desktops/gnome-3/desktop/rarian/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
rename to pkgs/desktops/gnome-3/devtools/anjuta/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
rename to pkgs/desktops/gnome-3/devtools/anjuta/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
rename to pkgs/desktops/gnome-3/devtools/devhelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
rename to pkgs/desktops/gnome-3/devtools/devhelp/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
rename to pkgs/desktops/gnome-3/devtools/gdl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/devtools/gdl/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
rename to pkgs/desktops/gnome-3/devtools/gdl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
rename to pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
rename to pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
rename to pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
rename to pkgs/desktops/gnome-3/devtools/nemiver/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
rename to pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/devtools/nemiver/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
rename to pkgs/desktops/gnome-3/devtools/nemiver/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
rename to pkgs/desktops/gnome-3/games/aisleriot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/games/aisleriot/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
rename to pkgs/desktops/gnome-3/games/aisleriot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
rename to pkgs/desktops/gnome-3/games/five-or-more/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/games/five-or-more/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
rename to pkgs/desktops/gnome-3/games/five-or-more/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
rename to pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
rename to pkgs/desktops/gnome-3/games/four-in-a-row/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-chess/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/games/gnome-chess/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-chess/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-klotski/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-mahjongg/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-mines/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/games/gnome-mines/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-mines/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-nibbles/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-robots/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/games/gnome-robots/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-robots/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-taquin/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
rename to pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
rename to pkgs/desktops/gnome-3/games/gnome-tetravex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
rename to pkgs/desktops/gnome-3/games/hitori/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/hitori/src.nix b/pkgs/desktops/gnome-3/games/hitori/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
rename to pkgs/desktops/gnome-3/games/hitori/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
rename to pkgs/desktops/gnome-3/games/iagno/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/iagno/src.nix b/pkgs/desktops/gnome-3/games/iagno/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
rename to pkgs/desktops/gnome-3/games/iagno/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
rename to pkgs/desktops/gnome-3/games/lightsoff/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/games/lightsoff/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
rename to pkgs/desktops/gnome-3/games/lightsoff/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
rename to pkgs/desktops/gnome-3/games/quadrapassel/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/games/quadrapassel/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
rename to pkgs/desktops/gnome-3/games/quadrapassel/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
rename to pkgs/desktops/gnome-3/games/swell-foop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/games/swell-foop/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
rename to pkgs/desktops/gnome-3/games/swell-foop/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/tali/default.nix
rename to pkgs/desktops/gnome-3/games/tali/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/tali/src.nix b/pkgs/desktops/gnome-3/games/tali/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/games/tali/src.nix
rename to pkgs/desktops/gnome-3/games/tali/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/installer.nix b/pkgs/desktops/gnome-3/installer.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/installer.nix
rename to pkgs/desktops/gnome-3/installer.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
rename to pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/california/default.nix
rename to pkgs/desktops/gnome-3/misc/california/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
rename to pkgs/desktops/gnome-3/misc/geary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
rename to pkgs/desktops/gnome-3/misc/gexiv2/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
rename to pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
rename to pkgs/desktops/gnome-3/misc/gitg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix b/pkgs/desktops/gnome-3/misc/gitg/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
rename to pkgs/desktops/gnome-3/misc/gitg/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
rename to pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
rename to pkgs/desktops/gnome-3/misc/gnome-autoar/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
rename to pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
rename to pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
rename to pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
rename to pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
rename to pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
rename to pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
rename to pkgs/desktops/gnome-3/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/misc/gnome-tweak-tool/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
rename to pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
rename to pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
rename to pkgs/desktops/gnome-3/misc/gpaste/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
rename to pkgs/desktops/gnome-3/misc/gspell/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix b/pkgs/desktops/gnome-3/misc/gspell/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
rename to pkgs/desktops/gnome-3/misc/gspell/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
rename to pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
rename to pkgs/desktops/gnome-3/misc/gtkhtml/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
rename to pkgs/desktops/gnome-3/misc/libgames-support/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
rename to pkgs/desktops/gnome-3/misc/libgda/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix b/pkgs/desktops/gnome-3/misc/libgda/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
rename to pkgs/desktops/gnome-3/misc/libgda/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
rename to pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
rename to pkgs/desktops/gnome-3/misc/libgit2-glib/src.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
rename to pkgs/desktops/gnome-3/misc/libmediaart/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/misc/pidgin/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
rename to pkgs/desktops/gnome-3/misc/pidgin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
rename to pkgs/desktops/gnome-3/misc/pomodoro/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74c9df866007..e929ef3a9c15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17954,9 +17954,7 @@ with pkgs;
     libcanberra = self.libcanberra_gtk2;
   });
 
-  gnome3_24 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.24 { });
-
-  gnome3 = gnome3_24;
+  gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { });
 
   gnomeExtensions = {
     caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };