* Updated to reflect the changes to the grammar.

svn path=/nixpkgs/trunk/; revision=464

1 files changed, 74 insertions, 72 deletions

diff --git a/pkgs-ng/system/all-packages-generic.fix b/pkgs-ng/system/all-packages-generic.fix
index b8fea1bf96d50..d31bdb5d4940f 100644
--- a/pkgs-ng/system/all-packages-generic.fix
+++ b/pkgs-ng/system/all-packages-generic.fix
@@ -2,108 +2,110 @@
 # identifier and a standard build environment, returns the set of all
 # packages provided by the Nix Package Collection.
 
-{system, stdenv}: rec
-  { fetchurl = (import ../build-support/fetchurl)
-      { stdenv = stdenv
-      }
+{system, stdenv}: rec {
+
+  # build-support/fetchurl
+  fetchurl = (import ../build-support/fetchurl) {
+    stdenv = stdenv;
+  };
 
   # sys-utils/coreutils
-  , coreutils = (import ../sys-utils/coreutils)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  coreutils = (import ../sys-utils/coreutils) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # sys-utils/findutils
-  , findutils = (import ../sys-utils/findutils)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  findutils = (import ../sys-utils/findutils) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # sys-utils/diffutils
-  , diffutils = (import ../sys-utils/diffutils)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  diffutils = (import ../sys-utils/diffutils) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # sys-utils/gnused
-  , gnused = (import ../sys-utils/gnused)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  gnused = (import ../sys-utils/gnused) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # sys-utils/gnugrep
-  , gnugrep = (import ../sys-utils/gnugrep)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      , pcre = pcre
-      }
+  gnugrep = (import ../sys-utils/gnugrep) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    pcre = pcre;
+  };
 
   # sys-utils/gawk
-  , gawk = (import ../sys-utils/gawk)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  gawk = (import ../sys-utils/gawk) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # archivers/gnutar
-  , gnutar = (import ../archivers/gnutar)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  gnutar = (import ../archivers/gnutar) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # compression/gzip
-  , gzip = (import ../compression/gzip)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  gzip = (import ../compression/gzip) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # shells/bash
-  , bash = (import ../shells/bash)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  bash = (import ../shells/bash) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # devel/tools/binutils
-  , binutils = (import ../devel/tools/binutils)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  binutils = (import ../devel/tools/binutils) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # devel/tools/gnumake
-  , gnumake = (import ../devel/tools/gnumake)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  gnumake = (import ../devel/tools/gnumake) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # devel/compilers/gcc
-  , gcc = (import ../devel/compilers/gcc)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      , binutils = binutils
-      }
+  gcc = (import ../devel/compilers/gcc) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    binutils = binutils;
+  };
 
   # devel/libs/pcre
-  , pcre = (import ../devel/libs/pcre)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  pcre = (import ../devel/libs/pcre) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # devel/libs/glibc
-  , glibc = (import ../devel/libs/glibc)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      , kernelHeaders = kernelHeaders
-      }
+  glibc = (import ../devel/libs/glibc) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    kernelHeaders = kernelHeaders;
+  };
 
   # devel/libs/aterm
-  , aterm = (import ../devel/libs/aterm)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  aterm = (import ../devel/libs/aterm) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
   # os-specific/linux/kernel-headers
-  , kernelHeaders = (import ../os-specific/linux/kernel-headers)
-      { fetchurl = fetchurl
-      , stdenv = stdenv
-      }
+  kernelHeaders = (import ../os-specific/linux/kernel-headers) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
 
-  }
+}