diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddf2f907ebc..2804dc74359 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -182,7 +182,6 @@ let
 
 
   ### Helper functions.
-
   inherit lib config stdenvAdapters;
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
@@ -488,8 +487,6 @@ let
 
   actkbd = callPackage ../tools/system/actkbd { };
 
-  adom = callPackage ../games/adom { };
-
   advancecomp = callPackage ../tools/compression/advancecomp {};
 
   aefs = callPackage ../tools/filesystems/aefs { };
@@ -662,14 +659,10 @@ let
 
   badvpn = callPackage ../tools/networking/badvpn {};
 
-  banner = callPackage ../games/banner {};
-
   barcode = callPackage ../tools/graphics/barcode {};
 
   bashmount = callPackage ../tools/filesystems/bashmount {};
 
-  bastet = callPackage ../games/bastet {};
-
   bc = callPackage ../tools/misc/bc { };
 
   bdf2psf = callPackage ../tools/misc/bdf2psf { };
@@ -796,14 +789,6 @@ let
 
   cpulimit = callPackage ../tools/misc/cpulimit { };
 
-  crawlTiles = callPackage ../games/crawl { };
-
-  crawl = callPackage ../games/crawl {
-    tileMode = false;
-  };
-
-  cuyo = callPackage ../games/cuyo { };
-
   contacts = callPackage ../tools/misc/contacts { };
 
   datamash = callPackage ../tools/misc/datamash { };
@@ -1048,8 +1033,6 @@ let
 
   chkrootkit = callPackage ../tools/security/chkrootkit { };
 
-  chocolateDoom = callPackage ../games/chocolate-doom { };
-
   chrony = callPackage ../tools/networking/chrony { };
 
   chunkfs = callPackage ../tools/filesystems/chunkfs { };
@@ -1397,8 +1380,6 @@ let
 
   ethtool = callPackage ../tools/misc/ethtool { };
 
-  eternity = callPackage ../games/eternity-engine { };
-
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };
 
   euca2ools = callPackage ../tools/virtualization/euca2ools { };
@@ -1811,8 +1792,6 @@ let
 
   haveged = callPackage ../tools/security/haveged { };
 
-  hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
-
   hardlink = callPackage ../tools/system/hardlink { };
 
   hashcat = callPackage ../tools/security/hashcat { };
@@ -2023,8 +2002,6 @@ let
 
   kippo = callPackage ../servers/kippo { };
 
-  klavaro = callPackage ../games/klavaro {};
-
   kzipmix = callPackage_i686 ../tools/compression/kzipmix { };
 
   makebootfat = callPackage ../tools/misc/makebootfat { };
@@ -2236,16 +2213,6 @@ let
 
   mgba = callPackage ../misc/emulators/mgba { };
 
-  minecraft = callPackage ../games/minecraft {
-    useAlsa = config.minecraft.alsa or false;
-  };
-
-  minecraft-server = callPackage ../games/minecraft-server { };
-
-  minetest = callPackage ../games/minetest {
-    libpng = libpng12;
-  };
-
   minissdpd = callPackage ../tools/networking/minissdpd { };
 
   miniupnpc = callPackage ../tools/networking/miniupnpc { };
@@ -2487,18 +2454,12 @@ let
 
   odt2txt = callPackage ../tools/text/odt2txt { };
 
-  odamex = callPackage ../games/odamex { };
-
   offlineimap = callPackage ../tools/networking/offlineimap {
     inherit (pythonPackages) sqlite3;
   };
 
-  openarena = callPackage ../games/openarena { };
-
   opencryptoki = callPackage ../tools/security/opencryptoki { };
 
-  onscripter-en = callPackage ../games/onscripter-en { };
-
   opendbx = callPackage ../development/libraries/opendbx { };
 
   opendkim = callPackage ../development/libraries/opendkim { };
@@ -2827,8 +2788,6 @@ let
 
   rawdog = callPackage ../applications/networking/feedreaders/rawdog { };
 
-  privateer = callPackage ../games/privateer { };
-
   read-edid = callPackage ../os-specific/linux/read-edid { };
 
   redmine = callPackage ../applications/version-management/redmine { };
@@ -2965,8 +2924,6 @@ let
 
   scrot = callPackage ../tools/graphics/scrot { };
 
-  scrolls = callPackage ../games/scrolls { };
-
   scrypt = callPackage ../tools/security/scrypt { };
 
   sdcv = callPackage ../applications/misc/sdcv { };
@@ -3171,8 +3128,6 @@ let
 
   tboot = callPackage ../tools/security/tboot { };
 
-  tcl2048 = callPackage ../games/tcl2048 { };
-
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   tcpflow = callPackage ../tools/networking/tcpflow { };
@@ -6209,10 +6164,6 @@ let
 
   expat = callPackage ../development/libraries/expat { };
 
