* Remove trivial builders.

* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

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

pkgs/os-specific/linux/alsa/library/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1

pkgs/os-specific/linux/alsa/library/default.nix

@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "alsa-lib-0.9.8";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-0.9.8.tar.bz2;
     md5 = "c9f163fb0623de1b92bf287712641f6e";
   };
-  stdenv = stdenv;
 }

pkgs/os-specific/linux/e2fsprogs/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$gettext"
 . $stdenv/setup 
 

pkgs/os-specific/linux/e2fsprogs/default.nix

@@ -1,12 +1,11 @@
 {stdenv, fetchurl, gettext}:
 
-derivation {
+stdenv.mkDerivation {
   name = "e2fsprogs-1.34";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.34.tar.gz;
     md5 = "9be9375224f0970a55e39ebebf2a0ce5";
   };
-  inherit stdenv gettext;
+  inherit gettext;
 }

pkgs/os-specific/linux/kernel-headers/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh
-
 . $stdenv/setup
 
 

pkgs/os-specific/linux/kernel-headers/default.nix

@@ -2,13 +2,11 @@
 
 assert stdenv.system == "i686-linux";
 
-derivation {
+stdenv.mkDerivation {
   name = "linux-headers-2.4.25-i386";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.25.tar.bz2;
     md5 = "5fc8e9f43fa44ac29ddf9a9980af57d8";
   };
-  inherit stdenv;
 }

pkgs/os-specific/linux/net-tools/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs=""
 . $stdenv/setup
 

pkgs/os-specific/linux/net-tools/default.nix

@@ -1,13 +1,11 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "net-tools-1.60";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2;
     md5 = "888774accab40217dde927e21979c165";
   };
   config = ./config.h;
-  inherit stdenv;
 }

pkgs/os-specific/linux/sysvinit/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$patch"
 . $stdenv/setup
 

pkgs/os-specific/linux/sysvinit/default.nix

@@ -1,13 +1,12 @@
 {stdenv, fetchurl, patch}:
 
-derivation {
+stdenv.mkDerivation {
   name = "sysvinit-2.85";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz;
     md5 = "8a2d8f1ed5a2909da04132fefa44905e";
   };
   srcPatch = ./patch;
-  inherit stdenv patch;
+  inherit patch;
 }

pkgs/os-specific/linux/util-linux/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$patch"
 . $stdenv/setup
 

pkgs/os-specific/linux/util-linux/default.nix

@@ -1,13 +1,12 @@
 {stdenv, fetchurl, patch}:
 
-derivation {
+stdenv.mkDerivation {
   name = "util-linux-2.12";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.cwi.nl/aeb/util-linux/util-linux-2.12.tar.gz;
     md5 = "997adf78b98d9d1c5db4f37ea982acff";
   };
   mconfigPatch = ./MCONFIG.patch;
-  inherit stdenv patch;
+  inherit patch;
 }