Added aterm 2.1

svn path=/nixpkgs/branches/martin2/; revision=1008

ChangeLog

@@ -1,12 +0,0 @@
-2003-08-18  Eelco Visser  <visser@cs.uu.nl>
-
-	* pkgs/strategoxt/pkg-build.sh: generic build script for packages
-	with the standard untar; bootstrap; configure; make; make install
-	interface.  The script is parameterized with arguments for
-	configure. That is, all arguments are passed verbatim to
-	configure.
-
-	* asfix-tools, gpp, sc, srts, stratego-front, xtc: Fix expressions
-	and (trivial) build script for basic strategoxt packages. All
-	packages are abstracted on subversion revision.
-

pkgs-ng/build-support/fetchurl/builder.sh

@@ -1,21 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup
-
-echo "downloading $url into $out..."
-
-#prefetch=@prefix@/store/nix-prefetch-url-$md5
-prefetch=/nix/store/nix-prefetch-url-$md5
-if test -f "$prefetch"; then
-    echo "using prefetched $prefetch";
-    mv $prefetch $out || exit 1
-else
-    wget --passive-ftp "$url" -O "$out" || exit 1
-fi
-
-#actual=$(@bindir@/nix-hash --flat $out)
-actual=$(/nix/bin/nix-hash --flat $out)
-if test "$actual" != "$md5"; then
-    echo "hash is $actual, expected $md5"
-    exit 1
-fi

pkgs-ng/system/all-packages-generic.fix

@@ -1,401 +0,0 @@
-# This file evaluates to a function that, when supplied with a system
-# identifier and a standard build environment, returns the set of all
-# packages provided by the Nix Package Collection.
-
-{system, stdenv}: rec {
-
-  ### BUILD SUPPORT
-
-  fetchurl = (import ../build-support/fetchurl) {
-    stdenv = stdenv;
-  };
-
-
-  ### TOOLS
-
-  coreutils = (import ../tools/misc/coreutils) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  findutils = (import ../tools/misc/findutils) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  diffutils = (import ../tools/text/diffutils) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnused = (import ../tools/text/gnused) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnugrep = (import ../tools/text/gnugrep) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pcre = pcre;
-  };
-
-  gawk = (import ../tools/text/gawk) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  ed = (import ../tools/text/ed) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnutar = (import ../tools/archivers/gnutar) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  zip = (import ../tools/archivers/zip) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gzip = (import ../tools/compression/gzip) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  bzip2 = (import ../tools/compression/bzip2) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  wget = (import ../tools/networking/wget) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-
-  ### SHELLS
-
-  bash = (import ../shells/bash) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-
-  ### DEVELOPMENT
-
-  binutils = (import ../development/tools/misc/binutils) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnum4 = (import ../development/tools/misc/gnum4) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  pkgconfig = (import ../development/tools/misc/pkgconfig) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gnumake = (import ../development/tools/build-managers/gnumake) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  bison = (import ../development/tools/parsing/bison) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    m4 = gnum4;
-  };
-
-  flex = (import ../development/tools/parsing/flex) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    yacc = bison;
-  };
-
-  gcc = (import ../development/compilers/gcc) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    binutils = binutils;
-  };
-
-  perl = (import ../development/interpreters/perl) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  pcre = (import ../development/libraries/pcre) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  glibc = (import ../development/libraries/glibc) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    kernelHeaders = kernelHeaders;
-  };
-
-  aterm = (import ../development/libraries/aterm) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  expat = (import ../development/libraries/expat) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  libxml2 = (import ../development/libraries/libxml2) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    zlib = zlib;
-  };
-
-  gettext = (import ../development/libraries/gettext) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  db4 = (import ../development/libraries/db4) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  openssl = (import ../development/libraries/openssl) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    perl = perl;
-  };
-
-  freetype = (import ../development/libraries/freetype) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  fontconfig = (import ../development/libraries/fontconfig) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    x11 = xfree86;
-    freetype = freetype;
-    expat = expat;
-    ed = ed;
-  };
-
-  xft = (import ../development/libraries/xft) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    x11 = xfree86;
-    fontconfig = fontconfig;
-  };
-
-  zlib = (import ../development/libraries/zlib) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  libjpeg = (import ../development/libraries/libjpeg) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  libtiff = (import ../development/libraries/libtiff) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    zlib = zlib;
-    libjpeg = libjpeg;
-  };
-
-  libpng = (import ../development/libraries/libpng) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    zlib = zlib;
-  };
-
-  glib = (import ../development/libraries/gtk+/glib) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    gettext = gettext; 
-    perl = perl;
-  };
-
-  atk = (import ../development/libraries/gtk+/atk) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    glib = glib; 
-    perl = perl;
-  };
-
-  pango = (import ../development/libraries/gtk+/pango) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    x11 = xfree86;
-    glib = glib;
-    xft = xft;
-  };
-
-  gtk = (import ../development/libraries/gtk+/gtk+) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    x11 = xfree86;
-    glib = glib;
-    atk = atk;
-    pango = pango;
-    perl = perl;
-    libtiff = libtiff;
-    libjpeg = libjpeg;
-    libpng = libpng;
-  };
-
-  glib1 = (import ../development/libraries/gtk+-1/glib) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  gtk1 = (import ../development/libraries/gtk+-1/gtk+) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    x11 = xfree86;
-    glib = glib1;
-  };
-
-  gdkpixbuf = (import ../development/libraries/gtk+-1/gdk-pixbuf) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    gtk = gtk1;
-    libtiff = libtiff;
-    libjpeg = libjpeg;
-    libpng = libpng;
-  };
-
-  gnet = (import ../development/libraries/gnet) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    glib = glib;
-  };
-
-  libIDL = (import ../development/libraries/libIDL) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    glib = glib;
-    lex = flex;
-    yacc = bison;
-  };
-
-
-  ### SERVERS
-
-  apacheHttpd = (import ../servers/http/apache-httpd) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    sslSupport = true;
-    db4Support = true;
-    perl = perl;
-    openssl = openssl;
-    db4 = db4;
-    expat = expat;
-  };
-
-  xfree86 = (import ../servers/x11/xfree86) {
-    buildServer = false;
-    buildClientLibs = true;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    flex = flex;
-    bison = bison;
-  };
-
-
-  ### OS-SPECIFIC
-
-  kernelHeaders = (import ../os-specific/linux/kernel-headers) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-  alsaLib = (import ../os-specific/linux/alsa/library) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-  };
-
-
-  ### APPLICATIONS
-
-  subversion = (import ../applications/version-management/subversion) {
-    localServer = true;
-    httpServer = false;
-    sslSupport = true;
-    swigBindings = false;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    openssl = openssl;
-    httpd = apacheHttpd;
-    db4 = db4;
-    expat = expat;
-  };
-
-  pan = (import ../applications/networking/newsreaders/pan) {
-    spellChecking = false;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    gtk = gtk;
-    gnet = gnet;
-    libxml2 = libxml2;
-    perl = perl;
-  };
-
-  sylpheed = (import ../applications/networking/mailreaders/sylpheed) {
-    sslSupport = true;
-    imageSupport = true;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    gtk = gtk1;
-    openssl = openssl;
-    gdkpixbuf = gdkpixbuf;
-  };
-
-  firebird = (import ../applications/networking/browsers/firebird) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    gtk = gtk;
-    perl = perl;
-    zip = zip;
-    libIDL = libIDL;
-  };
-
-  MPlayer = (import ../applications/video/MPlayer) {
-    alsaSupport = true;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    x11 = xfree86;
-    freetype = freetype;
-    alsa = alsaLib;
-  };
-
-  MPlayerPlugin = (import ../applications/video/mplayerplug-in) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    x11 = xfree86;
-  };
-
-  gqview = (import ../applications/graphics/gqview) {
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    gtk = gtk;
-    libpng = libpng;
-  };
-
-}

