* The stdenv setup script now defines a generic builder that allows

  builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845

4 files changed, 27 insertions, 14 deletions

diff --git a/pkgs/tools/networking/curl/builder.sh b/pkgs/tools/networking/curl/builder.sh
new file mode 100755
index 000000000000..6e33f41fff56
--- /dev/null
+++ b/pkgs/tools/networking/curl/builder.sh
@@ -0,0 +1,4 @@
+#! /bin/sh -e
+. $stdenv/setup
+configureFlags="--without-ssl"
+genericBuild
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
new file mode 100644
index 000000000000..a2e9c273847f
--- /dev/null
+++ b/pkgs/tools/networking/curl/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, zlib}:
+
+derivation {
+  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;
+}
diff --git a/pkgs/tools/networking/wget/builder.sh b/pkgs/tools/networking/wget/builder.sh
index 9523d7e9ca82..a73f5a6d5b8d 100755
--- a/pkgs/tools/networking/wget/builder.sh
+++ b/pkgs/tools/networking/wget/builder.sh
@@ -1,9 +1,3 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd wget-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
+#! /bin/sh -e
+. $stdenv/setup
+genericBuild
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index d0b7d01c1de8..b3ec1829421f 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,10 +1,12 @@
-{stdenv, fetchurl}: derivation {
-  name = "wget-1.9";
+{stdenv, fetchurl}:
+
+derivation {
+  name = "wget-1.9.1";
   system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/wget/wget-1.9.tar.gz;
-    md5 = "18ac093db70801b210152dd69b4ef08a";
+    url = ftp://ftp.nl.net/pub/gnu/wget/wget-1.9.1.tar.gz;
+    md5 = "e6051f1e1487ec0ebfdbda72bedc70ad";
   };
-  stdenv = stdenv;
+  inherit stdenv;
 }