* 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/shells/bash/builder.sh

@@ -1,4 +1,2 @@
-#! /bin/sh -e
-. $stdenv/setup
 genericBuild
 (cd $out/bin && ln -s bash sh) || exit 1

pkgs/shells/bash/default.nix

@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "bash-2.05b";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nl.net/pub/gnu/bash/bash-2.05b.tar.gz;
     md5 = "5238251b4926d778dfe162f6ce729733";
   };
-  inherit stdenv;
 }