-  extremetuxracer = callPackage ../games/extremetuxracer {
-    libpng = libpng12;
-  };
-
   eventlog = callPackage ../development/libraries/eventlog { };
 
   facile = callPackage ../development/libraries/facile { };
@@ -6281,8 +6232,6 @@ let
 
   filter-audio = callPackage ../development/libraries/filter-audio {};
 
-  fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
-
   flann = callPackage ../development/libraries/flann { };
 
   flite = callPackage ../development/libraries/flite { };
@@ -6334,12 +6283,8 @@ let
 
   ganv = callPackage ../development/libraries/ganv { };
 
-  gav = callPackage ../games/gav { };
-
   gcab = callPackage ../development/libraries/gcab { };
 
-  gsb = callPackage ../games/gsb { };
-
   gdome2 = callPackage ../development/libraries/gdome2 {
     inherit (gnome) gtkdoc;
   };
@@ -6715,8 +6660,6 @@ let
 
   itk = callPackage ../development/libraries/itk { };
 
-  jamp = builderDefsPackage (callPackage ../games/jamp) {};
-
   jasper = callPackage ../development/libraries/jasper { };
 
   jama = callPackage ../development/libraries/jama { };
@@ -7628,10 +7571,6 @@ let
 
   liquidfun = callPackage ../development/libraries/liquidfun { };
 
-  liquidwar = builderDefsPackage (callPackage ../games/liquidwar) {
-    guile = guile_1_8;
-  };
-
   log4cpp = callPackage ../development/libraries/log4cpp { };
 
   log4cxx = callPackage ../development/libraries/log4cxx { };
@@ -7792,8 +7731,6 @@ let
     sslSupport = true;
   };
 
-  nethack = callPackage ../games/nethack { };
-
   nettle = callPackage ../development/libraries/nettle { };
 
   newt = callPackage ../development/libraries/newt { };
@@ -7874,8 +7811,6 @@ let
 
   openldap = callPackage ../development/libraries/openldap { };
 
-  openlierox = callPackage ../games/openlierox { };
-
   libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { };
 
   opencolorio = callPackage ../development/libraries/opencolorio { };
@@ -7896,8 +7831,6 @@ let
     ffmpeg = ffmpeg_0;
   };
 
-  openspades = callPackage ../games/openspades {};
-
   libressl = callPackage ../development/libraries/libressl { };
 
   boringssl = callPackage ../development/libraries/boringssl { };
@@ -8361,8 +8294,6 @@ let
 
   steghide = callPackage ../tools/security/steghide {};
 
-  stepmania = callPackage ../games/stepmania {};
-
   stlport = callPackage ../development/libraries/stlport { };
 
   strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
@@ -8478,8 +8409,6 @@ let
     gnutls = gnutls;
   });
 
-  unnethack = callPackage ../games/unnethack { };
-
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (pythonPackages) gyp;
   };
@@ -8645,8 +8574,6 @@ let
     qt = qt4;
   };
 
-  zangband = builderDefsPackage (callPackage ../games/zangband) {};
-
   zeitgeist = callPackage ../development/libraries/zeitgeist { };
 
   zlib = callPackage ../development/libraries/zlib {
@@ -8844,8 +8771,6 @@ let
 
   perlcritic = perlPackages.PerlCritic;
 
-  planetary_annihilation = callPackage ../games/planetaryannihilation { };
-
   sqitchPg = callPackage ../development/tools/misc/sqitch {
     name = "sqitch-pg";
     databaseModule = perlPackages.DBDPg;
@@ -9126,8 +9051,6 @@ let
 
   freeswitch = callPackage ../servers/sip/freeswitch { };
 
-  ghostOne = callPackage ../servers/games/ghost-one { };
-
   groovebasin = callPackage ../applications/audio/groovebasin { };
 
   hbase = callPackage ../servers/hbase {};
@@ -9594,8 +9517,6 @@ let
 
   inherit (pythonPackages) bedup;
 
-  beret = callPackage ../games/beret { };
-
   bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
 
   busybox = callPackage ../os-specific/linux/busybox { };
@@ -10193,8 +10114,6 @@ let
 
   nettools = callPackage ../os-specific/linux/net-tools { };
 
-  neverball = callPackage ../games/neverball { };
-
   nftables = callPackage ../os-specific/linux/nftables { };
 
   numactl = callPackage ../os-specific/linux/numactl { };
@@ -10369,11 +10288,6 @@ let
   # FIXME: `tcp-wrapper' is actually not OS-specific.
   tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { };
 
-  trackballs = callPackage ../games/trackballs {
-    debug = false;
-    guile = guile_1_8;
-  };
-
   trinity = callPackage ../os-specific/linux/trinity { };
 
   tunctl = callPackage ../os-specific/linux/tunctl { };
@@ -10521,18 +10435,12 @@ let
     wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
   };
 
-  wesnoth = callPackage ../games/wesnoth {
-    lua = lua5;
-  };
-
   wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
 
   wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
 
   wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
 
-  xbomb = callPackage ../games/xbomb { };
-
   xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };
 
   xf86_input_multitouch =
