* Mark release as stable.

svn path=/nixpkgs/branches/0.6-release/; revision=1767

pkgs/BUGS

@@ -14,22 +14,6 @@
     ...
 
 
-* Subtle problems can occur if the Nix store directory or one of its
-  parents is a symlink.  E.g., purity checks can barf:
-
-    impure path `/data/nix/store/099cd9aee7d056a9922fd6dd116a3f5c-gcc-3.3.3/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3.3/crtbegin.o' used in link
-
-  (This happened because /nix was a symlink to /data/nix.)  Maybe we
-  should disallow this entirely, since, exactly because it is
-  perfectly legal for a builder to expand a symlink, we can end up
-  with derivates referring to paths that existed in the build
-  environment but not in the target environment.
-
-  Disallowing this can be highly inconvenient, since it makes it
-  harder to move the Nix store to a different file system.  (On Linux,
-  `bind' mounts can help here.) 
-
-
 * In libXt:
 
 /bin/sh ./libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.     -DXTHREADS -DXUSE_MTSAFE_API -I/nix/store/aadf0bd4a908da11d14f6538503b8408-libX11-6.2.1/include -I/nix/store/ba366e3b944ead64ec9b0490bb615874-xproto-6.6.1/include   -I./include/X11 -g -O2 -c -o ActionHook.lo `test -f 'ActionHook.c' || echo './'`ActionHook.c
@@ -47,4 +31,7 @@ In file included from IntrinsicI.h:55,
                  from ActionHook.c:69:
 include/X11/IntrinsicP.h:202:25: X11/ObjectP.h: No such file or directory
 
-(moved to include/X11; should edit include/Makefile.am)
+(moved to include/X11; should edit include/Makefile.am)
+
+
+* Add "exit 0" at the end of configure of rte package.

pkgs/STABLE

@@ -1 +1 @@
-0
+1

pkgs/TODO

@@ -10,7 +10,3 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
-
-* diffutils retains a dependency on coreutils/bin/pr; causes stdenv to
-  depend on 2 copies of coreutils (the first one impure in
-  stdenv-nix-linux!)

pkgs/VERSION

@@ -1 +1 @@
-0.5
+0.6

pkgs/applications/editors/eclipse/builder.sh

@@ -0,0 +1,7 @@
+set -e
+
+. $stdenv/setup
+
+$unzip/bin/unzip $src 
+mkdir $out
+mv eclipse $out/

pkgs/applications/editors/eclipse/default.nix

@@ -0,0 +1,17 @@
+{fetchurl, stdenv, unzip}:
+
+let {
+  body =
+    stdenv.mkDerivation {
+      name = "eclipse-sdk-3.0.1";
+      builder = ./builder.sh;
+      src = bindist;
+      inherit unzip;
+   };
+
+  bindist = 
+    fetchurl {
+      url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/R-3.0.1-200409161125/eclipse-SDK-3.0.1-linux-gtk.zip;
+      md5 = "d0f743c972adf13e71a43b2dc6c9c55b";
+    };
+}

pkgs/applications/editors/emacs/builder.sh

@@ -0,0 +1,13 @@
+. $stdenv/setup
+
+myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
+echo "glibc: $myglibc" 
+
+postConfigure() {
+  cp $myglibc/lib/crt1.o src
+  cp $myglibc/lib/crti.o src
+  cp $myglibc/lib/crtn.o src
+}
+postConfigure=postConfigure
+
+genericBuild

pkgs/applications/editors/emacs/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, xlibs}:
+
+stdenv.mkDerivation {
+  name = "emacs-21.3";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnu.org/pub/gnu/emacs/emacs-21.3.tar.gz;
+    md5 = "a0bab457cbf5b4f8eb99d1d0a3ada420";
+  };
+  patches = [./patchfile];
+  inherit (xlibs) libXaw libX11;
+
+  buildInputs = [xlibs.libXaw xlibs.libX11];
+}

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

@@ -0,0 +1,4 @@
+. $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+cp $src $out/emacs/site-lisp/cua.el

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

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "cua-mode-2.10";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cua.dk/cua.el;
+    md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
+  };
+}

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

@@ -1,9 +1,7 @@
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-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
+mkdir -p $out/emacs/site-lisp
+cd $out/emacs/site-lisp
+tar xvfz $src
+mv nxml-mode-*/* .
 rmdir nxml-mode-*
-
-exit 0

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

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

pkgs/applications/editors/emacs/patchfile

@@ -0,0 +1,41 @@
+Only in emacs-21.3: configure.in~
+Only in emacs-21.3: patchfile
+Only in emacs-21.3/src: Makefile.in~
+diff -rc emacs-orig/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
+*** emacs-orig/src/s/gnu-linux.h	2001-09-28 17:50:04.000000000 +0200
+--- emacs-21.3/src/s/gnu-linux.h	2004-10-06 13:13:19.000000000 +0200
+***************
+*** 173,179 ****
+  /* GNU/Linux usually has crt0.o in a non-standard place */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+  #else
+! #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+  #endif
+  
+  #ifdef __ELF__
+--- 173,179 ----
+  /* GNU/Linux usually has crt0.o in a non-standard place */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+  #else
+! #define START_FILES pre-crt0.o crt1.o crti.o
+  #endif
+  
+  #ifdef __ELF__
+***************
+*** 225,231 ****
+  #else
+  #undef LIB_GCC
+  #define LIB_GCC
+! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+  #endif
+  
+  /* Don't use -g in test compiles in configure.
+--- 225,231 ----
+  #else
+  #undef LIB_GCC
+  #define LIB_GCC
+! #define LIB_STANDARD -lgcc -lc -lgcc crtn.o
+  #endif
+  
+  /* Don't use -g in test compiles in configure.
+Only in emacs-21.3/src/s: gnu-linux.h~

pkgs/applications/editors/nano/builder.sh

@@ -0,0 +1,4 @@
+. $stdenv/setup
+
+export CFLAGS="$CFLAGS -I$ncurses/include/ncurses"
+genericBuild

pkgs/applications/editors/nano/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation {
+  name = "nano-1.2.4";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.nano-editor.org/dist/v1.2/nano-1.2.4.tar.gz;
+    md5 = "2c513310ec5e8b63abaecaf48670ac7a";
+  };
+
+  inherit ncurses;
+  buildInputs = [ncurses];
+}

pkgs/applications/editors/vim/builder.sh

@@ -0,0 +1,3 @@
+. $stdenv/setup
+
+genericBuild

pkgs/applications/editors/vim/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, ncurses}:
+ 
+stdenv.mkDerivation {
+  name = "vim-6.3";
+ 
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.vim.org/mirror/vim/unix/vim-6.3.tar.bz2;
+    md5 = "821fda8f14d674346b87e3ef9cb96389";
+  };
+ 
+  inherit ncurses;
+  buildInputs = [ncurses];
+}

pkgs/applications/graphics/gqview/default.nix

@@ -6,11 +6,11 @@ assert pkgconfig != null && gtk != null && libpng != null;
 # !!! assert libpng == gtk.libpng;
 
 stdenv.mkDerivation {
-  name = "gqview-1.4.1";
+  name = "gqview-1.4.4";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.4.1.tar.gz;
-    md5 = "d963fbb878d78e8ebf78ea8c18caa72f";
+    url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.4.4.tar.gz;
+    md5 = "b3f1e1ca830c9cc0b484966fac9e6f28";
   };
 
   buildInputs = [pkgconfig gtk libpng];

pkgs/applications/misc/acrobat-reader/builder.sh

@@ -0,0 +1,21 @@
+. $stdenv/setup
+
+echo "unpacking $src..."
+tar xvfz $src
+
+mkdir $out
+
+echo "unpacking reader..."
+tar xvf ./COMMON.TAR -C $out
+tar xvf ./LINUXRDR.TAR -C $out
+
+glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+
+patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread
+
+sed "s^REPLACE_ME^$out/Reader^" $out/bin/acroread.sh > $out/bin/acroread.sh.tmp
+echo "#! /bin/sh" > $out/bin/acroread.sh
+echo "LD_LIBRARY_PATH=$libXt/lib:$libXp/lib:$libXext/lib:$libX11/lib" >> $out/bin/acroread.sh
+cat $out/bin/acroread.sh.tmp >> $out/bin/acroread.sh
+chmod 755 $out/bin/acroread.sh
+mv $out/bin/acroread.sh $out/bin/acroread

pkgs/applications/misc/acrobat-reader/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, patchelf, libXt, libXp, libXext, libX11}:
+
+stdenv.mkDerivation {
+  name = "acrobat-reader-5.0.9";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/linux-509.tar.gz;
+    md5 = "53b7ca0fc83ab81214ba82050ce89c64";
+  };
+  buildInputs = [patchelf];
+  inherit libXt libXp libXext libX11;
+}

pkgs/applications/misc/hello/builder.sh

@@ -1,8 +0,0 @@
-buildinputs="$perl"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd hello-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs/applications/misc/hello/ex-1/builder.sh

@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+PATH=$perl/bin:$PATH
+
+tar xvfz $src
+cd hello-*
+./configure --prefix=$out
+make
+make install

pkgs/applications/misc/hello/ex-1/default.nix

@@ -7,5 +7,5 @@ stdenv.mkDerivation {
     url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
-  perl = perl;
+  inherit perl;
 }

pkgs/applications/misc/hello/ex-2/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, perl}:
+
+stdenv.mkDerivation {
+  name = "hello-2.1.1";
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz;
+    md5 = "70c9ccf9fac07f762c24f2df2290784d";
+  };
+  buildInputs = [perl];
+}

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

@@ -0,0 +1,27 @@
+. $stdenv/setup
+
+shopt -s nullglob
+
+mkdir -p $out/bin
+
+pluginPath=
+extraLibPath=
+for i in $plugins; do
+    for p in $i/lib/mozilla/plugins $i/jre/plugin/*/mozilla; do
+        if test -e $p; then
+            pluginPath=$pluginPath${pluginPath:+:}$p
+            if test -e $p/extra-library-path; then
+                extraLibPath=$extraLibPath${extraLibPath:+:}$(cat $p/extra-library-path)
+            fi
+        fi
+    done
+done
+
+cat > $out/bin/firefox <<EOF
+#! $SHELL
+export LD_LIBRARY_PATH=$extraLibPath
+export MOZ_PLUGIN_PATH=$pluginPath
+exec $firefox/bin/firefox "\$@"
+EOF
+
+chmod +x $out/bin/firefox

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

@@ -0,0 +1,9 @@
+{stdenv, firefox, plugins}:
+
+stdenv.mkDerivation {
+  name = firefox.name;
+
+  builder = ./builder.sh;
+
+  inherit firefox plugins;
+}

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

@@ -1,28 +1,52 @@
 . $stdenv/setup
 
-
+preConfigure=preConfigure
 preConfigure() {
     cat > .mozconfig <<EOF
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-ac_add_options --enable-crypto
-ac_add_options --disable-tests
+. \$topsrcdir/browser/config/mozconfig
+ac_add_options --prefix=$out
+ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-mailnews
-ac_add_options --disable-composer
-ac_add_options --enable-optimize=-O2
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
 ac_add_options --enable-xft
-ac_add_options --enable-swg
+ac_add_options --disable-freetype2
+#ac_add_options --enable-swg
 ac_add_options --enable-strip
 ac_add_options --enable-default-toolkit=gtk2
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+#ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+#ac_add_options --with-system-zlib
 EOF
-    echo "ac_add_options --prefix=$out" >> .mozconfig
 }
-preConfigure=preConfigure
 
+postInstall=postInstall
+postInstall() {
+
+    # Strip some more stuff
+    strip -S $out/lib/*/* || true
+
+    # We don't need this (do we?)
+#    rm -rf $out/include
+
+    # This fixes starting Firefox when there already is a running
+    # instance.  The `firefox' wrapper script actually expects to be
+    # in the same directory as `run-mozilla.sh', apparently.
+    cd $out/bin
+    mv firefox ../lib/firefox-*/
+    ln -s ../lib/firefox-*/firefox .
+
+    # Register extension etc.
+    echo "running firefox -register..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
+
+    echo "running regxpcom..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false
+    
+    echo "running regchrome..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
+    
+}
 
 makeFlags="-f client.mk build"
 

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

@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
-}:
-
-assert pkgconfig != null && gtk != null && perl != null
-  && zip != null && libIDL != null;
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
 
 # !!! assert libIDL.glib == gtk.glib;
 
-stdenv.mkDerivation {
-  name = "firefox-0.8";
+(stdenv.mkDerivation {
+  name = "firefox-1.0";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/firefox-source-0.8.tar.bz2;
-    md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
+    url = ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/firefox/releases/1.0/source/firefox-1.0-source.tar.bz2;
+    md5 = "49c16a71f4de014ea471be81e46b1da8";
   };
 
-  buildInputs = [pkgconfig gtk perl zip libIDL];
-}
+  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
+
+  patches = [./writable-copies.patch];
+}) // {inherit gtk;}

pkgs/applications/networking/browsers/firefox/writable-copies.patch

@@ -0,0 +1,23 @@
+diff -rc mozilla-orig/xpcom/io/nsLocalFileUnix.cpp mozilla/xpcom/io/nsLocalFileUnix.cpp
+*** mozilla-orig/xpcom/io/nsLocalFileUnix.cpp	2004-04-03 01:48:18.000000000 +0200
+--- mozilla/xpcom/io/nsLocalFileUnix.cpp	2004-10-05 19:48:04.000000000 +0200
+***************
+*** 634,639 ****
+--- 634,640 ----
+          // get the dirs old permissions
+          if (NS_FAILED(rv = GetPermissions(&oldPerms)))
+              return rv;
++         oldPerms |= 0200;
+          if (NS_FAILED(rv = newParent->Create(DIRECTORY_TYPE, oldPerms)))
+              return rv;
+      } else {    // dir exists lets try to use leaf
+***************
+*** 758,763 ****
+--- 759,765 ----
+          // get the old permissions
+          PRUint32 myPerms;
+          GetPermissions(&myPerms);
++         myPerms |= 0200;
+  
+          // Create the new file with the old file's permissions, even if write
+          // permission is missing.  We can't create with write permission and

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

@@ -0,0 +1,5 @@
+. $stdenv/setup
+
+export CFLAGS="-I$ncurses/include/ncurses"
+
+genericBuild

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

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, ncurses
+, sslSupport ? true, openssl ? null
+}:
+
+assert sslSupport -> openssl != null;
+
+stdenv.mkDerivation {
+  name = "lynx-2.8.5";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://lynx.isc.org/release/lynx2.8.5.tar.bz2;
+    md5 = "d1e5134e5d175f913c16cb6768bc30eb";
+  };
+  inherit ncurses;
+  configureFlags = (if sslSupport then "--with-ssl" else "");
+  buildInputs = [ncurses (if sslSupport then openssl else null)];
+}

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh

@@ -0,0 +1,13 @@
+. $stdenv/setup
+
+dontBuild=1
+dontMakeInstall=1
+
+postInstall=postInstall
+postInstall() {
+    mkdir -p $out/lib/mozilla/plugins
+    cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins
+    echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path
+}
+
+genericBuild

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, zlib, libXmu}:
+
+stdenv.mkDerivation {
+  name = "flashplayer-7.0r25";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/install_flash_player_7_linux.tar.gz;
+    md5 = "79c59a5ea29347e01c8e6575dd054cd1";
+  };
+
+  inherit zlib libXmu;
+}

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh

@@ -0,0 +1,24 @@
+. $stdenv/setup
+
+# The Firefox pkgconfig files are buggy; they are called firefox-*.pc,
+# but they refer to mozilla-*.pc.  Also, mplayerplug-in requires
+# mozilla-*.pc.
+mkdir pkgconfig
+for i in $firefox/lib/pkgconfig/*.pc; do
+    ln -s $i pkgconfig/$(echo $(basename $i) | sed s/firefox/mozilla/)
+done
+PKG_CONFIG_PATH=$NIX_BUILD_TOP/pkgconfig:$PKG_CONFIG_PATH
+
+firefoxIncl=$(echo $firefox/include/firefox-*)
+export NIX_CFLAGS_COMPILE="-I$firefoxIncl $NIX_CFLAGS_COMPILE"
+
+dontMakeInstall=1
+
+postInstall=postInstall
+postInstall() {
+    mkdir -p $out/lib/mozilla/plugins
+    cp -p mplayerplug-in.so mplayerplug-in.xpt $out/lib/mozilla/plugins
+}
+
+genericBuild
+

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pkgconfig, firefox, libXpm}:
+
+# Note: we shouldn't be dependent on Firefox.  The only thing we need
+# are the include files so that we can access the plugin API (I
+# think).
+
+stdenv.mkDerivation {
+  name = "mplayerplug-in-2.70";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-2.70.tar.gz;
+    md5 = "90784c7ccb40037b446053f0c1d1c2b4";
+  };
+
+  buildInputs = [pkgconfig firefox (firefox.gtk) libXpm];
+  
+  inherit firefox;
+}

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

@@ -8,12 +8,12 @@ assert sslSupport -> openssl != null;
 assert imageSupport -> gdkpixbuf != null;
 
 stdenv.mkDerivation {
-  name = "sylpheed-0.9.10";
+  name = "sylpheed-0.9.12";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.10.tar.bz2;
-    md5 = "4e2242436de3cf3977a1b25b1ddc4930";
+    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.12.tar.bz2;
+    md5 = "5deab7d65f8e19444902be3d82610e6b";
   };
 
   inherit sslSupport imageSupport;

pkgs/applications/networking/mailreaders/thunderbird/builder.sh

@@ -0,0 +1,22 @@
+. $stdenv/setup
+
+preConfigure() {
+    cat mail/config/mozconfig > .mozconfig
+    cat >> .mozconfig <<EOF
+ac_add_options --disable-debug
+ac_add_options --enable-optimize=-O2
+ac_add_options --disable-ldap
+ac_add_options --enable-xft
+ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-single-profile
+ac_add_options --prefix=$out
+EOF
+}
+
+preConfigure=preConfigure
+
+makeFlags="-f client.mk build"
+
+genericBuild

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

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL}:
+
+assert pkgconfig != null && gtk != null && perl != null
+  && zip != null && libIDL != null;
+
+# !!! assert libIDL.glib == gtk.glib;
+
+stdenv.mkDerivation {
+  name = "thunderbird-0.8";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.artfiles.org/mozilla.org/thunderbird/releases/0.8/thunderbird-source-0.8.tar.bz2;
+    md5 = "76de1827d66ac482cfc4dd32e7b1e257";
+  };
+
+  buildInputs = [pkgconfig gtk perl zip libIDL];
+}

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

@@ -13,12 +13,12 @@ assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl)
 assert swigBindings -> swig != null && swig.pythonSupport;
 
 stdenv.mkDerivation {
-  name = "subversion-1.0.2";
+  name = "subversion-1.0.9";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/tarballs/subversion-1.0.2.tar.bz2;
-    md5 = "246ffcc67ca629ae523956c4c1a67cce";
+    url = http://subversion.tigris.org/tarballs/subversion-1.0.9.tar.bz2;
+    md5 = "d6b4c240f5e2a589a694e64e4ad27feb";
   };
 
   openssl = if sslSupport then openssl else null;

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

@@ -0,0 +1,60 @@
+buildInputs="$openssl $db4 $httpd $swig $python $j2sdk $expat $patch"
+. $stdenv/setup
+
+configureFlags="--without-gdbm --disable-static"
+
+if test "$localServer"; then
+    configureFlags="--with-berkeley-db=$db4 $configureFlags"
+fi
+
+if test "$sslSupport"; then
+    configureFlags="--with-ssl --with-libs=$openssl $configureFlags"
+fi
+
+if test "$httpServer"; then
+    configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags"
+    makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags"
+fi
+
+if test -n "$pythonBindings" -o -n "$javaSwigBindings"; then
+    configureFlags="--with-swig=$swig $configureFlags"
+fi
+
+if test "$javahlBindings"; then
+    configureFlags="--enable-javahl --with-jdk=$j2sdk $configureFlags"
+fi
+
+installFlags="$makeFlags"
+
+
+postInstall() {
+    if test "$pythonBindings"; then
+        make swig-py
+        make install-swig-py
+    fi
+    if test "$javaSwigBindings"; then
+        # Hack to get Java-Swig bindings to build if Python is not in
+        # scope (this fails because Subversion's configure script does
+        # something silly like `SWIG_JAVA_COMPILE="$SWIG_PY_COMPILE"').
+        FL1='SWIG_JAVA_COMPILE=gcc'
+        FL2='SWIG_JAVA_LINK=gcc -L$(SWIG_BUILD_DIR)/.libs'
+        make swig-java "$FL1" "$FL2"
+        make swig-java-api "$FL1" "$FL2"
+        make swig-java-java "$FL1" "$FL2"
+        make install-swig-java "$FL1" "$FL2"
+    fi
+    if test "$javahlBindings"; then
+        mkdir -p subversion/bindings/java/javahl/classes # bug fix
+        make javahl
+        make install-javahl
+        mkdir -p $out/share/doc/$name
+        $j2sdk/bin/javadoc -d $out/share/doc/$name \
+            -windowtitle "JavaHL Subversion Bindings" \
+            -link http://java.sun.com/j2se/1.4.2/docs/api/ \
+            subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java
+    fi
+}
+postInstall=postInstall
+
+
+genericBuild

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

@@ -0,0 +1,43 @@
+{ localServer ? false
+, httpServer ? false
+, sslSupport ? false
+, pythonBindings ? false
+, javaSwigBindings ? false
+, javahlBindings ? false
+, stdenv, fetchurl
+, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
+}:
+
+assert expat != null;
+assert localServer -> db4 != null;
+assert httpServer -> httpd != null && httpd.expat == expat;
+assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
+assert pythonBindings -> swig != null && swig.pythonSupport;
+assert javaSwigBindings -> swig != null && swig.javaSupport;
+assert javahlBindings -> j2sdk != null;
+
+stdenv.mkDerivation {
+  name = "subversion-1.1.1";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://subversion.tigris.org/tarballs/subversion-1.1.1.tar.bz2;
+    md5 = "a180c3fe91680389c210c99def54d9e0";
+  };
+
+  # This is a hopefully temporary fix for the problem that
+  # libsvnjavahl.so isn't linked against libstdc++, which causes
+  # loading the library into the JVM to fail.
+  patches = if javahlBindings then [./javahl.patch] else [];
+
+  openssl = if sslSupport then openssl else null;
+  httpd = if httpServer then httpd else null;
+  db4 = if localServer then db4 else null;
+  swig = if pythonBindings || javaSwigBindings then swig else null;
+  python = if pythonBindings then swig.python else null;
+  j2sdk = if javaSwigBindings then swig.j2sdk else
+          if javahlBindings then j2sdk else null;
+
+  inherit expat localServer httpServer sslSupport
+          pythonBindings javaSwigBindings javahlBindings;
+}

pkgs/applications/version-management/subversion-1.1.x/javahl.patch

@@ -0,0 +1,20 @@
+diff -rc subversion-orig/build-outputs.mk subversion-1.1.0-rc2/build-outputs.mk
+*** subversion-orig/build-outputs.mk	2004-08-10 20:17:32.000000000 +0200
+--- subversion-1.1.0-rc2/build-outputs.mk	2004-08-23 21:04:35.000000000 +0200
+***************
+*** 200,206 ****
+  libsvnjavahl_DEPS =  subversion/bindings/java/javahl/native/BlameCallback.lo subversion/bindings/java/javahl/native/CommitMessage.lo subversion/bindings/java/javahl/native/Inputer.lo subversion/bindings/java/javahl/native/JNIByteArray.lo subversion/bindings/java/javahl/native/JNICriticalSection.lo subversion/bindings/java/javahl/native/JNIMutex.lo subversion/bindings/java/javahl/native/JNIStackElement.lo subversion/bindings/java/javahl/native/JNIStringHolder.lo subversion/bindings/java/javahl/native/JNIThreadData.lo subversion/bindings/java/javahl/native/JNIUtil.lo subversion/bindings/java/javahl/native/MessageReceiver.lo subversion/bindings/java/javahl/native/Notify.lo subversion/bindings/java/javahl/native/Outputer.lo subversion/bindings/java/javahl/native/Path.lo subversion/bindings/java/javahl/native/Pool.lo subversion/bindings/java/javahl/native/Prompter.lo subversion/bindings/java/javahl/native/Revision.lo subversion/bindings/java/javahl/native/SVNAdmin.lo subversion/bindings/java/javahl/native/SVNBase.lo subversion/bindings/java/javahl/native/SVNClient.lo subversion/bindings/java/javahl/native/Targets.lo subversion/bindings/java/javahl/native/libsvnjavahl.la.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
+  libsvnjavahl_OBJECTS = BlameCallback.lo CommitMessage.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo MessageReceiver.lo Notify.lo Outputer.lo Path.lo Pool.lo Prompter.lo Revision.lo SVNAdmin.lo SVNBase.lo SVNClient.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo
+  subversion/bindings/java/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
+! 	cd subversion/bindings/java/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS)
+  
+  locale_DEPS =  subversion/po/de.mo subversion/po/es.mo subversion/po/ja.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/sv.mo
+  locale: $(locale_DEPS)
+--- 200,206 ----
+  libsvnjavahl_DEPS =  subversion/bindings/java/javahl/native/BlameCallback.lo subversion/bindings/java/javahl/native/CommitMessage.lo subversion/bindings/java/javahl/native/Inputer.lo subversion/bindings/java/javahl/native/JNIByteArray.lo subversion/bindings/java/javahl/native/JNICriticalSection.lo subversion/bindings/java/javahl/native/JNIMutex.lo subversion/bindings/java/javahl/native/JNIStackElement.lo subversion/bindings/java/javahl/native/JNIStringHolder.lo subversion/bindings/java/javahl/native/JNIThreadData.lo subversion/bindings/java/javahl/native/JNIUtil.lo subversion/bindings/java/javahl/native/MessageReceiver.lo subversion/bindings/java/javahl/native/Notify.lo subversion/bindings/java/javahl/native/Outputer.lo subversion/bindings/java/javahl/native/Path.lo subversion/bindings/java/javahl/native/Pool.lo subversion/bindings/java/javahl/native/Prompter.lo subversion/bindings/java/javahl/native/Revision.lo subversion/bindings/java/javahl/native/SVNAdmin.lo subversion/bindings/java/javahl/native/SVNBase.lo subversion/bindings/java/javahl/native/SVNClient.lo subversion/bindings/java/javahl/native/Targets.lo subversion/bindings/java/javahl/native/libsvnjavahl.la.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
+  libsvnjavahl_OBJECTS = BlameCallback.lo CommitMessage.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo MessageReceiver.lo Notify.lo Outputer.lo Path.lo Pool.lo Prompter.lo Revision.lo SVNAdmin.lo SVNBase.lo SVNClient.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo
+  subversion/bindings/java/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
+! 	cd subversion/bindings/java/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS) -lstdc++
+  
+  locale_DEPS =  subversion/po/de.mo subversion/po/es.mo subversion/po/ja.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/sv.mo
+  locale: $(locale_DEPS)

pkgs/applications/video/MPlayer/builder.sh

@@ -1,4 +1,3 @@
-buildInputs="$x11 $freetype $zlib $alsa"
 . $stdenv/setup
 
 postUnpack() {
@@ -9,9 +8,6 @@ postUnpack=postUnpack
 configureFlags="\
  --with-win32libdir=$win32codecs \
  --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"
 
 postInstall() {

pkgs/applications/video/MPlayer/default.nix

@@ -1,16 +1,17 @@
-{ alsaSupport ? false
-, stdenv, fetchurl, x11, freetype, zlib, alsa ? null}:
+{ alsaSupport ? false, xvSupport ? true
+, stdenv, fetchurl, x11, libXv, freetype, zlib, alsa ? null}:
 
 assert x11 != null && freetype != null;
 assert alsaSupport -> alsa != null;
+assert xvSupport -> libXv != null;
 
 stdenv.mkDerivation {
-  name = "MPlayer-1.0pre3";
+  name = "MPlayer-1.0pre4";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre3.tar.bz2;
-    md5 = "998becb79417c6a14d15c07e85188b82";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre4.tar.bz2;
+    md5 = "83ebac0f05b192516a41fca2350ca01a";
   };
   fonts = fetchurl {
     url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;
@@ -21,6 +22,9 @@ stdenv.mkDerivation {
     inherit stdenv fetchurl;
   };
 
-  alsa = if alsaSupport then alsa else null;
-  inherit alsaSupport x11 freetype zlib;
+  buildInputs = [
+    x11 libXv freetype zlib
+    (if alsaSupport then alsa else null)
+    (if xvSupport then libXv else null)
+  ];
 }

pkgs/applications/video/MPlayer/win32codecs/builder.sh

@@ -1,7 +1,11 @@
 . $stdenv/setup
 
-mkdir $out
-cd $out
-tar xvfj $src
-mv extralite/* .
-rmdir extralite
+buildPhase=true
+
+installPhase() {
+    mkdir $out
+    cp -prv * $out
+}
+installPhase=installPhase
+
+genericBuild

pkgs/applications/video/MPlayer/win32codecs/default.nix

@@ -1,8 +1,8 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "win32codecs-1";
+  name = "MPlayer-codecs-essential-20040427";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2;
-    md5 = "4748ecae87f71e8bda9cb2e2a9bd30b4";
+    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20040427.tar.bz2;
+    md5 = "4ffc1682448aa870aec9d8efc1321a09";
   };
 }

pkgs/applications/video/mplayerplug-in/builder.sh

@@ -1,9 +0,0 @@
-buildinputs="$x11"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd mplayer* || exit 1
-./configure || exit 1
-make || exit 1
-mkdir -p $out/lib/mozilla/plugins || exit 1
-cp mplayerplug-in.so $out/lib/mozilla/plugins || exit 1

pkgs/applications/video/mplayerplug-in/default.nix

@@ -1,15 +0,0 @@
-{stdenv, fetchurl, x11}:
-
-assert x11 != null;
-
-stdenv.mkDerivation {
-  name = "mplayerplug-in-1.0pre2";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-1.0pre2.tar.gz;
-    md5 = "1a6eb243989c143984bb1aac63b5282e";
-  };
-
-  x11 = x11;
-}

pkgs/applications/video/vlc/default.nix

@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, x11, wxGTK, libdvdcss, libdvdplay
+{ xvSupport ? true
+, stdenv, fetchurl, x11, libXv, wxGTK, libdvdcss, libdvdplay
 , mpeg2dec, a52dec, libmad, alsa}:
 
-assert x11 != null && wxGTK != null && libdvdcss != null
-  && libdvdplay != null && mpeg2dec != null && a52dec != null
-  && libmad != null && alsa != null;
 assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
+assert xvSupport -> libXv != null;
 
 stdenv.mkDerivation {
-  name = "vlc-0.7.1";
+  name = "vlc-0.7.2";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/0.7.1/vlc-0.7.1.tar.gz;
-    md5 = "faa5e3162a3e9b3a3d8c3dcc06f70911";
+    url = http://download.videolan.org/pub/videolan/vlc/0.7.2/vlc-0.7.2.tar.gz;
+    md5 = "25dfcc804cb92f46c0b64ce1466515cc";
   };
 
   buildInputs = [
     x11 wxGTK libdvdcss libdvdplay libdvdplay.libdvdread
     mpeg2dec a52dec libmad alsa
+    (if xvSupport then libXv else null)
   ];
 
   configureFlags = "--disable-ffmpeg --enable-alsa";

pkgs/applications/video/zapping/builder.sh

@@ -1,5 +1,10 @@
 . $stdenv/setup
 
+export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
+
+# !!! hack
+NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
+
 # !!! hack - `make install' tries to setuid to root
 installFlags="ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g`"
 

pkgs/applications/video/zapping/default.nix

@@ -1,13 +1,16 @@
 { teletextSupport ? true
 , jpegSupport ? true
 , pngSupport ? true
-, stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
-, libglade, scrollkeeper, esound, gettext
-, zvbi ? null, libjpeg ? null, libpng ? null }:
+, recordingSupport ? true
+# !!! libXext shouldn't be necessary (it's in x11); but the builder needs it.
+, stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXmu, libXext, libgnomeui
+, libglade, scrollkeeper, esound, gettext, perlXMLParser
+, zvbi ? null, libjpeg ? null, libpng ? null, rte ? null }:
 
-assert pkgconfig != null && perl != null && python != null &&
-  x11 != null && libgnomeui != null && libglade != null &&
-  scrollkeeper != null && esound != null && gettext != null;
+assert pkgconfig != null && perl != null && python != null
+  && x11 != null && libXv != null && libXmu != null && libgnomeui != null && libglade != null
+  && scrollkeeper != null && esound != null && gettext != null
+  && perlXMLParser != null;
 
 assert teletextSupport -> zvbi != null && zvbi.pngSupport
   /* !!! && pngSupport && zvbi.libpng == libpng */;