pkgs-ng/system/i686-suse-linux.fix

@@ -1 +0,0 @@
-(import ./user-environment.fix) {system = "i686-suse-linux"}

pkgs-ng/system/populate-linkdirs.pl

@@ -1,65 +0,0 @@
-#! /usr/bin/perl -w
-
-use strict;
-use Cwd;
-
-my $selfdir = $ENV{"out"};
-mkdir "$selfdir", 0755 || die "error creating $selfdir";
-
-# For each activated package, create symlinks.
-
-sub createLinks {
-    my $srcdir = shift;
-    my $dstdir = shift;
-
-    my @srcfiles = glob("$srcdir/*");
-
-    foreach my $srcfile (@srcfiles) {
-        my $basename = $srcfile;
-        $basename =~ s/^.*\///g; # strip directory
-        my $dstfile = "$dstdir/$basename";
-	if ($srcfile =~ /\/envpkgs$/) {
-	} elsif (-d $srcfile) {
-            # !!! hack for resolving name clashes
-            if (!-e $dstfile) {
-                mkdir $dstfile, 0755 || 
-                    die "error creating directory $dstfile";
-            }
-            -d $dstfile or die "$dstfile is not a directory";
-            createLinks($srcfile, $dstfile);
-        } elsif (-l $dstfile) {
-            my $target = readlink($dstfile);
-            die "collission between $srcfile and $target";
-        } else {
-#            print "linking $dstfile to $srcfile\n";
-            symlink($srcfile, $dstfile) ||
-                die "error creating link $dstfile";
-        }
-    }
-}
-
-my %done;
-
-sub addPkg {
-    my $pkgdir = shift;
-
-    return if (defined $done{$pkgdir});
-    $done{$pkgdir} = 1;
-
-    print "merging $pkgdir\n";
-
-    createLinks("$pkgdir", "$selfdir");
-
-#    if (-f "$pkgdir/envpkgs") {
-#	my $envpkgs = `cat $pkgdir/envpkgs`;
-#	chomp $envpkgs;
-#	my @envpkgs = split / +/, $envpkgs;
-#	foreach my $envpkg (@envpkgs) {
-#	    addPkg($envpkg);
-#	}
-#    }
-}
-
-foreach my $pkgdir (split ' ', $ENV{"dirs"}) {
-    addPkg($pkgdir);
-}

pkgs-ng/system/user-environment.fix

@@ -1,30 +0,0 @@
-# Given a system identifier, this function returns a derivation of a
-# user environment, i.e., a set of symbolic links to `activated'
-# packages.  The resulting package is typically passed to the
-# `nix-switch' command in order to actually activate it.
-
-{system}: let {
-  # All activated packages.
-  pkgs = (import ./all-packages.fix) {system = system};
-
-  # The packages selection for inclusion in the user environment.
-  # This list should be generated automatically by a package
-  # management user interface.
-  selectedPkgs = [
-    pkgs.subversion
-    pkgs.pan
-    pkgs.sylpheed
-    pkgs.firebird
-    pkgs.MPlayer
-    pkgs.MPlayerPlugin
-    pkgs.gqview
-  ];
-
-  # Create a user environment.
-  body = derivation { 
-    name = "user-environment";
-    system = system;
-    builder = ./populate-linkdirs.pl;
-    dirs = selectedPkgs;
-  };
-}

pkgs/MPlayer/MPlayer-build.sh

@@ -1,19 +0,0 @@
-#! /bin/sh
-
-envpkgs="$freetype $x11"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-tar xvfj $fonts || exit 1
-cd MPlayer-* || exit 1
-./configure --prefix=$out --with-win32libdir=$win32codecs \
- --with-x11incdir=$x11/include --with-x11libdir=$x11/lib \
- --with-reallibdir=$win32codecs \
- --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
- --disable-lirc --disable-svga --disable-libdv \
- --disable-vorbis --disable-png --disable-jpeg --disable-gif \
- --enable-runtime-cpudetection \
- || exit 1
-make || exit 1
-make install || exit 1
-cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font || exit 1

