* 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/misc/nix/builder.sh

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

pkgs/misc/nix/default.nix

@@ -4,13 +4,12 @@ assert aterm != null && bdb != null;
 # assert bdb.version >= 4.2
 # assert aterm.version >= 2.0
 
-derivation {
+stdenv.mkDerivation {
   name = "nix-0.5pre807";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre807/nix-0.5pre807.tar.bz2;
     md5 = "fa64bfc39de3e8903954328e4a90d530";
   };
-  inherit stdenv aterm bdb;
+  inherit aterm bdb;
 }

pkgs/misc/uml-utilities/builder.sh

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

pkgs/misc/uml-utilities/default.nix

@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "uml-utilities-20040114";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://unc.dl.sourceforge.net/sourceforge/user-mode-linux/uml_utilities_20040114.tar.bz2;
     md5 = "1fd5b791ef32c6a3ed4ae42c4a53a316";
   };
-  inherit stdenv;
 }

pkgs/misc/uml/builder.sh

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

pkgs/misc/uml/default.nix

@@ -2,9 +2,8 @@
 
 assert patch != null && perl != null && m4 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "uml-2.4.22-3";
-  system = stdenv.system;
   builder = ./builder.sh;
   linuxSrc = fetchurl {
     url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2;
@@ -15,5 +14,5 @@ derivation {
     md5 = "1ffa698fed37d14c6750ec841b7d9858";
   };
   config = ./config;
-  inherit stdenv patch perl m4;
+  inherit patch perl m4;
 }