@@ -15,22 +18,25 @@ assert teletextSupport -> zvbi != null && zvbi.pngSupport
 assert jpegSupport -> libjpeg != null;
 assert pngSupport -> libpng != null;
 
+assert recordingSupport -> rte != null;
+
 stdenv.mkDerivation {
-  name = "zapping-0.7cvs6";
+  name = "zapping-0.7";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs6.tar.bz2;
-    md5 = "cdedc0088c70f4520c37066ec05cb996";
+    url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7.tar.bz2;
+    md5 = "dd7b3d920509709692c41c9c6c767746";
   };
 
-  inherit teletextSupport jpegSupport pngSupport;
+  inherit teletextSupport jpegSupport pngSupport libXext perlXMLParser;
 
   buildInputs = [
-    pkgconfig perl python x11 libgnomeui
+    pkgconfig perl python x11 libXv libXmu libgnomeui
     libglade scrollkeeper esound gettext
     (if teletextSupport then zvbi else null)
     (if jpegSupport then libjpeg else null)
     (if pngSupport then libpng else null)
+    (if recordingSupport then rte else null)
   ];
 }

pkgs/build-support/gcc-wrapper/default.nix

@@ -5,7 +5,7 @@
 # stdenv.mkDerivation provides a wrapper that sets up the right environment
 # variables so that the compiler and the linker just "work".
 
-{ name, stdenv, nativeTools, nativeGlibc, nativePrefix ? ""
+{ name ? "", stdenv, nativeTools, nativeGlibc, nativePrefix ? ""
 , gcc ? null, glibc ? null, binutils ? null, shell ? ""
 }:
 
@@ -19,7 +19,8 @@ stdenv.mkDerivation {
   gccWrapper = ./gcc-wrapper.sh;
   ldWrapper = ./ld-wrapper.sh;
   utils = ./utils.sh;
-  inherit name nativeTools nativeGlibc nativePrefix gcc glibc binutils;
+  inherit nativeTools nativeGlibc nativePrefix gcc glibc binutils;
+  name = if name == "" then gcc.name else name;
   langC = if nativeTools then true else gcc.langC;
   langCC = if nativeTools then true else gcc.langCC;
   langF77 = if nativeTools then false else gcc.langF77;

pkgs/build-support/make-symlinks/builder.sh

@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+mkdir $out
+for file in $files
+do
+  subdir=`dirname $file`
+  mkdir -p $out/$subdir
+  ln -s $dir/$file $out/$file
+done

pkgs/build-support/make-symlinks/default.nix

@@ -0,0 +1,7 @@
+{name ? "", stdenv, dir, files}:
+
+stdenv.mkDerivation {
+  inherit dir files;
+  name = if name == "" then dir.name else name;
+  builder = ./builder.sh;
+}

pkgs/development/compilers/blackdown/blackdown-i686.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl}: 
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "blackdown-1.4.2";
+  dirname = "j2sdk1.4.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/os/Linux/java/jdk/JDK-1.4.2/i386/rc1/j2sdk-1.4.2-rc1-linux-i586-gcc3.2.bin;
+    md5 = "52ff3a059845ee8487faeaa7b0c157c8";
+  };
+}

pkgs/development/compilers/blackdown/builder.sh

