* 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/tools/archivers/gnutar/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

pkgs/tools/archivers/gnutar/default.nix

@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "gnutar-1.13.25";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://alpha.gnu.org/gnu/tar/tar-1.13.25.tar.gz;
     md5 = "6ef8c906e81eee441f8335652670ac4a";
   };
-  inherit stdenv;
 }

pkgs/tools/archivers/unzip/builder.sh

@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 . $stdenv/setup
 
 builder() {

pkgs/tools/archivers/unzip/default.nix

@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "unzip-5.50";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz;
     md5 = "798592d62e37f92571184236947122ed";
   };
-  inherit stdenv;
 }

pkgs/tools/archivers/zip/builder.sh

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

pkgs/tools/archivers/zip/default.nix

@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "zip-2.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz;
     md5 = "5206a99541f3b0ab90f1baa167392c4f";
   };
-  stdenv = stdenv;
 }

pkgs/tools/compression/bzip2/builder.sh

@@ -1,4 +1,3 @@
-#! /bin/sh -e
 . $stdenv/setup
 installFlags="PREFIX=$out"
 genericBuild

pkgs/tools/compression/bzip2/default.nix

@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "bzip2-1.0.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz;
     md5 = "ee76864958d568677f03db8afad92beb";
   };
-  inherit stdenv;
 }

pkgs/tools/compression/gzip/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

pkgs/tools/compression/gzip/default.nix

@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "gzip-1.3.3";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://www.gzip.org/gzip-1.3.3.tar.gz;
     md5 = "52eaf713673507d21f7abefee98ba662";
   };
-  inherit stdenv;
 }

pkgs/tools/graphics/graphviz/builder.sh

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

pkgs/tools/graphics/graphviz/default.nix

@@ -3,9 +3,8 @@
 assert x11 != null && libpng != null && libjpeg != null
   && expat != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "graphviz-1.10";
-  system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
@@ -13,7 +12,6 @@ derivation {
     md5 = "e1402531abff68d146bf94e72b44dc2a";
   };
 
-  stdenv = stdenv;
   x11 = x11;
   libpng = libpng;
   libjpeg = libjpeg;

pkgs/tools/misc/coreutils/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

pkgs/tools/misc/coreutils/default.nix

@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "coreutils-5.0";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.0.tar.bz2;
     md5 = "94e5558ee2a65723d4840bfde2d323f0";
   };
-  inherit stdenv;
 }

pkgs/tools/misc/findutils/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

pkgs/tools/misc/findutils/default.nix

@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "findutils-4.1.20";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://alpha.gnu.org/pub/gnu/findutils/findutils-4.1.20.tar.gz;
     md5 = "e90ce7222daadeb8616b8db461e17cbc";
   };
-  inherit stdenv;
 }

pkgs/tools/misc/getopt/builder.sh

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

pkgs/tools/misc/getopt/default.nix

@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "getopt-1.1.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://huizen.dds.nl/~frodol/getopt-1.1.3.tar.gz;
     md5 = "7b7637dcb0ac531f1af29f4d6b018e86";
   };
-  stdenv = stdenv;
 }

pkgs/tools/networking/bittorrent/builder.sh

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

pkgs/tools/networking/bittorrent/default.nix

@@ -2,14 +2,13 @@
 
 assert wxPython.python.zlibSupport;
 
-derivation {
+stdenv.mkDerivation {
   name = "bittorrent-3.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://bitconjurer.org/BitTorrent/BitTorrent-3.3.tar.gz;
     md5 = "1ecf1fc40b4972470313f9ae728206e8";
   };
   python = wxPython.python;
-  inherit stdenv wxPython;
+  inherit wxPython;
 }

pkgs/tools/networking/cksfv/builder.sh

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

pkgs/tools/networking/cksfv/default.nix

@@ -1,12 +1,10 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "cksfv-1.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.fodder.org/cksfv/cksfv-1.3.tar.gz;
     md5 = "e00cf6a80a566539eb6f3432f2282c38";
   };
-  stdenv = stdenv;
 }

pkgs/tools/networking/curl/builder.sh

@@ -1,4 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-configureFlags="--without-ssl"
-genericBuild

pkgs/tools/networking/curl/default.nix

@@ -1,13 +1,12 @@
 {stdenv, fetchurl, zlib}:
 
-derivation {
+stdenv.mkDerivation {
   name = "curl-7.11.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://curl.haxx.se/download/curl-7.11.1.tar.bz2;
     md5 = "c2af7c3364a1a8839516f74961b6bd11";
   };
   buildInputs = [zlib];
-  inherit stdenv;
+  configureFlags = "--without-ssl";
 }

pkgs/tools/networking/par2cmdline/builder.sh

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

pkgs/tools/networking/par2cmdline/default.nix

@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "par2cmdline-0.3";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/parchive/par2cmdline-0.3.tar.gz;
     md5 = "705c97bc41b862d281dd41c219a60849";
   };
-  stdenv = stdenv;
 }

pkgs/tools/networking/wget/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

pkgs/tools/networking/wget/default.nix

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

pkgs/tools/system/which/builder.sh

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

pkgs/tools/system/which/default.nix

@@ -1,12 +1,10 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "which-2.16";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnu.org/gnu/which/which-2.16.tar.gz;
     md5 = "830b83af48347a9a3520f561e47cbc9b";
   };
-  stdenv = stdenv;
 }
 
 

pkgs/tools/text/diffutils/builder.sh

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

pkgs/tools/text/diffutils/default.nix

@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "diffutils-2.8.1";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz;
     md5 = "71f9c5ae19b60608f6c7f162da86a428";
   };
-  inherit stdenv;
 }

pkgs/tools/text/ed/builder.sh

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

pkgs/tools/text/ed/default.nix

@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "ed-0.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gnu.org/pub/gnu/ed/ed-0.2.tar.gz;
     md5 = "ddd57463774cae9b50e70cd51221281b";
   };
-  stdenv = stdenv;
 }

pkgs/tools/text/gawk/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

pkgs/tools/text/gawk/default.nix

@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "gawk-3.1.3";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/gawk/gawk-3.1.3.tar.bz2;
     md5 = "a116eec17e7ba085febb74c7758823bd";
   };
-  inherit stdenv;
 }

pkgs/tools/text/gnugrep/builder.sh

@@ -1,3 +0,0 @@
-#! /bin/sh -e
-. $stdenv/setup
-genericBuild

pkgs/tools/text/gnugrep/default.nix

@@ -1,13 +1,10 @@
 {stdenv, fetchurl, pcre}:
 
-derivation {
+stdenv.mkDerivation {
   name = "gnugrep-2.5.1";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/grep/grep-2.5.1.tar.bz2;
     md5 = "ddd99e2d5d4f4611357e31e97f080cf2";
   };
   buildInputs = [pcre];
-  inherit stdenv;
 }

pkgs/tools/text/gnupatch/builder.sh

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

pkgs/tools/text/gnupatch/default.nix

@@ -1,10 +1,8 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}: stdenv.mkDerivation {
   name = "gnupatch-2.5.4";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/patch/patch-2.5.4.tar.gz;
     md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
   };
-  stdenv = stdenv;
 }

pkgs/tools/text/gnused/builder.sh

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

pkgs/tools/text/gnused/default.nix

@@ -1,12 +1,9 @@
 {stdenv, fetchurl}:
 
-derivation {
+stdenv.mkDerivation {
   name = "gnused-4.0.7";
-  system = stdenv.system;
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.nluug.nl/pub/gnu/sed/sed-4.0.7.tar.gz;
     md5 = "005738e7f97bd77d95b6907156c8202a";
   };
-  inherit stdenv;
 }