From e7295597d8ddeeae344bb892490331f2476805ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Jul 2014 17:40:24 +0200
Subject: [PATCH] Revert "all-packages.nix: Provide a shorter way to specify
 packages"

This reverts commit ece61b7cc803d374e81b1094bd9c1f6d5a9ca5d0.
---
 pkgs/auto-packages.nix          | 16 ----------------
 pkgs/top-level/all-packages.nix | 34 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/auto-packages.nix

diff --git a/pkgs/auto-packages.nix b/pkgs/auto-packages.nix
deleted file mode 100644
index c935f47295d3..000000000000
--- a/pkgs/auto-packages.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-/* A list of file names of package Nix expressions, whose base names
-   match the intended attribute names, and that do not need to be
-   called with any overrides. Thus, listing ‘./foo.nix’ here is
-   equivalent to defining the attribute
-
-     foo = callPackage ./foo.nix { };
-
-   in all-packages.nix. */
-
-[
-  build-support/libredirect
-  development/libraries/libogg
-  development/libraries/libvorbis
-  tools/archivers/gnutar
-  tools/system/acct
-]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76e2ff275e6f..1dfc9416ebe5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -130,19 +130,11 @@ let
     in pkgs;
 
 
-  # The package compositions.
+  # The package compositions.  Yes, this isn't properly indented.
   pkgsFun = pkgs: overrides:
-    let
-      defaultScope = pkgs // pkgs.xorg;
-      autoPackages = lib.listToAttrs
-        (map (fn: { name = baseNameOf (toString fn); value = pkgs.callPackage fn { }; })
-        (import ../auto-packages.nix));
-      self = self_ // autoPackages // overrides;
-      self_ = with self; helperFunctions //
-
-
-# Yes, this isn't properly indented.
-{
+    with helperFunctions;
+    let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides;
+    self_ = with self; helperFunctions // {
 
   # Make some arguments passed to all-packages.nix available
   inherit system stdenvType platform;
@@ -369,6 +361,8 @@ let
     inherit url;
   };
 
+  libredirect = callPackage ../build-support/libredirect { };
+
   makeDesktopItem = import ../build-support/make-desktopitem {
     inherit stdenv;
   };
@@ -433,6 +427,8 @@ let
 
   ### TOOLS
 
+  acct = callPackage ../tools/system/acct { };
+
   acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
     ffmpeg = ffmpeg_1;
   };
@@ -1163,6 +1159,8 @@ let
 
   gnused = callPackage ../tools/text/gnused { };
 
+  gnutar = callPackage ../tools/archivers/gnutar { };
+
   gnuvd = callPackage ../tools/misc/gnuvd { };
 
   goaccess = callPackage ../tools/misc/goaccess { };
@@ -5368,6 +5366,8 @@ let
 
   libofx = callPackage ../development/libraries/libofx { };
 
+  libogg = callPackage ../development/libraries/libogg { };
+
   liboggz = callPackage ../development/libraries/liboggz { };
 
   liboil = callPackage ../development/libraries/liboil { };
@@ -5534,6 +5534,8 @@ let
 
   libvterm = callPackage ../development/libraries/libvterm { };
 
+  libvorbis = callPackage ../development/libraries/libvorbis { };
+
   libwebp = callPackage ../development/libraries/libwebp { };
 
   libwmf = callPackage ../development/libraries/libwmf { };
@@ -10415,13 +10417,13 @@ let
     callPackage = newScope pkgs.cinnamon;
     inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity;
 
-    muffin = callPackage ../desktops/cinnamon/muffin.nix { };
+    muffin = callPackage ../desktops/cinnamon/muffin.nix { } ;
 
-    cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix { };
+    cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
 
-    cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix { };
+    cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ };
 
-    cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix { };
+    cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;
 
     cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { };