* Added expect.

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

pkgs/development/interpreters/tcl/default.nix

@@ -1,10 +1,14 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "tcl-8.4.16";
+  name = "tcl-8.4.18";
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://sourceforge/tcl/tcl8.4.16-src.tar.gz;
-    sha256 = "0v9mh53kdvfm4kxgsw8gfxsfl8kvbnnp22bpwyyg5sa4jyjjbs93";
+    url = mirror://sourceforge/tcl/tcl8.4.18-src.tar.gz;
+    sha256 = "197h3m2lc5a6famc683zhjp55774gf8zwggfy2893v48lp5p7qny";
+  };
+  meta = {
+    description = "The Tcl scription language";
+    homepage = http://www.tcl.tk/;
   };
 }

pkgs/tools/misc/expect/default.nix

@@ -0,0 +1,26 @@
+{stdenv, fetchurl, tcl}:
+
+stdenv.mkDerivation {
+  name = "expect-5.43.0";
+  
+  src = fetchurl {
+    url = http://expect.nist.gov/old/expect-5.43.0.tar.bz2;
+    sha256 = "1j6vyr8lx1fbl641hkkd6hhh9ifniklskfv00pbvy33h86a3mrvn";
+  };
+
+  buildInputs = [tcl];
+
+  #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";
+
+  # http://wiki.linuxfromscratch.org/lfs/ticket/2126
+  #preBuild = ''
+  #  substituteInPlace exp_inter.c --replace tcl.h tclInt.h
+  #'';
+
+  configureFlags = "--with-tcl=${tcl}/lib --with-tclinclude=${tcl}/include";
+
+  meta = {
+    description = "A tool for automating interactive applications";
+    homepage = http://expect.nist.gov/;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -477,6 +477,10 @@ rec {
     inherit fetchurl stdenv pkgconfig libexif popt;
   };
 
+  expect = import ../tools/misc/expect {
+    inherit fetchurl stdenv tcl;
+  };
+
   file = import ../tools/misc/file {
     inherit fetchurl stdenv;
   };