@@ -0,0 +1,26 @@
+set -e
+
+. $stdenv/setup
+
+cp $src .
+bin=`basename $src`
+chmod u+x $bin
+
+# This is required because those GNU coreutils fuckers suddenly
+# removed the `+N' syntax (due to a misguided desire for "standards
+# compliance"), which the Blackdown installer uses.
+export _POSIX2_VERSION=199209
+
+alias more=cat
+yes yes | ./$bin
+
+mkdir $out
+mv $dirname/* $out/
+
+# remove crap in the root directory
+for file in $out/*
+do
+  if test -f $file ; then
+    rm $file
+  fi
+done

pkgs/development/compilers/blackdown/default.nix

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

pkgs/development/compilers/gcc-2.95/builder.sh

@@ -0,0 +1,73 @@
+. $stdenv/setup
+
+
+export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
+mkdir $NIX_FIXINC_DUMMY
+
+
+if test "$noSysDirs" = "1"; then
+
+    if test "$noSysDirs" = "1"; then
+        # Figure out what extra flags to pass to the gcc compilers
+        # being generated to make sure that they use our glibc.
+        if test -e $NIX_GCC/nix-support/orig-glibc; then
+            glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+            # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just
+            # source in $NIX_GCC/nix-support/add-flags, since that
+            # would cause *this* GCC to be linked against the
+            # *previous* GCC.  Need some more modularity there.
+            extraCFlags="-B$glibc/lib -isystem $glibc/include"
+            extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \
+              -Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2"
+
+            # Oh, what a hack.  I should be shot for this.
+            # In stage 1, we should link against the previous GCC, but
+            # not afterwards.  Otherwise we retain a dependency.
+            # However, ld-wrapper, which adds the linker flags for the
+            # previous GCC, is also used in stage 2/3.  We can prevent
+            # it from adding them by NIX_GLIBC_FLAGS_SET, but then
+            # gcc-wrapper will also not add them, thereby causing
+            # stage 1 to fail.  So we use a trick to only set the
+            # flags in gcc-wrapper.
+            hook=$(pwd)/ld-wrapper-hook
+            echo "NIX_GLIBC_FLAGS_SET=1" > $hook
+            export NIX_LD_WRAPPER_START_HOOK=$hook
+        fi
+
+        export NIX_EXTRA_CFLAGS=$extraCFlags
+        export NIX_EXTRA_LDFLAGS=$extraLDFlags
+        export CFLAGS=$extraCFlags
+        export CXXFLAGS=$extraCFlags
+        export LDFLAGS=$extraLDFlags
+        export BOOT_LDFLAGS=$extraLDFlags
+    fi
+
+else
+    patches=""
+fi
+
+
+preConfigure=preConfigure
+preConfigure() {
+    
+    # Determine the frontends to build.
+    langs="c"
+    if test -n "$langCC"; then
+        langs="$langs,c++"
+    fi
+    if test -n "$langF77"; then
+        langs="$langs,f77"
+    fi
+
+    # Perform the build in a different directory.
+    mkdir ../build
+    cd ../build
+
+    configureScript=../$sourceRoot/configure
+    configureFlags="--enable-languages=$langs"
+}
+
+
+makeFlags="bootstrap"
+
+genericBuild

pkgs/development/compilers/gcc-2.95/default.nix

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langF77 ? false
+}:
+
+assert langC;
+
+stdenv.mkDerivation {
+  name = "gcc-2.95.3";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gnu.org/pub/gnu/gcc/gcc-2.95.3.tar.gz;
+    md5 = "f3ad4f32c2296fad758ed051b5ac8e28";
+  };
+  # !!! apply only if noSysDirs is set
+  patches = [./no-sys-dirs.patch];
+  inherit noSysDirs langC langCC langF77;
+}

pkgs/development/compilers/gcc-2.95/no-sys-dirs.patch

@@ -0,0 +1,231 @@
+diff -rc gcc-orig/config.if gcc-2.95.3/config.if
+*** gcc-orig/config.if	1998-10-18 19:37:10.000000000 +0200
+--- gcc-2.95.3/config.if	2004-08-03 12:29:32.000000000 +0200
+***************
+*** 64,70 ****
+    return 0;
+  }
+  EOF
+!       ${CC-cc} $dummy.c -o $dummy 2>/dev/null
+        if [ "$?" = 0 ]
+        then
+  	libc_interface=-libc6.`./$dummy`-
+--- 64,70 ----
+    return 0;
+  }
+  EOF
+!       ${CC-cc} $NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS $dummy.c -o $dummy 2>/dev/null
+        if [ "$?" = 0 ]
+        then
+  	libc_interface=-libc6.`./$dummy`-
+diff -rc gcc-orig/gcc/cccp.c gcc-2.95.3/gcc/cccp.c
+*** gcc-orig/gcc/cccp.c	2001-01-25 15:03:00.000000000 +0100
+--- gcc-2.95.3/gcc/cccp.c	2004-08-03 10:54:39.000000000 +0200
+***************
+*** 373,378 ****
+--- 373,382 ----
+      char fname[1];
+    };
+  
++ #undef LOCAL_INCLUDE_DIR
++ #undef SYSTEM_INCLUDE_DIR
++ #undef STANDARD_INCLUDE_DIR
++ 
+  /* #include "file" looks in source file dir, then stack.  */
+  /* #include <file> just looks in the stack.  */
+  /* -I directories are added to the end, then the defaults are added.  */
+***************
+*** 424,430 ****
+--- 428,436 ----
+  #ifndef STANDARD_INCLUDE_COMPONENT
+  #define STANDARD_INCLUDE_COMPONENT 0
+  #endif
++ #ifdef STANDARD_INCLUDE_DIR
+      { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 0 },
++ #endif
+  #endif /* not CROSS_COMPILE */
+      { 0, 0, 0, 0, 0 }
+      };
+diff -rc gcc-orig/gcc/gcc.c gcc-2.95.3/gcc/gcc.c
+*** gcc-orig/gcc/gcc.c	2001-01-25 15:03:16.000000000 +0100
+--- gcc-2.95.3/gcc/gcc.c	2004-08-03 11:48:09.000000000 +0200
+***************
+*** 1369,1388 ****
+  #undef MD_STARTFILE_PREFIX_1
+  #endif
+  
+- #ifndef STANDARD_EXEC_PREFIX
+- #define STANDARD_EXEC_PREFIX "/usr/local/lib/gcc-lib/"
+- #endif /* !defined STANDARD_EXEC_PREFIX */
+- 
+  static const char *standard_exec_prefix = STANDARD_EXEC_PREFIX;
+- static const char *standard_exec_prefix_1 = "/usr/lib/gcc/";
+  #ifdef MD_EXEC_PREFIX
+  static const char *md_exec_prefix = MD_EXEC_PREFIX;
+  #endif
+  
+- #ifndef STANDARD_STARTFILE_PREFIX
+- #define STANDARD_STARTFILE_PREFIX "/usr/local/lib/"
+- #endif /* !defined STANDARD_STARTFILE_PREFIX */
+- 
+  #ifdef MD_STARTFILE_PREFIX
+  static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
+  #endif
+--- 1369,1379 ----
+***************
+*** 1390,1401 ****
+  static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
+  #endif
+  static const char *standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
+- static const char *standard_startfile_prefix_1 = "/lib/";
+- static const char *standard_startfile_prefix_2 = "/usr/lib/";
+  
+- #ifndef TOOLDIR_BASE_PREFIX
+- #define TOOLDIR_BASE_PREFIX "/usr/local/"
+- #endif
+  static const char *tooldir_base_prefix = TOOLDIR_BASE_PREFIX;
+  static const char *tooldir_prefix;
+  
+--- 1381,1387 ----
+***************
+*** 2896,2908 ****
+  		  value = argv[++i];
+  		else
+  		  value = p + 1;
+  		add_prefix (&exec_prefixes, value, NULL_PTR, 1, 0, &warn_B);
+  		add_prefix (&startfile_prefixes, value, NULL_PTR,
+  			    1, 0, &warn_B);
+  		add_prefix (&include_prefixes, concat (value, "include",
+  						       NULL_PTR),
+  			    NULL_PTR, 1, 0, NULL_PTR);
+! 
+  		/* As a kludge, if the arg is "[foo/]stageN/", just add
+  		   "[foo/]include" to the include prefix.  */
+  		{
+--- 2882,2897 ----
+  		  value = argv[++i];
+  		else
+  		  value = p + 1;
++                 if (strlen(value) > 0 && value[strlen(value) - 1] != '/')
++                     value = concat (value, "/", NULL_PTR);
++                 add_prefix (&startfile_prefixes, value, "BINUTILS", 0, 0, NULL_PTR);
+  		add_prefix (&exec_prefixes, value, NULL_PTR, 1, 0, &warn_B);
+  		add_prefix (&startfile_prefixes, value, NULL_PTR,
+  			    1, 0, &warn_B);
+  		add_prefix (&include_prefixes, concat (value, "include",
+  						       NULL_PTR),
+  			    NULL_PTR, 1, 0, NULL_PTR);
+!                 
+  		/* As a kludge, if the arg is "[foo/]stageN/", just add
+  		   "[foo/]include" to the include prefix.  */
+  		{
+***************
+*** 3060,3073 ****
+  #ifndef OS2
+    add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS",
+  	      0, 2, warn_std_ptr);
+-   add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
+- 	      0, 2, warn_std_ptr);
+  #endif
+  
+    add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
+  	      0, 1, warn_std_ptr);
+-   add_prefix (&startfile_prefixes, standard_exec_prefix_1, "BINUTILS",
+- 	      0, 1, warn_std_ptr);
+  
+    tooldir_prefix = concat (tooldir_base_prefix, spec_machine, 
+  			   dir_separator_str, NULL_PTR);
+--- 3049,3058 ----
+***************
+*** 4865,4874 ****
+  		      NULL_PTR, 0, 0, NULL_PTR);
+  	}		       
+  
+-       add_prefix (&startfile_prefixes, standard_startfile_prefix_1,
+- 		  "BINUTILS", 0, 0, NULL_PTR);
+-       add_prefix (&startfile_prefixes, standard_startfile_prefix_2,
+- 		  "BINUTILS", 0, 0, NULL_PTR);
+  #if 0 /* Can cause surprises, and one can use -B./ instead.  */
+        add_prefix (&startfile_prefixes, "./", NULL_PTR, 0, 1, NULL_PTR);
+  #endif
+--- 4850,4855 ----
+diff -rc gcc-orig/gcc/Makefile.in gcc-2.95.3/gcc/Makefile.in
+*** gcc-orig/gcc/Makefile.in	2001-01-25 15:02:58.000000000 +0100
+--- gcc-2.95.3/gcc/Makefile.in	2004-08-03 12:24:39.000000000 +0200
+***************
+*** 74,80 ****
+  BOOT_CFLAGS = -O2 $(CFLAGS)
+  #WARN_CFLAGS = -W -Wall
+  # These exists to be overridden by the x-* and t-* files, respectively.
+! X_CFLAGS =
+  T_CFLAGS =
+  
+  X_CPPFLAGS =
+--- 74,80 ----
+  BOOT_CFLAGS = -O2 $(CFLAGS)
+  #WARN_CFLAGS = -W -Wall
+  # These exists to be overridden by the x-* and t-* files, respectively.
+! X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS)
+  T_CFLAGS =
+  
+  X_CPPFLAGS =
+***************
+*** 218,224 ****
+         && [ -f /usr/bin/ranlib -o -f /bin/ranlib ] )
+  
+  # Dir to search for system headers.  Overridden by cross-make.
+! SYSTEM_HEADER_DIR = /usr/include
+  
+  # Control whether to run fixproto.
+  STMP_FIXPROTO = stmp-fixproto
+--- 218,228 ----
+         && [ -f /usr/bin/ranlib -o -f /bin/ranlib ] )
+  
+  # Dir to search for system headers.  Overridden by cross-make.
+! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
+! # `fixinc' from fixing header files in /usr/include.  However,
+! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
+! # it to some dummy directory.
+! SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
+  
+  # Control whether to run fixproto.
+  STMP_FIXPROTO = stmp-fixproto
+diff -rc gcc-orig/Makefile.in gcc-2.95.3/Makefile.in
+*** gcc-orig/Makefile.in	1999-06-23 00:44:42.000000000 +0200
+--- gcc-2.95.3/Makefile.in	2004-08-03 10:46:42.000000000 +0200
+***************
+*** 87,94 ****
+  CXXFLAGS = -g -O2
+  
+  LIBCFLAGS = $(CFLAGS)
+! CFLAGS_FOR_TARGET = $(CFLAGS)
+! LDFLAGS_FOR_TARGET = 
+  LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+  PICFLAG = 
+  PICFLAG_FOR_TARGET = 
+--- 87,94 ----
+  CXXFLAGS = -g -O2
+  
+  LIBCFLAGS = $(CFLAGS)
+! CFLAGS_FOR_TARGET = $(CFLAGS) $(NIX_EXTRA_CFLAGS)
+! LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS)
+  LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+  PICFLAG = 
+  PICFLAG_FOR_TARGET = 
+***************
+*** 99,105 ****
+  
+  # Use -O2 to stress test the compiler.
+  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+! CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
+  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+  
+  RANLIB = ranlib
+--- 99,105 ----
+  
+  # Use -O2 to stress test the compiler.
+  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+! CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(NIX_EXTRA_CFLAGS)
+  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+  
+  RANLIB = ranlib

pkgs/development/compilers/gcc-3.4/builder.sh