pkgs/MPlayer/MPlayer.fix

@@ -1,21 +0,0 @@
-Package(
-  [ ("name", "MPlayer-1.0pre2")
-
-  , ("build", Relative("MPlayer/MPlayer-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre2.tar.bz2")
-      , ("md5", "a60c179468f85e83e3f9e1922e81ad64")
-      ]))
-
-  , ("fonts", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2")
-      , ("md5", "1ecd31d17b51f16332b1fcc7da36b312")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("freetype", IncludeFix("freetype/freetype.fix"))
-  , ("win32codecs", IncludeFix("win32codecs/win32codecs.fix"))
-  ]
-)

pkgs/README

@@ -95,3 +95,15 @@ ELSE IF it's an APPLICATION:
       ./applications/networking/misc
   ELSE
     ./applications/misc
+
+ELSE IF it's DATA (i.e., doe not have a straight-forward executable semantics):
+
+  IF it's related to SGML/XML processing:
+    IF it's a XML DTD:
+      ./data/sgml+xml/schemas/xml-dtd
+    ELSE IF it's an XSLT stylesheet (okay, these are executable...):
+      ./data/sgml+xml/stylesheets/xslt
+
+ELSE:
+
+  ./misc

pkgs/VERSION

@@ -0,0 +1 @@
+0.5

pkgs/Xft/Xft-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-envpkgs="$fontconfig $x11"
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$PATH
-
-tar xvfz $src || exit 1
-cd xft-* || exit 1
-./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
-make || exit 1
-make install || exit 1
-echo $envpkgs > $out/envpkgs || exit 1

pkgs/Xft/Xft.fix

