* 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/development/tools/parsing/bison/builder-new.sh

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

pkgs/development/tools/parsing/bison/builder.sh

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

pkgs/development/tools/parsing/bison/default.nix

@@ -1,13 +1,11 @@
 {stdenv, fetchurl, m4}:
 assert m4 != null;
-derivation {
+stdenv.mkDerivation {
   name = "bison-1.875";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2;
     md5 = "b7f8027b249ebd4dd0cc948943a71af0";
   };
-  stdenv = stdenv;
   m4 = m4;
 }