@@ -0,0 +1,87 @@
+. $stdenv/setup
+
+
+export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
+mkdir $NIX_FIXINC_DUMMY
+
+
+if test "$noSysDirs" = "1"; then
+
+    if test "$noSysDirs" = "1"; then
+        # Figure out what extra flags to pass to the gcc compilers
+        # being generated to make sure that they use our glibc.
+        if test -e $NIX_GCC/nix-support/orig-glibc; then
+            glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+            # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just
+            # source in $NIX_GCC/nix-support/add-flags, since that
+            # would cause *this* GCC to be linked against the
+            # *previous* GCC.  Need some more modularity there.
+            extraCFlags="-B$glibc/lib -isystem $glibc/include"
+            extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \
+              -Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2"
+
+            # Oh, what a hack.  I should be shot for this.
+            # In stage 1, we should link against the previous GCC, but
+            # not afterwards.  Otherwise we retain a dependency.
+            # However, ld-wrapper, which adds the linker flags for the
+            # previous GCC, is also used in stage 2/3.  We can prevent
+            # it from adding them by NIX_GLIBC_FLAGS_SET, but then
+            # gcc-wrapper will also not add them, thereby causing
+            # stage 1 to fail.  So we use a trick to only set the
+            # flags in gcc-wrapper.
+            hook=$(pwd)/ld-wrapper-hook
+            echo "NIX_GLIBC_FLAGS_SET=1" > $hook
+            export NIX_LD_WRAPPER_START_HOOK=$hook
+        fi
+
+        export NIX_EXTRA_CFLAGS=$extraCFlags
+        export NIX_EXTRA_LDFLAGS=$extraLDFlags
+        export CFLAGS=$extraCFlags
+        export LDFLAGS=$extraLDFlags
+    fi
+
+else
+    patches=""
+fi
+
+
+preConfigure=preConfigure
+preConfigure() {
+    
+    # Determine the frontends to build.
+    langs="c"
+    if test -n "$langCC"; then
+        langs="$langs,c++"
+    fi
+    if test -n "$langF77"; then
+        langs="$langs,f77"
+    fi
+
+    # Perform the build in a different directory.
+    mkdir ../build
+    cd ../build
+
+    configureScript=../$sourceRoot/configure
+    configureFlags="--enable-languages=$langs"
+}
+
+
+postInstall=postInstall
+postInstall() {
+    # Remove precompiled headers for now.  They are very big and
+    # probably not very useful yet.
+    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+
+    # Remove `fixincl' to prevent a retained dependency on the
+    # previous gcc.
+    rm -rf $out/libexec/gcc/*/*/install-tools
+}
+
+
+if test -z "$profiledCompiler"; then
+    makeFlags="bootstrap"
+else    
+    makeFlags="profiledbootstrap"
+fi
+
+genericBuild

pkgs/development/compilers/gcc-3.4/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langF77 ? false
+, profiledCompiler ? false
+}:
+
+assert langC;
+
+stdenv.mkDerivation {
+  name = "gcc-3.4.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.4.2/gcc-3.4.2.tar.bz2;
+    md5 = "2fada3a3effd2fd791df09df1f1534b3";
+  };
+  # !!! apply only if noSysDirs is set
+  patches = [./no-sys-dirs.patch];
+  inherit noSysDirs langC langCC langF77 profiledCompiler;
+}

pkgs/development/compilers/gcc-3.4/no-sys-dirs.patch