@@ -10542,14 +10450,8 @@ let
 
   xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { };
 
-  xmoto = callPackage ../games/xmoto { };
-
   xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
 
-  xpilot-ng = callPackage ../games/xpilot { };
-  bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {};
-  bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {};
-
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
 
   zfs = callPackage ../os-specific/linux/zfs {
@@ -12367,10 +12269,6 @@ let
 
   mrxvt = callPackage ../applications/misc/mrxvt { };
 
-  mudlet = qt5Libs.callPackage ../games/mudlet {
-    inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
-  };
-
   multimarkdown = callPackage ../tools/typesetting/multimarkdown { };
 
   multimon-ng = callPackage ../applications/misc/multimon-ng { };
@@ -13710,6 +13608,8 @@ let
 
   "2048-in-terminal" = callPackage ../games/2048-in-terminal { };
 
+  adom = callPackage ../games/adom { };
+
   airstrike = callPackage ../games/airstrike { };
 
   alienarena = callPackage ../games/alienarena { };
@@ -13733,6 +13633,12 @@ let
     guile = guile_1_8;
   };
 
+  banner = callPackage ../games/banner {};
+
+  bastet = callPackage ../games/bastet {};
+
+  beret = callPackage ../games/beret { };
+
   bitsnbots = callPackage ../games/bitsnbots {
     lua = lua5;
   };
@@ -13755,6 +13661,8 @@ let
 
   chessdb = callPackage ../games/chessdb { };
 
+  chocolateDoom = callPackage ../games/chocolate-doom { };
+
   cockatrice = qt5Libs.callPackage ../games/cockatrice {  };
 
   confd = goPackages.confd.bin // { outputs = [ "bin" ]; };
@@ -13773,8 +13681,16 @@ let
   crafty = callPackage ../games/crafty { };
   craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
 
+  crawlTiles = callPackage ../games/crawl { };
+
+  crawl = callPackage ../games/crawl {
+    tileMode = false;
+  };
+
   crrcsim = callPackage ../games/crrcsim {};
 
+  cuyo = callPackage ../games/cuyo { };
+
   dfhack = callPackage_i686 ../games/dfhack {
     inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT;
   };
@@ -13801,10 +13717,18 @@ let
 
   egoboo = callPackage ../games/egoboo { };
 
+  eternity = callPackage ../games/eternity-engine { };
+
+  extremetuxracer = callPackage ../games/extremetuxracer {
+    libpng = libpng12;
+  };
+
   exult = callPackage ../games/exult { };
 
   fairymax = callPackage ../games/fairymax {};
 
+  fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
+
   flightgear = qt5Libs.callPackage ../games/flightgear { };
 
   freecell-solver = callPackage ../games/freecell-solver { };
@@ -13822,8 +13746,12 @@ let
     wxGTK = wxGTK28.override { unicode = false; };
   };
 
+  gav = callPackage ../games/gav { };
+
   gemrb = callPackage ../games/gemrb { };
 
+  ghostOne = callPackage ../servers/games/ghost-one { };
+
   gl117 = callPackage ../games/gl-117 {};
 
   glestae = callPackage ../games/glestae {};
@@ -13840,10 +13768,14 @@ let
 
   gnugo = callPackage ../games/gnugo { };
 
+  gsb = callPackage ../games/gsb { };
+
   gtypist = callPackage ../games/gtypist { };
 
   gzdoom = callPackage ../games/gzdoom { };
 
+  hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
+
   hedgewars = callPackage ../games/hedgewars {
     inherit (haskellPackages) ghcWithPackages;
   };
@@ -13860,6 +13792,10 @@ let
     lua = lua5;
   };
 
+  jamp = builderDefsPackage (callPackage ../games/jamp) {};
+
+  klavaro = callPackage ../games/klavaro {};
+
   kobodeluxe = callPackage ../games/kobodeluxe { };
 
   lgogdownloader = callPackage ../games/lgogdownloader { };
@@ -13868,32 +13804,64 @@ let
 
   lincity_ng = callPackage ../games/lincity/ng.nix {};
 
+  liquidwar = builderDefsPackage (callPackage ../games/liquidwar) {
+    guile = guile_1_8;
+  };
+
   mars = callPackage ../games/mars { };
 
   megaglest = callPackage ../games/megaglest {};
 
   micropolis = callPackage ../games/micropolis { };
 