@@ -1,16 +0,0 @@
-Package(
-  [ ("name", "Xft-2.1.2")
-
-  , ("build", Relative("Xft/Xft-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://pdx.freedesktop.org/software/fontconfig/releases/xft-2.1.2.tar.gz")
-      , ("md5", "defb7e801d4938b8b15a426ae57e2f3f")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("x11", IncludeFix("xfree86/xfree86.fix"))
-  , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
-  ]
-)

pkgs/applications/editors/emacs/modes/nxml/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+mkdir -p $out/emacs/site-lisp || exit 1
+cd $out/emacs/site-lisp || exit 1
+tar xvfz $src || exit 1
+mv nxml-mode-*/* . || exit 1
+rmdir nxml-mode-*
+
+exit 0

pkgs/applications/editors/emacs/modes/nxml/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "nxml-mode-20031031";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.thaiopensource.com/download/nxml-mode-20031031.tar.gz;
+    md5 = "4cbc32047183e6cc1b7a2757d1078bd2";
+  };
+  stdenv = stdenv;
+}

pkgs/applications/graphics/gqview/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl, pkgconfig, gtk, libpng}:
 
-assert !isNull pkgconfig && !isNull gtk && !isNull png;
+assert !isNull pkgconfig && !isNull gtk && !isNull libpng;
 # Note that we cannot just copy gtk's png attribute, since gtk might
 # not be linked against png.
 assert libpng == gtk.libpng;

pkgs/applications/misc/hello/builder.sh

@@ -1,9 +1,10 @@
 #! /bin/sh
 
+buildinputs="$perl"
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
-cd ed-* || exit 1
+cd hello-* || exit 1
 ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1

pkgs/applications/misc/hello/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, perl}:
+
+derivation {
+  name = "hello-2.1.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
+    md5 = "70c9ccf9fac07f762c24f2df2290784d";
+  };
+  stdenv = stdenv;
+  perl = perl;
+}

pkgs/applications/networking/browsers/firefox/builder.sh

@@ -3,7 +3,7 @@
 buildinputs="$pkgconfig $gtk $perl $zip $libIDL"
 . $stdenv/setup || exit 1
 
-tar xvfz $src || exit 1
+tar xvfj $src || exit 1
 cd mozilla || exit 1
 
 cat > .mozconfig <<EOF

pkgs/applications/networking/browsers/firefox/default.nix

@@ -7,13 +7,13 @@ assert !isNull pkgconfig && !isNull gtk && !isNull perl
 assert libIDL.glib == gtk.glib;
 
 derivation {
-  name = "MozillaFirebird-0.7";
+  name = "firefox-0.8";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/firebird/releases/0.7/MozillaFirebird-source-0.7.tar.gz;
-    md5 = "35112566a3dca5bdf363972056afc462";
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/firefox-source-0.8.tar.bz2;
+    md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
   };
 
   stdenv = stdenv;

pkgs/applications/networking/mailreaders/sylpheed/default.nix

@@ -8,13 +8,13 @@ assert sslSupport -> !isNull openssl;
 assert imageSupport -> !isNull gdkpixbuf;
 
 derivation {
-  name = "sylpheed-0.9.7";
+  name = "sylpheed-0.9.8a";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.7.tar.bz2;
-    md5 = "399deb5abd52396d26d6475689a5ec3f";
+    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.8a.tar.bz2;
+    md5 = "6ac823f06d8fe4f265f37d9c96068e05";
   };
 
   sslSupport = sslSupport;

pkgs/applications/networking/newsreaders/pan/builder.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-buildinputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl"
+buildinputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl $pcre"
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1

pkgs/applications/networking/newsreaders/pan/default.nix

@@ -1,20 +1,21 @@
 { spellChecking ? true
-, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet, libxml2, perl
+, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet
+, libxml2, perl, pcre
 }:
 
 assert !isNull pkgconfig && !isNull gtk && !isNull gnet
-  && !isNull libxml2 && !isNull perl;
+  && !isNull libxml2 && !isNull perl && !isNull pcre;
 assert spellChecking -> !isNull gtkspell && gtk == gtkspell.gtk;
 assert gtk.glib == gnet.glib;
 
 derivation {
-  name = "pan-0.14.2";
+  name = "pan-0.14.2.90";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://pan.rebelbase.com/download/releases/0.14.2/SOURCE/pan-0.14.2.tar.bz2;
-    md5 = "ed3188e7059bb6d6c209ee5d46ac1852";
+    url = http://pan.rebelbase.com/download/releases/0.14.2.90/SOURCE/pan-0.14.2.90.tar.bz2;
+    md5 = "03e6d936254e775a94995ba261be23eb";
   };
 
   spellChecking = spellChecking;
@@ -26,4 +27,5 @@ derivation {
   gnet = gnet;
   libxml2 = libxml2;
   perl = perl;
+  pcre = pcre;
 }

pkgs/applications/version-management/subversion/builder.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-buildinputs="$openssl $db4 $httpd $swig $expat"
+buildinputs="$openssl $db4 $httpd $swig $python $expat"
 . $stdenv/setup || exit 1
 
 if test $localServer; then

pkgs/applications/version-management/subversion/default.nix

@@ -10,27 +10,23 @@ assert !isNull expat;
 assert localServer -> !isNull db4;
 assert httpServer -> !isNull httpd && httpd.expat == expat;
 assert sslSupport -> !isNull openssl && (httpServer -> httpd.openssl == openssl);
-assert swigBindings -> !isNull swig;
+assert swigBindings -> !isNull swig && swig.pythonSupport;
 
 derivation {
-  name = "subversion-0.32.1";
+  name = "subversion-0.37.0";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://svn.collab.net/tarballs/subversion-0.32.1.tar.gz;
-    md5 = "b06717a8ef50db4b5c4d380af00bd901";
+    url = http://subversion.tigris.org/tarballs/subversion-0.37.0.tar.gz;
+    md5 = "048c4d17d5880dc8f3699020eac56224";
   };
 
-  localServer = localServer;
-  httpServer = httpServer;
-  sslSupport = sslSupport;
-  swigBindings = swigBindings;
-
-  stdenv = stdenv;
   openssl = if sslSupport then openssl else null;
   httpd = if httpServer then httpd else null;
-  expat = expat;
   db4 = if localServer then db4 else null;
   swig = if swigBindings then swig else null;
+  python = if swigBindings then swig.python else null;
+
+  inherit stdenv expat localServer httpServer sslSupport swigBindings;
 }

pkgs/applications/video/MPlayer/default.nix

@@ -5,13 +5,13 @@ assert !isNull x11 && !isNull freetype;
 assert alsaSupport -> !isNull alsa;
 
 derivation {
-  name = "MPlayer-1.0pre2";
+  name = "MPlayer-1.0pre3";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre2.tar.bz2;
-    md5 = "a60c179468f85e83e3f9e1922e81ad64";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre3.tar.bz2;
+    md5 = "998becb79417c6a14d15c07e85188b82";
   };
   fonts = fetchurl {
     url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;

pkgs/applications/video/vlc/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+buildinputs="$x11 $wxGTK $libdvdcss $libdvdread $libdvdplay $mpeg2dec $a52dec $libmad $alsa"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd vlc-* || exit 1
+./configure --prefix=$out \
+ --disable-ffmpeg \
+ --enable-alsa \
+ || exit 1
+make || exit 1
+make install || exit 1

pkgs/applications/video/vlc/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, x11, wxGTK, libdvdcss, libdvdplay
+, mpeg2dec, a52dec, libmad, alsa}:
+
+assert !isNull x11 && !isNull wxGTK && !isNull libdvdcss
+  && !isNull libdvdplay && !isNull mpeg2dec && !isNull a52dec
+  && !isNull libmad && !isNull alsa;
+assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
+
+derivation {
+  name = "vlc-0.7.0";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://download.videolan.org/pub/videolan/vlc/0.7.0/vlc-0.7.0.tar.gz;
+    md5 = "05efef68528892ca933585c7db0842e3";
+  };
+
+  stdenv = stdenv;
+  x11 = x11;
+  wxGTK = wxGTK;
+  libdvdcss = libdvdcss;
+  libdvdplay = libdvdplay;
+  libdvdread = libdvdplay.libdvdread;
+  mpeg2dec = mpeg2dec;
+  a52dec = a52dec;
+  libmad = libmad;
+  alsa = alsa;
+}

pkgs/applications/video/zapping/builder.sh

@@ -0,0 +1,18 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl $python $x11 $libgnomeui \
+  $libglade $scrollkeeper $esound $gettext $zvbi $libjpeg $libpng"
+. $stdenv/setup || exit 1
+
+# !!! hack; this is because $linuxHeaders/config.h includes some
+# file autoconf.h.  What is that?
+export NIX_CFLAGS_COMPILE="-D_LINUX_CONFIG_H $NIX_CFLAGS_COMPILE"
+
+# Bug: esound is not added to LDFLAGS, and libtool then picks it up from /usr!
+
+tar xvfj $src || exit 1
+cd zapping-* || exit 1
+LDFLAGS="-L$esound/lib" ./configure --prefix=$out || exit 1
+make || exit 1
+# !!! hack - it tries to setuid to root
+make install ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g` || exit 1

pkgs/applications/video/zapping/default.nix

@@ -0,0 +1,45 @@
+{ teletextSupport ? true
+, jpegSupport ? true
+, pngSupport ? true
+, stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
+, libglade, scrollkeeper, esound, gettext
+, zvbi ? null, libjpeg ? null, libpng ? null }:
+
+assert !isNull pkgconfig && !isNull perl && !isNull python &&
+  !isNull x11 && !isNull libgnomeui && !isNull libglade &&
+  !isNull scrollkeeper && !isNull esound && !isNull gettext;
+
+assert teletextSupport -> !isNull zvbi && zvbi.pngSupport
+  && pngSupport && zvbi.libpng == libpng;
+
+assert jpegSupport -> !isNull libjpeg;
+assert pngSupport -> !isNull libpng;
+
+derivation {
+  name = "zapping-0.7cvs6";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs6.tar.bz2;
+    md5 = "cdedc0088c70f4520c37066ec05cb996";
+  };
+
+  teletextSupport = teletextSupport;
+  jpegSupport = jpegSupport;
+  pngSupport = pngSupport;
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  perl = perl;
+  python = python;
+  x11 = x11;
+  libgnomeui = libgnomeui;
+  libglade = libglade;
+  scrollkeeper = scrollkeeper;
+  esound = esound;
+  gettext = gettext;
+  zvbi = if teletextSupport then zvbi else null;
+  libjpeg = if jpegSupport then libjpeg else null;
+  libpng = if pngSupport then libpng else null;
+}

pkgs/asfix-tools/asfix-tools-build.sh

@@ -1,3 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild --with-aterm=$aterm --with-sdf=$sdf2 --with-srts=$srts --with-xtc=$xtc

pkgs/asfix-tools/asfix-tools.fix

@@ -1,19 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "asfix-tools")
-
-    , ("build", Relative("asfix-tools/asfix-tools-build.sh"))
-    , ("pkgbuild", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "asfix-tools"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    , ("aterm",  IncludeFix("aterm/aterm.fix"))
-    , ("sdf2",   IncludeFix("sdf2/sdf2.fix"))
-    , ("autoxt", App(IncludeFix("autoxt/autoxt.fix"),[("rev",Var("rev"))]))
-    , ("srts",   App(IncludeFix("srts/srts.fix"),[("rev",Var("rev"))]))
-    , ("xtc",    App(IncludeFix("xtc/xtc.fix"),[("rev",Var("rev"))]))
-    ]
-  )
-)

pkgs/aterm/aterm-build.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd aterm-* || exit 1
-./configure --prefix=$out --with-gcc || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs/aterm/aterm.fix

@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "aterm-2.0")
-  , ("build", Relative("aterm/aterm-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")
-      , ("md5", "853474e4bcf4a85f7d38a0676b36bded")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)

pkgs/atk/atk-build.sh

@@ -1,13 +0,0 @@
-#! /bin/sh
-
-envpkgs=$glib
-. $stdenv/setup || exit 1
-export PATH=$pkgconfig/bin:$perl/bin:$PATH
-
-tar xvfj $src || exit 1
-cd atk-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-
-echo $envpkgs > $out/envpkgs || exit 1

pkgs/atk/atk.fix

@@ -1,16 +0,0 @@
-Package(
-  [ ("name", "atk-1.2.4")
-
-  , ("build", Relative("atk/atk-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2")
-      , ("md5", "2d6d50df31abe0e8892b5d3e7676a02d")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
-  , ("glib", IncludeFix("glib/glib.fix"))
-  , ("perl", IncludeFix("perl/perl.fix"))
-  ]
-)

pkgs/autoxt/autoxt-build.sh

@@ -1,3 +0,0 @@
-#! /bin/sh
-set -e
-$pkgbuild

pkgs/autoxt/autoxt.fix

@@ -1,13 +0,0 @@
-Function(["rev"],
-  Package(
-    [ ("name", "autoxt")
-
-    , ("build", Relative("strategoxt/pkg-build.sh"))
-
-    , ("src", App(IncludeFix("strategoxt/fetchsvn.fix"),
-                  [ ("name", "autoxt"), ("rev",  Var("rev"))]))
-
-    , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-    ]
-  )
-)

pkgs/baseenv/baseenv-build.sh

@@ -1,25 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-mkdir $out || exit 1
-mkdir $out/bin || exit 1
-
-sed \
- -e s^@OUT\@^$out^g \
- < $setup > $out/setup || exit 1
-
-sed \
- -e 's^@GCC\@^$NIX_CC^g' \
- < $gccwrapper > $out/bin/gcc || exit 1
-chmod +x $out/bin/gcc || exit 1
-ln -s gcc $out/bin/cc || exit 1
-
-sed \
- -e 's^@GCC\@^$NIX_CXX^g' \
- < $gccwrapper > $out/bin/g++ || exit 1
-chmod +x $out/bin/g++ || exit 1
-ln -s g++ $out/bin/c++ || exit 1
-
-cp $ldwrapper $out/bin/ld || exit 1
-chmod +x $out/bin/ld || exit 1

pkgs/baseenv/baseenv.fix

@@ -1,9 +0,0 @@
-Package(
-  [ ("name", "baseenv")
-  , ("build", Relative("baseenv/baseenv-build.sh"))
-
-  , ("setup", Relative("baseenv/setup.sh"))
-  , ("gccwrapper", Relative("baseenv/gcc-wrapper.sh"))
-  , ("ldwrapper", Relative("baseenv/ld-wrapper.sh"))
-  ]
-)

pkgs/baseenv/gcc-wrapper.sh

@@ -1,42 +0,0 @@
-#! /bin/sh
-
-IFS=
-
-justcompile=0
-for i in $@; do
-    if test "$i" == "-c"; then
-        justcompile=1
-    elif test "$i" == "-S"; then
-        justcompile=1
-    elif test "$i" == "-E"; then
-        justcompile=1
-    elif test "$i" == "-E"; then
-        justcompile=1
-    elif test "$i" == "-M"; then
-        justcompile=1
-    elif test "$i" == "-MM"; then
-        justcompile=1
-    fi
-done
-
-IFS=" "
-extra=($NIX_CFLAGS_COMPILE)
-if test "$justcompile" != "1"; then
-    extra=(${extra[@]} $NIX_CFLAGS_LINK)
-    for i in $NIX_LDFLAGS; do
-	extra=(${extra[@]} "-Wl,$i")
-    done
-    if test "$NIX_STRIP_DEBUG" == "1"; then
-	extra=(${extra[@]} -g0 -Wl,-s)
-    fi
-fi
-
-if test "$NIX_DEBUG" == "1"; then
-  echo "extra flags to @GCC@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-IFS=
-exec @GCC@ $@ ${extra[@]}

pkgs/baseenv/ld-wrapper.sh

@@ -1,17 +0,0 @@
-#! /bin/sh
-
-IFS=" "
-extra=($NIX_CFLAGS_LINK $NIX_LDFLAGS)
-if test "$NIX_STRIP_DEBUG" == "1"; then
-    extra=(${extra[@]} -s)
-fi
-
-if test "$NIX_DEBUG" == "1"; then
-  echo "extra flags to @LD@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-IFS=
-exec $NIX_LD $@ ${extra[@]}

pkgs/baseenv/setup.sh

@@ -1,40 +0,0 @@
-# Add the directory containing the GCC wrappers to the PATH.
-export PATH=@OUT@/bin:$PATH
-
-# Recursively add all envpkgs to the relevant environment variables.
-addtoenv()
-{
-    envpkgs="$envpkgs $1"
-
-    if test -d $1/bin; then
-        export PATH=$1/bin:$PATH
-    fi
-
-    if test -d $1/lib; then
-	export NIX_CFLAGS_LINK="-L$1/lib $NIX_CFLAGS_LINK"
-	export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
-    fi
-
-    if test -d $1/lib/pkgconfig; then
-        export PKG_CONFIG_PATH=$1/lib/pkgconfig:$PKG_CONFIG_PATH
-    fi
-
-    if test -f $1/envpkgs; then
-        for i in $(cat $1/envpkgs); do
-            addtoenv $i
-        done
-    fi
-}
-
-oldenvpkgs=$envpkgs
-envpkgs=
-
-for i in $oldenvpkgs; do
-    addtoenv $i
-done
-
-# Add the output as an rpath.
-export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-
-# Strip debug information by default.
-export NIX_STRIP_DEBUG=1

pkgs/bash/bash.fix

@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "bash-2.05b")
-
-  , ("build", Relative("bash/bash-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/bash/bash-2.05b.tar.gz")
-      , ("md5", "5238251b4926d778dfe162f6ce729733")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)

pkgs/binutils/binutils.fix

@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "binutils-2.14")
-
-  , ("build", Relative("binutils/binutils-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/binutils/binutils-2.14.tar.bz2")
-      , ("md5", "2da8def15d28af3ec6af0982709ae90a")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)

pkgs/bison/bison.fix

@@ -1,15 +0,0 @@
-Package(
-  [ ("name", "bison-1.875")
-
-  , ("build", Relative("bison/bison-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2")
-      , ("md5", "b7f8027b249ebd4dd0cc948943a71af0")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  , ("m4", IncludeFix("gnum4/gnum4.fix"))
-  ]
-)
-

pkgs/boehmgc/boehmgc-build.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gc* || exit 1
-./configure --prefix=$out --disable-shared || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs/boehmgc/boehmgc.fix

@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "boehmgc-6.2")
-  , ("build", Relative("boehmgc/boehmgc-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.2.tar.gz")
-      , ("md5", "15492b14ca7b9a9e035238611e9cd1e3")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)

pkgs/build-support/fetchfile/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+. $stdenv/setup
+
+echo "copying $url into $out..."
+
+cp "$pathname" "$out" || exit 1
+
+actual=$(md5sum -b $out | cut -c1-32)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
+fi

pkgs/build-support/fetchfile/default.nix

@@ -0,0 +1,9 @@
+{stdenv}: {pathname, md5}: derivation {
+  name = baseNameOf (toString url);
+  system = stdenv.system;
+  builder = ./builder.sh;
+  stdenv = stdenv;
+  pathname = pathname;
+  md5 = md5;
+  id = md5;
+}

pkgs/build-support/fetchsvn/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$subversion"
+. $stdenv/setup
+
+echo "exporting $url (r$rev) into $out..."
+
+svn export -r $rev "$url" $out || exit 1
+
+echo $rev > $out/svn-revision || exit 1

pkgs/build-support/fetchsvn/default.nix

@@ -0,0 +1,9 @@
+{stdenv, subversion}: {url, rev}: derivation {
+  name = "svn-checkout";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  stdenv = stdenv;
+  subversion = subversion;
+  url = url;
+  rev = rev;
+}

pkgs/build-support/fetchurl/builder.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+. $stdenv/setup
+
+echo "downloading $url into $out..."
+
+wget --passive-ftp "$url" -O "$out" || exit 1
+
+actual=$(md5sum -b $out | cut -c1-32)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
+fi

pkgs/bzip2/bzip2-build.sh

@@ -1,8 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd bzip2-* || exit 1
-make || exit 1
-make install PREFIX=$out || exit 1

pkgs/bzip2/bzip2.fix

@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "bzip2-1.0.2")
-
-  , ("build", Relative("bzip2/bzip2-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz")
-      , ("md5", "ee76864958d568677f03db8afad92beb")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)

pkgs/coreutils/coreutils.fix

@@ -1,13 +0,0 @@
-Package(
-  [ ("name", "coreutils-5.0")
-
-  , ("build", Relative("coreutils/coreutils-build.sh"))
-
-  , ("src", Call(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.0.tar.bz2")
-      , ("md5", "94e5558ee2a65723d4840bfde2d323f0")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv-linux/stdenv-nativetools.fix"))
-  ]
-)

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, unzip}:
+
+assert !isNull unzip;
+
+derivation {
+  name = "docbook-xml-4.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip;
+    md5 = "73fe50dfe74ca631c1602f558ed8961f";
+  };
+  stdenv = stdenv;
+  unzip = unzip;
+}

pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+
+derivation {
+  name = "docbook-xsl-1.64.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://cesnet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.64.1.tar.gz;
+    md5 = "ed766902e8381f6206d12f5c326fbd47";
+  };
+  stdenv = stdenv;
+}

pkgs/db4/db4-build.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd db-*/build_unix || exit 1
-../dist/configure --prefix=$out --enable-cxx --enable-compat185 || exit 1
-make || exit 1
-make install || exit 1
-rm -rf $out/doc || exit 1

pkgs/db4/db4.fix

@@ -1,12 +0,0 @@
-Package(
-  [ ("name", "db4-4.0.14")
-  , ("build", Relative("db4/db4-build.sh"))
-
-  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
-      [ ("url", "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz")
-      , ("md5", "12262c64fcd64b772e7cffad8e4d0ebc")
-      ]))
-
-  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
-  ]
-)

