* 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/asc-support/builder.sh

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

pkgs/development/tools/parsing/asf-support/builder.sh

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

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;
 }

pkgs/development/tools/parsing/flex/builder-new.sh

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

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

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

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

@@ -1,13 +1,11 @@
 {stdenv, fetchurl, yacc}:
 assert yacc != null;
-derivation {
+stdenv.mkDerivation {
   name = "flex-2.5.4a";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/flex/flex-2.5.4a.tar.gz;
     md5 = "bd8753d0b22e1f4ec87a553a73021adf";
   };
-  stdenv = stdenv;
   yacc = yacc;
 }

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

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$aterm $getopt $toolbuslib $ptsupport $sdfsupport $asfsupport $ascsupport $sglr"
 . $stdenv/setup
 

pkgs/development/tools/parsing/pt-support/builder.sh

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

pkgs/development/tools/parsing/sdf-support/builder.sh

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

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

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

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

@@ -1,13 +1,11 @@
 {stdenv, fetchurl, aterm, getopt}:
-derivation {
+stdenv.mkDerivation {
   name = "sdf2-1.6";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-1.6.tar.gz;
     md5 = "283be0b4c7c9575c1b5cc735316e6192";
   };
-  stdenv = stdenv;
   aterm = aterm;
   getopt = getopt;
 }

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

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

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

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