@@ -0,0 +1,170 @@
+diff -rc gcc-orig/gcc/cppdefault.c gcc-patched/gcc/cppdefault.c
+*** gcc-orig/gcc/cppdefault.c	2003-03-01 15:31:12.000000000 +0100
+--- gcc-patched/gcc/cppdefault.c	2004-06-29 10:08:45.000000000 +0200
+***************
+*** 41,46 ****
+--- 41,50 ----
+  # undef CROSS_INCLUDE_DIR
+  #endif
+  
++ #undef LOCAL_INCLUDE_DIR
++ #undef SYSTEM_INCLUDE_DIR
++ #undef STANDARD_INCLUDE_DIR
++ 
+  const struct default_include cpp_include_defaults[]
+  #ifdef INCLUDE_DEFAULTS
+  = INCLUDE_DEFAULTS;
+diff -rc gcc-orig/gcc/Makefile.in gcc-patched/gcc/Makefile.in
+*** gcc-orig/gcc/Makefile.in	2004-04-01 18:47:54.000000000 +0200
+--- gcc-patched/gcc/Makefile.in	2004-06-29 13:50:45.000000000 +0200
+***************
+*** 199,205 ****
+  CPPFLAGS = @CPPFLAGS@
+  
+  # These exists to be overridden by the x-* and t-* files, respectively.
+! X_CFLAGS =
+  T_CFLAGS =
+  
+  X_CPPFLAGS =
+--- 199,205 ----
+  CPPFLAGS = @CPPFLAGS@
+  
+  # These exists to be overridden by the x-* and t-* files, respectively.
+! X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS)
+  T_CFLAGS =
+  
+  X_CPPFLAGS =
+***************
+*** 345,351 ****
+  PARTITION_H = $(srcdir)/../include/partition.h
+  
+  # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+! NATIVE_SYSTEM_HEADER_DIR = /usr/include
+  # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
+  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+  
+--- 345,355 ----
+  PARTITION_H = $(srcdir)/../include/partition.h
+  
+  # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
+! # `fixinc' from fixing header files in /usr/include.  However,
+! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
+! # it to some dummy directory.
+! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
+  # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
+  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+  
+diff -rc gcc-orig/libstdc++-v3/include/Makefile.in gcc-patched/libstdc++-v3/include/Makefile.in
+*** gcc-orig/libstdc++-v3/include/Makefile.in	2004-03-18 18:36:43.000000000 +0100
+--- gcc-patched/libstdc++-v3/include/Makefile.in	2004-06-29 19:01:33.000000000 +0200
+***************
+*** 896,903 ****
+  	if [ ! -d "${pch_output_builddir}" ]; then \
+  	  mkdir -p ${pch_output_builddir}; \
+  	fi; \
+! 	$(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \
+! 	$(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g;
+  
+  # For robustness sake (in light of junk files or in-source
+  # configuration), copy from the build or source tree to the install
+--- 896,903 ----
+  	if [ ! -d "${pch_output_builddir}" ]; then \
+  	  mkdir -p ${pch_output_builddir}; \
+  	fi; \
+! 	$(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \
+! 	$(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g;
+  
+  # For robustness sake (in light of junk files or in-source
+  # configuration), copy from the build or source tree to the install
+diff -rc gcc-orig/ltcf-cxx.sh gcc-patched/ltcf-cxx.sh
+*** gcc-orig/ltcf-cxx.sh	2003-11-19 06:29:32.000000000 +0100
+--- gcc-patched/ltcf-cxx.sh	2004-06-29 15:26:01.000000000 +0200
+***************
+*** 985,991 ****
+    # the conftest object file.
+    pre_test_object_deps_done=no
+  
+!   for p in `eval $output_verbose_link_cmd`; do
+  
+      case $p in
+  
+--- 985,991 ----
+    # the conftest object file.
+    pre_test_object_deps_done=no
+  
+!   for p in `true`; do
+  
+      case $p in
+  
+diff -rc gcc-orig/Makefile.in gcc-patched/Makefile.in
+*** gcc-orig/Makefile.in	2004-01-14 21:09:37.000000000 +0100
+--- gcc-patched/Makefile.in	2004-06-29 16:21:36.000000000 +0200
+***************
+*** 228,234 ****
+  NM = @NM@
+  
+  LD = @LD@
+! LDFLAGS = 
+  
+  RANLIB = @RANLIB@
+  
+--- 228,234 ----
+  NM = @NM@
+  
+  LD = @LD@
+! LDFLAGS = $(NIX_EXTRA_LDFLAGS)
+  
+  RANLIB = @RANLIB@
+  
+***************
+*** 277,283 ****
+  # CFLAGS will be just -g.  We want to ensure that TARGET libraries
+  # (which we know are built with gcc) are built with optimizations so
+  # prepend -O2 when setting CFLAGS_FOR_TARGET.
+! CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
+  # If GCC_FOR_TARGET is not overriden on the command line, then this
+  # variable is passed down to the gcc Makefile, where it is used to
+  # build libgcc2.a.  We define it here so that it can itself be
+--- 277,283 ----
+  # CFLAGS will be just -g.  We want to ensure that TARGET libraries
+  # (which we know are built with gcc) are built with optimizations so
+  # prepend -O2 when setting CFLAGS_FOR_TARGET.
+! CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(NIX_EXTRA_CFLAGS)
+  # If GCC_FOR_TARGET is not overriden on the command line, then this
+  # variable is passed down to the gcc Makefile, where it is used to
+  # build libgcc2.a.  We define it here so that it can itself be
+***************
+*** 290,296 ****
+  RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
+  CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+  RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+! CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
+  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+  
+  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+--- 290,296 ----
+  RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
+  CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+  RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+! CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(NIX_EXTRA_CFLAGS)
+  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+  
+  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+***************
+*** 321,327 ****
+      fi; \
+    fi`
+  
+! LDFLAGS_FOR_TARGET = 
+  
+  NM_FOR_TARGET=@NM_FOR_TARGET@
+  USUAL_NM_FOR_TARGET = ` \
+--- 321,327 ----
+      fi; \
+    fi`
+  
+! LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS)
+  
+  NM_FOR_TARGET=@NM_FOR_TARGET@
+  USUAL_NM_FOR_TARGET = ` \

pkgs/development/compilers/gcc-static-3.4/builder.sh

@@ -0,0 +1,73 @@
+. $stdenv/setup
+
+export LDFLAGS="-static"
+
+export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
+mkdir $NIX_FIXINC_DUMMY
+
+
+if test "$noSysDirs" = "1"; then
+
+    if test "$noSysDirs" = "1"; then
+        # Figure out what extra flags to pass to the gcc compilers
+        # being generated to make sure that they use our glibc.
+        if test -e $NIX_GCC/nix-support/orig-glibc; then
+            glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+            # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just
+            # source in $NIX_GCC/nix-support/add-flags, since that
+            # would cause *this* GCC to be linked against the
+            # *previous* GCC.  Need some more modularity there.
+            extraCFlags="-B$glibc/lib -isystem $glibc/include"
+            extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \
+              -Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2 -static"
+
+            # Oh, what a hack.  I should be shot for this.
+            # In stage 1, we should link against the previous GCC, but
+            # not afterwards.  Otherwise we retain a dependency.
+            # However, ld-wrapper, which adds the linker flags for the
+            # previous GCC, is also used in stage 2/3.  We can prevent
+            # it from adding them by NIX_GLIBC_FLAGS_SET, but then
+            # gcc-wrapper will also not add them, thereby causing
+            # stage 1 to fail.  So we use a trick to only set the
+            # flags in gcc-wrapper.
+            hook=$(pwd)/ld-wrapper-hook
+            echo "NIX_GLIBC_FLAGS_SET=1" > $hook
+            export NIX_LD_WRAPPER_START_HOOK=$hook
+        fi
+
+        export NIX_EXTRA_CFLAGS=$extraCFlags
+        export NIX_EXTRA_LDFLAGS=$extraLDFlags
+        export CFLAGS=$extraCFlags
+        export LDFLAGS=$extraLDFlags
+    fi
+
+else
+    patches=""
+fi
+
+
+preConfigure=preConfigure
+preConfigure() {
+    
+    # Perform the build in a different directory.
+    mkdir ../build
+    cd ../build
+
+    export LDFLAGS="-static"
+    configureScript=../$sourceRoot/configure
+    configureFlags="--enable-languages=c"
+}
+
+
+postInstall=postInstall
+postInstall() {
+    # Remove precompiled headers for now.  They are very big and
+    # probably not very useful yet.
+    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+
+    # Remove `fixincl' to prevent a retained dependency on the
+    # previous gcc.
+    rm -rf $out/libexec/gcc/*/*/install-tools
+}
+
+genericBuild

pkgs/development/compilers/gcc-static-3.4/builder.sh.old

@@ -0,0 +1,29 @@
+. $stdenv/setup
+
+echo $PATH
+export LDFLAGS="-static"
+
+preConfigure=preConfigure
+preConfigure() {
+    
+    # Perform the build in a different directory.
+    mkdir ../build
+    cd ../build
+
+    configureScript=../$sourceRoot/configure
+    configureFlags="--enable-languages=c"
+}
+
+
+postInstall=postInstall
+postInstall() {
+    # Remove precompiled headers for now.  They are very big and
+    # probably not very useful yet.
+    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+
+    # Remove `fixincl' to prevent a retained dependency on the
+    # previous gcc.
+    rm -rf $out/libexec/gcc/*/*/install-tools
+}
+
+genericBuild

pkgs/development/compilers/gcc-static-3.4/default.nix

@@ -0,0 +1,13 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "gcc-static-3.4.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.4.2/gcc-3.4.2.tar.bz2;
+    md5 = "2fada3a3effd2fd791df09df1f1534b3";
+  };
+  # !!! apply only if noSysDirs is set
+  patches = [./no-sys-dirs.patch];
+  noSysDirs = 1;
+}

pkgs/development/compilers/gcc-static-3.4/ldflags.patch

@@ -0,0 +1,20 @@
+diff -rc gcc-3.4.2-orig/Makefile.in gcc-3.4.2-patched/Makefile.in
+*** gcc-3.4.2-orig/Makefile.in	2004-07-09 00:16:02.000000000 +0200
+--- gcc-3.4.2-patched/Makefile.in	2004-10-21 13:57:41.000000000 +0200
+***************
+*** 228,234 ****
+  NM = @NM@
+  
+  LD = @LD@
+! LDFLAGS = 
+  
+  RANLIB = @RANLIB@
+  
+--- 228,234 ----
+  NM = @NM@
+  
+  LD = @LD@
+! LDFLAGS = @LDFLAGS@
+  
+  RANLIB = @RANLIB@
+  

pkgs/development/compilers/gcc-static-3.4/no-sys-dirs.patch

@@ -0,0 +1,170 @@
+diff -rc gcc-orig/gcc/cppdefault.c gcc-patched/gcc/cppdefault.c
+*** gcc-orig/gcc/cppdefault.c	2003-03-01 15:31:12.000000000 +0100
+--- gcc-patched/gcc/cppdefault.c	2004-06-29 10:08:45.000000000 +0200
+***************
+*** 41,46 ****
+--- 41,50 ----
+  # undef CROSS_INCLUDE_DIR
+  #endif
+  
++ #undef LOCAL_INCLUDE_DIR
++ #undef SYSTEM_INCLUDE_DIR
++ #undef STANDARD_INCLUDE_DIR
++ 
+  const struct default_include cpp_include_defaults[]
+  #ifdef INCLUDE_DEFAULTS
+  = INCLUDE_DEFAULTS;
+diff -rc gcc-orig/gcc/Makefile.in gcc-patched/gcc/Makefile.in
+*** gcc-orig/gcc/Makefile.in	2004-04-01 18:47:54.000000000 +0200
+--- gcc-patched/gcc/Makefile.in	2004-06-29 13:50:45.000000000 +0200
+***************
+*** 199,205 ****
+  CPPFLAGS = @CPPFLAGS@
+  
+  # These exists to be overridden by the x-* and t-* files, respectively.
+! X_CFLAGS =
+  T_CFLAGS =
+  
+  X_CPPFLAGS =
+--- 199,205 ----
+  CPPFLAGS = @CPPFLAGS@
+  
+  # These exists to be overridden by the x-* and t-* files, respectively.
+! X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS)
+  T_CFLAGS =
+  
+  X_CPPFLAGS =
+***************
+*** 345,351 ****
+  PARTITION_H = $(srcdir)/../include/partition.h
+  
+  # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+! NATIVE_SYSTEM_HEADER_DIR = /usr/include
+  # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
+  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+  
+--- 345,355 ----
+  PARTITION_H = $(srcdir)/../include/partition.h
+  
+  # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
+! # `fixinc' from fixing header files in /usr/include.  However,
+! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
+! # it to some dummy directory.
+! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
+  # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
+  CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+  
+diff -rc gcc-orig/libstdc++-v3/include/Makefile.in gcc-patched/libstdc++-v3/include/Makefile.in
+*** gcc-orig/libstdc++-v3/include/Makefile.in	2004-03-18 18:36:43.000000000 +0100
+--- gcc-patched/libstdc++-v3/include/Makefile.in	2004-06-29 19:01:33.000000000 +0200
+***************
+*** 896,903 ****
+  	if [ ! -d "${pch_output_builddir}" ]; then \
+  	  mkdir -p ${pch_output_builddir}; \
+  	fi; \
+! 	$(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \
+! 	$(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g;
+  
+  # For robustness sake (in light of junk files or in-source
+  # configuration), copy from the build or source tree to the install
+--- 896,903 ----
+  	if [ ! -d "${pch_output_builddir}" ]; then \
+  	  mkdir -p ${pch_output_builddir}; \
+  	fi; \
+! 	$(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g; \
+! 	$(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g;
+  
+  # For robustness sake (in light of junk files or in-source
+  # configuration), copy from the build or source tree to the install
+diff -rc gcc-orig/ltcf-cxx.sh gcc-patched/ltcf-cxx.sh
+*** gcc-orig/ltcf-cxx.sh	2003-11-19 06:29:32.000000000 +0100
+--- gcc-patched/ltcf-cxx.sh	2004-06-29 15:26:01.000000000 +0200
+***************
+*** 985,991 ****
+    # the conftest object file.
+    pre_test_object_deps_done=no
+  
+!   for p in `eval $output_verbose_link_cmd`; do
+  
+      case $p in
+  
+--- 985,991 ----
+    # the conftest object file.
+    pre_test_object_deps_done=no
+  
+!   for p in `true`; do
+  
+      case $p in
+  
+diff -rc gcc-orig/Makefile.in gcc-patched/Makefile.in
+*** gcc-orig/Makefile.in	2004-01-14 21:09:37.000000000 +0100
+--- gcc-patched/Makefile.in	2004-06-29 16:21:36.000000000 +0200
+***************
+*** 228,234 ****
+  NM = @NM@
+  
+  LD = @LD@
+! LDFLAGS = 
+  
+  RANLIB = @RANLIB@
+  
+--- 228,234 ----
+  NM = @NM@
+  
+  LD = @LD@
+! LDFLAGS = $(NIX_EXTRA_LDFLAGS)
+  
+  RANLIB = @RANLIB@
+  
+***************
+*** 277,283 ****
+  # CFLAGS will be just -g.  We want to ensure that TARGET libraries
+  # (which we know are built with gcc) are built with optimizations so
+  # prepend -O2 when setting CFLAGS_FOR_TARGET.
+! CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
+  # If GCC_FOR_TARGET is not overriden on the command line, then this
+  # variable is passed down to the gcc Makefile, where it is used to
+  # build libgcc2.a.  We define it here so that it can itself be
+--- 277,283 ----
+  # CFLAGS will be just -g.  We want to ensure that TARGET libraries
+  # (which we know are built with gcc) are built with optimizations so
+  # prepend -O2 when setting CFLAGS_FOR_TARGET.
+! CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(NIX_EXTRA_CFLAGS)
+  # If GCC_FOR_TARGET is not overriden on the command line, then this
+  # variable is passed down to the gcc Makefile, where it is used to
+  # build libgcc2.a.  We define it here so that it can itself be
+***************
+*** 290,296 ****
+  RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
+  CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+  RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+! CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
+  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+  
+  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+--- 290,296 ----
+  RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
+  CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+  RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+! CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(NIX_EXTRA_CFLAGS)
+  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+  
+  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+***************
+*** 321,327 ****
+      fi; \
+    fi`
+  
+! LDFLAGS_FOR_TARGET = 
+  
+  NM_FOR_TARGET=@NM_FOR_TARGET@
+  USUAL_NM_FOR_TARGET = ` \
+--- 321,327 ----
+      fi; \
+    fi`
+  
+! LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS)
+  
+  NM_FOR_TARGET=@NM_FOR_TARGET@
+  USUAL_NM_FOR_TARGET = ` \

pkgs/development/compilers/harp/builder.sh

@@ -0,0 +1,18 @@
+. $stdenv/setup 
+
+unzip $src
+
+happy Language/Haskell/Harp/Parser.ly
+ghc --make TrHarp.hs -o trharp
+
+
+mkdir $out
+mkdir $out/bin
+cp trharp $out/bin/
+
+ghc -c Language/Haskell/Harp/Match.hs
+
+mkdir -p $out/hslibs/Language/Haskell/Harp/
+cp Language/Haskell/Harp/Match.hs $out/hslibs/Language/Haskell/Harp/
+cp Language/Haskell/Harp/Match.hi $out/hslibs/Language/Haskell/Harp/
+cp Language/Haskell/Harp/Match.o $out/hslibs/Language/Haskell/Harp/

pkgs/development/compilers/harp/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, unzip, ghc, happy}:
+
+stdenv.mkDerivation {
+  name = "harp-0.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.dtek.chalmers.se/~d00nibro/harp/harp-0.1-src.zip;
+    md5 = "8fc8552b7c05b5828b2e1b07f8c1f063";
+  };
+  buildInputs = [unzip ghc happy];
+}

pkgs/development/compilers/j2sdk/builder.sh

@@ -1,7 +1,7 @@
+#!/bin/sh
 
 . $stdenv/setup || exit 1
-version=j2sdk1.4.2_03
-src=$version.bin
+src=$filename.bin
 
 cp $pathname $src || exit 1
 
@@ -18,4 +18,12 @@ alias more=cat
 yes yes | ./$src || exit 1
 
 mkdir $out || exit 1
-mv $version/* $out/ || exit 1
+mv $dirname/* $out/ || exit 1
+
+# remove crap in the root directory
+for file in $out/*
+do
+  if test -f $file ; then
+    rm $file
+  fi
+done

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/j2sdk-sun-linux.nix

@@ -14,9 +14,11 @@ assert stdenv.system == "i686-linux";
 
 derivation {
   name = "j2sdk-1.4.2";
+  filename = "j2sdk-1.4.2_05";
+  dirname = "j2sdk1.4.2_05";
   system = stdenv.system;
   builder = ./builder.sh;
-  pathname = "/tmp/j2sdk-1_4_2_03-linux-i586.bin";
-  md5 = "859aa6750161477acec83b7bb5d9998d";
+  pathname = "/tmp/j2sdk-1_4_2_05-linux-i586.bin";
+  md5 = "825ff134f3e370f6e677638d32962082";
   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";
+  filename = "jdk-1_5_0";
+  dirname = "jdk1.5.0";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  pathname = "/tmp/jdk-1_5_0-linux-i586.bin";
+  md5 = "81d0511feb32e7b7d61f7c07ee0b15e9";
+  stdenv = stdenv;
+}

pkgs/development/compilers/jikes/builder.sh

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

pkgs/development/compilers/jikes/default.nix

@@ -1,8 +1,10 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "jikes-1.18";
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "jikes-1.21";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2;
-    md5 = "74bbcfd31aa2d7df4b86c5fe2db315cc";
+    url = http://losser.st-lab.cs.uu.nl/~mbravenb/mirror/jikes-1.21.tar.bz2;
+    md5 = "4e45eeab4c75918174e16ea2b695d812";
   };
 }

pkgs/development/compilers/nasm/builder.sh

@@ -0,0 +1,6 @@
+. $stdenv/setup
+
+mkdir -p $out/bin
+mkdir -p $out/man/man1
+
+genericBuild

pkgs/development/compilers/nasm/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "nasm-0.98.38";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/nasm/nasm-0.98.38.tar.bz2;
+    md5 = "9f682490c132b070d54e395cb6ee145e";
+  };
+}

pkgs/development/compilers/ocaml/builder.sh

@@ -0,0 +1,8 @@
+. $stdenv/setup
+
+configureFlags="-prefix $out $configureFlags"
+genericBuild
+
+#cd emacs/
+#mkdir -p $out/share/ocaml/emacs
+#make EMACSDIR=$out/share/ocaml/emacs install

pkgs/development/compilers/ocaml/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, x11}:
+
+stdenv.mkDerivation {
+  name = "ocaml-3.08.0";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.0.tar.gz;
+    md5 = "c6ef478362295c150101cdd2efcd38e0";
+  };
+  configureScript = ./configure;
+  dontAddPrefix = "True";
+  configureFlags = ["-no-tk" "-x11lib" x11];
+  makeFlags = ["world" "bootstrap" "opt"];
+  checkTarget = ["opt.opt"];
+}

pkgs/development/compilers/strategoxt/builder.sh

@@ -1,5 +1,4 @@
-buildInputs="$aterm $sdf"
 . $stdenv/setup
 
-configureFlags="--with-aterm=$aterm --with-sdf=$sdf"
+configureFlags="--with-aterm=$aterm --with-sglr=$sglr --with-pgen=$pgen --with-pt-support=$ptsupport --with-asf-library=$asflibrary"
 genericBuild

pkgs/development/compilers/strategoxt/default.nix

@@ -1,11 +1,2 @@
-{stdenv, fetchurl, aterm, sdf}:
+import ./strategoxt-0.11.nix
 
-stdenv.mkDerivation {
-  name = "strategoxt-0.9.5";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.5.tar.gz;
-    md5 = "c3caea5c05f8d8439450866b6d5664df";
-  };
-  inherit aterm sdf;
-}

pkgs/development/compilers/strategoxt/dist.nix

@@ -1,19 +0,0 @@
-{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.10.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, aterm, sdf}:
+
+stdenv.mkDerivation {
+
+  name = "strategoxt-0.10";
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.10.tar.gz;
+    md5 = "526a28e84248b649bb098b22d227cd26";
+  };
+
+  inherit aterm;
+  inherit (sdf) sglr pgen ptsupport asflibrary;
+
+  buildInputs = [aterm sdf.pgen];
+}

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

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, aterm, sdf}:
+
+stdenv.mkDerivation {
+
+  name = "strategoxt-0.11";
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.11.tar.gz;
+    md5 = "bf6c38179f6883b01fa3e548c4f45f1c";
+  };
+
+  inherit aterm;
+  inherit (sdf) sglr pgen ptsupport asflibrary;
+
+  buildInputs = [aterm sdf.pgen];
+}

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

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

pkgs/development/compilers/strategoxt/svnbuilder.sh

@@ -1,13 +0,0 @@
-. $stdenv/setup
-
-echo "pwd = `pwd`"
-echo "PATH = $PATH"
-
-echo "ACLOCAL_PATH = $ACLOCAL_PATH"
-
-cp -r $src strategoxt
-chmod -R +w strategoxt
-cd strategoxt
-./bootstrap
-./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf
-make install

pkgs/development/compilers/strategoxt/trunk.nix

@@ -1,15 +0,0 @@
-{stdenv, fetchsvn, autoconf, automake, libtool, which, aterm, sdf}:
-
-stdenv.mkDerivation {
-  name = "strategoxt-0.9.4-4792";
-
-  builder = ./svnbuilder.sh;
-  src = fetchsvn {
-    url = https://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/StrategoXT;
-    rev = "4792";
-    md5 = "0a7bba2cabfc7a9e2b9b5b43ddb3b7ad";
-  };
-
-  buildInputs = [autoconf automake libtool which aterm sdf];
-  inherit aterm sdf libtool;
-}

pkgs/development/interpreters/clisp/builder.sh

@@ -0,0 +1,12 @@
+. $stdenv/setup || exit 1
+
+set -e
+
+tar jxvf $src
+cd clisp-*
+./configure builddir --prefix=$out
+cd builddir
+./makemake --with-dynamic-ffi --prefix=$out > Makefile
+make config.lisp
+make
+make install

pkgs/development/interpreters/clisp/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, libsigsegv, gettext}:
+
+stdenv.mkDerivation {
+  name = "clisp-2.33.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://belnet.dl.sourceforge.net/sourceforge/clisp/clisp-2.33.2.tar.bz2;
+    md5 = "ee4ea316db1e843dcb16094bf500012f";
+  };
+
+  inherit libsigsegv gettext;
+  buildInputs = [libsigsegv gettext];
+}

pkgs/development/interpreters/j2re/builder.sh

@@ -1,13 +1,25 @@
+#! /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
 
+echo "Unpacking J2RE"
 yes yes | ./$version.bin || exit 1
 
 mkdir $out || exit 1
+
+echo "Moving sources to the right location"
 mv $version/* $out/ || exit 1
+
+echo "Removing files at top level"
+for file in $out/*
+do
+  if test -f $file ; then
+    rm $file
+  fi
+done
+rm -rf $out/docs

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

@@ -2,14 +2,12 @@
 
 assert stdenv.system == "i686-linux";
 
-
-derivation {
-  name = "j2re-1.4.2";
-  system = stdenv.system;
+stdenv.mkDerivation {
+  name    = "j2re-1.4.2";
+  version = "j2re1.4.2_04";
   builder = ./builder.sh;
   src = fetchurl {
-      url = http://java.sun.com/webapps/download/AutoDL?BundleId=9500;
-      md5 = "b4aae3fcda73d976bd6ae6349b36a90c";
+      url = http://java.sun.com/webapps/download/AutoDL?BundleId=9562;
+      md5 = "57e31ffc32a2956e6140ceda8aa86e4e";
     };
-  stdenv = stdenv;
 }

pkgs/development/interpreters/kaffe/builder.sh

@@ -0,0 +1,5 @@
+. $stdenv/setup || exit 1
+
+configureFlags="--with-jikes=$jikes/bin/jikes --enable-pure-java-math"
+genericBuild
+

pkgs/development/interpreters/kaffe/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, alsaLib, xlibs, jikes}:
+
+stdenv.mkDerivation {
+  name = "kaffe-1.1.4";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/kaffe-1.1.4.tar.gz;
+    md5 = "94d6e7035ba68c2221dce68bb5b3f6e9";
+  };
+  inherit jikes alsaLib;
+  inherit (xlibs) libXaw libX11;
+
+  buildInputs = [jikes alsaLib xlibs.libXaw xlibs.libX11];
+}

pkgs/development/interpreters/octave/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, g77, readline, ncurses, perl}:
+
+assert readline != null && ncurses != null;
+assert g77.langF77;
+
+stdenv.mkDerivation {
+  name = "octave-2.1.61";
+  src = fetchurl {
+    url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.1.61.tar.bz2;
+    md5 = "66416e4c219dd1f2a83ec45c6958396b";
+  };
+  buildInputs = [g77 readline ncurses perl];
+  configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared";
+}

pkgs/development/interpreters/perl/builder.sh

@@ -1,31 +1,12 @@
-buildinputs="$patch"
 . $stdenv/setup
 
-tar xvfz $src
-cd perl-*
-
-# Perl's Configure messes with PATH.  We can't have that, so we patch it.
-# Yeah, this is an ugly hack.
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
-    cat Configure | \
-        grep -v '^paths=' | \
-        grep -v '^locincpth=' | \
-        grep -v '^xlibpth=' | \
-        grep -v '^glibpth=' | \
-        grep -v '^loclibpth=' | \
-        grep -v '^locincpth=' | \
-        cat > Configure.tmp
-    mv Configure.tmp Configure
-    chmod +x Configure
-fi
-
-patch -p1 < $srcPatch
-
 if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
     GLIBC=$(cat $NIX_GCC/nix-support/orig-glibc)
     extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib"
 fi
 
-./Configure -de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags
-make
-make install
+configureScript=./Configure
+configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags"
+dontAddPrefix=1
+
+genericBuild