pkgs/development/compilers/ghc/boot.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, perl}:
+
+assert perl != null;
+
+assert stdenv.system == "i686-linux";
+
+derivation {
+  name = "ghc-6.2";
+  system = stdenv.system;
+  builder = ./boot.sh;
+  src = fetchurl {
+    url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-i386-unknown-linux.tar.bz2;
+    md5 = "5b2f19ca00fd7494002047d7fb4dce3e";
+  };
+  inherit stdenv perl;
+}

pkgs/development/compilers/ghc/boot.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$perl"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd ghc-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*/*.a || exit 1

pkgs/development/compilers/ghc/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$perl $ghc $m4"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd ghc-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*/*.a || exit 1

pkgs/development/compilers/ghc/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, perl, ghc, m4}:
+
+assert perl != null && ghc != null && m4 != null;
+
+derivation {
+  name = "ghc-6.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-src.tar.bz2;
+    md5 = "cc495e263f4384e1d6b38e851bf6eca0";
+  };
+  inherit stdenv perl ghc m4;
+}

pkgs/development/compilers/helium/builder.sh

@@ -0,0 +1,15 @@
+#! /bin/sh
+
+buildinputs="$ghc"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd helium-* || exit 1
+cd lvm/src || exit 1
+./configure --prefix $out || exit 1
+cd ../../heliumNT || exit 1
+./configure --prefix=$out || exit 1
+cd src || exit 1
+make depend || exit 1
+make EXTRA_HC_OPTS=-O2 || exit 1
+make install