+  minecraft = callPackage ../games/minecraft {
+    useAlsa = config.minecraft.alsa or false;
+  };
+
+  minecraft-server = callPackage ../games/minecraft-server { };
+
+  minetest = callPackage ../games/minetest {
+    libpng = libpng12;
+  };
+
   mnemosyne = callPackage ../games/mnemosyne {
     inherit (pythonPackages) matplotlib cherrypy sqlite3;
   };
 
+  mudlet = qt5Libs.callPackage ../games/mudlet {
+    inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
+  };
+
   n2048 = callPackage ../games/n2048 {};
 
   naev = callPackage ../games/naev { };
 
+  nethack = callPackage ../games/nethack { };
+
+  neverball = callPackage ../games/neverball { };
+
   nexuiz = callPackage ../games/nexuiz { };
 
   njam = callPackage ../games/njam { };
 
   newtonwars = callPackage ../games/newtonwars { };
 
+  odamex = callPackage ../games/odamex { };
+
   oilrush = callPackage ../games/oilrush { };
 
+  onscripter-en = callPackage ../games/onscripter-en { };
+
+  openarena = callPackage ../games/openarena { };
+
+  openlierox = callPackage ../games/openlierox { };
+
   openmw = callPackage ../games/openmw { };
 
   openra = callPackage ../games/openra { lua = lua5_1; };
 
+  openspades = callPackage ../games/openspades {};
+
   openttd = callPackage ../games/openttd {
     zlib = zlibStatic;
   };
@@ -13908,10 +13876,14 @@ let
 
   pioneers = callPackage ../games/pioneers { };
 
+  planetary_annihilation = callPackage ../games/planetaryannihilation { };
+
   pong3d = callPackage ../games/pong3d { };
 
   prboom = callPackage ../games/prboom { };
 
+  privateer = callPackage ../games/privateer { };
+
   qqwing = callPackage ../games/qqwing { };
 
   quake3demo = callPackage ../games/quake3/wrapper {
@@ -13953,6 +13925,8 @@ let
 
   scorched3d = callPackage ../games/scorched3d { };
 
+  scrolls = callPackage ../games/scrolls { };
+
   sdlmame = callPackage ../games/sdlmame { };
 
   sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { };
@@ -13984,6 +13958,8 @@ let
     withPrimus = config.steam.primus or false;
   };
 
+  stepmania = callPackage ../games/stepmania {};
+
   stuntrally = callPackage ../games/stuntrally { };
 
   superTux = callPackage ../games/super-tux { };
@@ -13992,6 +13968,8 @@ let
 
   synthv1 = callPackage ../applications/audio/synthv1 { };
 
+  tcl2048 = callPackage ../games/tcl2048 { };
+
   the-powder-toy = callPackage ../games/the-powder-toy {
     lua = lua5_1;
   };
@@ -14012,6 +13990,11 @@ let
 
   tpm = callPackage ../games/thePenguinMachine { };
 
+  trackballs = callPackage ../games/trackballs {
+    debug = false;
+    guile = guile_1_8;
+  };
+
   tremulous = callPackage ../games/tremulous { };
 
   speed_dreams = callPackage ../games/speed-dreams {
@@ -14040,6 +14023,8 @@ let
     lua = lua5;
   };
 
+  unnethack = callPackage ../games/unnethack { };
+
   unvanquished = callPackage ../games/unvanquished { };
 
   uqm = callPackage ../games/uqm { };
@@ -14068,6 +14053,10 @@ let
 
   warzone2100 = callPackage ../games/warzone2100 { };
 
+  wesnoth = callPackage ../games/wesnoth {
+    lua = lua5;
+  };
+
   widelands = callPackage ../games/widelands {
     lua = lua5_1;
   };
@@ -14080,6 +14069,8 @@ let
 
   xboard =  callPackage ../games/xboard { };
 
+  xbomb = callPackage ../games/xbomb { };
+
   xconq = callPackage ../games/xconq {
     tcl = tcl-8_5;
     tk = tk-8_5;
@@ -14088,8 +14079,14 @@ let
   # TODO: the corresponding nix file is missing
   # xracer = callPackage ../games/xracer { };
 
+  xmoto = callPackage ../games/xmoto { };
+
   xonotic = callPackage ../games/xonotic { };
 
+  xpilot-ng = callPackage ../games/xpilot { };
+  bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {};
+  bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {};
+
   xskat = callPackage ../games/xskat { };
 
   xsnow = callPackage ../games/xsnow { };
@@ -14100,6 +14097,8 @@ let
   zandronum-server = callPackage ../games/zandronum/server.nix { };
   zandronum-bin = callPackage ../games/zandronum/bin.nix { };
 
+  zangband = builderDefsPackage (callPackage ../games/zangband) {};
+
   zdoom = callPackage ../games/zdoom { };
 
   zod = callPackage ../games/zod { };