pkgs/development/compilers/helium/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, ghc}:
+
+assert ghc != null;
+
+derivation {
+  name = "helium-1.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cs.uu.nl/helium/distr/helium-1.2-src.tar.gz;
+    md5 = "6ea1d6e4436e137d75f5354b4758f299";
+  };
+  inherit stdenv ghc;
+}

pkgs/development/compilers/j2sdk/builder.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. $stdenv/setup || exit 1
+src=$filename.bin
+
+cp $pathname $src || exit 1
+
+actual=$(md5sum -b $src | cut -c1-32)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
+fi
+
+chmod u+x $src || exit 1
+
+alias more=cat
+
+yes yes | ./$src || exit 1
+
+mkdir $out || exit 1
+mv $dirname/* $out/ || exit 1

pkgs/development/compilers/j2sdk/default-1.5.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: 
+
+if stdenv.system == "i686-linux"
+  then
+    (import ./j2sdk1.5-sun-linux.nix) {
+      stdenv   = stdenv;
+      fetchurl = fetchurl;
+    }
+  else
+    false

pkgs/development/compilers/j2sdk/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: 
+
+if stdenv.system == "i686-linux"
+  then
+    (import ./j2sdk-sun-linux.nix) {
+      stdenv   = stdenv;
+      fetchurl = fetchurl;
+    }
+  else
+    false

pkgs/development/compilers/j2sdk/j2sdk-sun-linux.nix

@@ -0,0 +1,24 @@
+/**
+ * This Nix expression requires the user to download the j2sdk
+ * distribution to /tmp. Please obtain j2sdk-1_4_2_03-linux-i586.bin
+ * from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
+ *
+ * Note that this is not necessary if someone has already pushed a
+ * binary.
+ *
+ * @author Martin Bravenboer <martin@cs.uu.nl>
+ */
+{stdenv, fetchurl}: 
+
+assert stdenv.system == "i686-linux";
+
+derivation {
+  name = "j2sdk-1.4.2";
+  filename = "j2sdk-1.4.2_03";
+  dirname = "j2sdk1.4.2_03";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  pathname = "/tmp/j2sdk-1_4_2_03-linux-i586.bin";
+  md5 = "859aa6750161477acec83b7bb5d9998d";
+  stdenv = stdenv;
+}

pkgs/development/compilers/j2sdk/j2sdk1.5-sun-linux.nix

@@ -0,0 +1,24 @@
+/**
+ * This Nix expression requires the user to download the j2sdk
+ * distribution to /tmp. Please obtain j2sdk-1_5_0-beta-linux-i586.bin
+ * from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
+ *
+ * Note that this is not necessary if someone has already pushed a
+ * binary.
+ *
+ * @author Martin Bravenboer <martin@cs.uu.nl>
+ */
+{stdenv, fetchurl}: 
+
+assert stdenv.system == "i686-linux";
+
+derivation {
+  name = "j2sdk-1.5.0-beta";
+  filename = "j2sdk-1_5_0-beta";
+  dirname = "j2sdk1.5.0";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  pathname = "/tmp/j2sdk-1_5_0-beta-linux-i586.bin";
+  md5 = "1e6af0d64563b085ffadec97db365b19";
+  stdenv = stdenv;
+}

pkgs/development/compilers/jikes/builder.sh

@@ -3,7 +3,8 @@
 . $stdenv/setup || exit 1
 
 tar xvfj $src || exit 1
-cd pcre-* || exit 1
+cd jikes-* || exit 1
 ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1
+

pkgs/development/compilers/jikes/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "jikes-1.18";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2;
+    md5 = "74bbcfd31aa2d7df4b86c5fe2db315cc";
+  };
+  stdenv = stdenv;
+}

pkgs/development/compilers/strategoxt/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$aterm $sdf"
+. $stdenv/setup || exit 1
+
+tar zxf $src || exit 1
+cd $dir* || exit 1
+./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf || exit 1
+make || exit 1
+make install || exit 1

pkgs/development/compilers/strategoxt/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.4-4626";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://losser.labs.cs.uu.nl/~mbravenb/dailydist/strategoxt/src/strategoxt-0.9.4-4626.tar.gz;
+    md5 = "f33ae9fdb9d8628ae01fa0f26bfa0429";
+  };
+  stdenv = stdenv;
+  aterm = aterm;
+  sdf = sdf;
+  tarfile = "true";
+  dir = "strategoxt";
+}

pkgs/development/compilers/strategoxt/dist.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchsvn, autotools, which, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.4-4792";
+  system = stdenv.system;
+  builder = ./svnbuilder.sh;
+  src = fetchsvn {
+    url = https://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/StrategoXT;
+    rev = "4792";
+  };
+  stdenv = stdenv;
+
+  make     = autotools.make;
+  automake = autotools.automake;
+  autoconf = autotools.autoconf;
+  libtool  = autotools.libtool;
+  which    = which;
+
+  aterm = aterm;
+  sdf = sdf;
+}

pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.3.tar.gz;
+    md5 = "3425e7ae896426481bd258817737e3d6";
+  };
+  stdenv = stdenv;
+  aterm = aterm;
+  sdf = sdf;
+  tarfile = "true";
+  dir = "strategoxt";
+}

pkgs/development/compilers/strategoxt/svnbuilder.sh

@@ -0,0 +1,14 @@
+#! /bin/sh
+
+buildinputs="$aterm $sdf $make $automake $autoconf $libtool $which"
+. $stdenv/setup || exit 1
+
+echo "pwd = `pwd`"
+echo "PATH = $PATH"
+
+cp -r $src strategoxt || exit 1
+chmod -R +w strategoxt
+cd strategoxt || exit 1
+./bootstrap || exit 1
+./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf || exit 1
+make install || exit 1

pkgs/development/compilers/strategoxt/trunk.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchsvn, autotools, which, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.4-4792";
+  system = stdenv.system;
+  builder = ./svnbuilder.sh;
+  src = fetchsvn {
+    url = https://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/StrategoXT;
+    rev = "4792";
+  };
+  stdenv = stdenv;
+
+  make     = autotools.make;
+  automake = autotools.automake;
+  autoconf = autotools.autoconf;
+  libtool  = autotools.libtool;
+  which    = which;
+
+  aterm = aterm;
+  sdf = sdf;
+}

pkgs/development/compilers/tiger/builder.sh

@@ -0,0 +1,17 @@
+#! /bin/sh
+
+buildinputs="$aterm $sdf $strategoxt"
+. $stdenv/setup || exit 1
+
+tar zxf $src || exit 1
+cd tiger-* || exit 1
+./configure --prefix=$out \
+	--with-aterm=$aterm \
+	--with-sdf=$sdf \
+	--with-stratego-xt=$strategoxt \
+        --enable-tiger \
+        --enable-ir \
+	--enable-asm \
+    || exit 1
+make || exit 1
+make install || exit 1

pkgs/development/compilers/tiger/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, aterm, sdf, strategoxt}: derivation {
+  name = "tiger-1.3-4631";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~mbravenb/dailydist/tiger/src/tiger-1.3-4631.tar.gz;
+    md5 = "1ea6070d84134eb6cff7fb32a75ef90a";
+  };
+  stdenv = stdenv;
+  aterm = aterm;
+  sdf = sdf;
+  strategoxt = strategoxt;
+}

pkgs/development/interpreters/j2re/builder.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. $stdenv/setup || exit 1
+version=j2re1.4.2_03
+
+cp $src $version.bin || exit 1
+chmod u+x $version.bin || exit 1
+
+alias more=cat
+
+yes yes | ./$version.bin || exit 1
+
+mkdir $out || exit 1
+mv $version/* $out/ || exit 1

pkgs/development/interpreters/j2re/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: 
+
+if stdenv.system == "i686-linux"
+  then
+    (import ./j2re-sun-linux.nix) {
+      stdenv   = stdenv;
+      fetchurl = fetchurl;
+    }
+  else
+    false

pkgs/development/interpreters/j2re/j2re-sun-linux.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl}: 
+
+assert stdenv.system == "i686-linux";
+
+
+derivation {
+  name = "j2re-1.4.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+      url = http://java.sun.com/webapps/download/AutoDL?BundleId=9500;
+      md5 = "b4aae3fcda73d976bd6ae6349b36a90c";
+    };
+  stdenv = stdenv;
+}

pkgs/development/interpreters/python/builder.sh

@@ -0,0 +1,15 @@
+#! /bin/sh
+
+buildinputs=""
+if test -n "$zlibSupport"; then
+  buildinputs="$zlib $buildinputs"
+fi
+. $stdenv/setup
+
+tar xvfj $src
+cd Python-*
+./configure --prefix=$out
+
+make
+make install
+

pkgs/development/interpreters/python/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, zlib ? null, zlibSupport ? true}:
+
+assert zlibSupport -> zlib != null;
+
+derivation {
+  name = "python-2.3.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+      url = http://www.python.org/ftp/python/2.3.3/Python-2.3.3.tar.bz2;
+      md5 = "70ada9f65742ab2c77a96bcd6dffd9b1";
+  };
+  zlib = if zlibSupport then zlib else null;
+  inherit stdenv zlibSupport;
+}

pkgs/development/libraries/a52dec/builder.sh

@@ -3,7 +3,7 @@
 . $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
-cd expat-* || exit 1
+cd a52dec-* || exit 1
 ./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1