Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18341

32 files changed, 536 insertions, 124 deletions

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index e7f24b37f161..0493fe44631d 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
   */
 
-  buildInputs = [x11 xextproto libXtst inputproto];
+  buildInputs = [x11 xextproto libXtst inputproto libXi];
 
   patches = [ (fetchurl {
     url = http://mawercer.de/~nix/syncergy-gcc43.patch.gz;
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index adbb6f371eb7..b574b5fa5ec9 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, wxGTK, chmlib}:
 
 stdenv.mkDerivation {
-  name = "xchm-1.9";
+  name = "xchm-1.17";
   src = fetchurl {
-    url = mirror://sourceforge/xchm/xchm-1.14.tar.gz;
-    sha256 = "0gx8h8iabfrawx86f3im36favwl18afwx6z7w9gkjamihcm1an1w";
+    url = mirror://sourceforge/xchm/xchm-1.17.tar.gz;
+    sha256 = "0yizisn4833nnpd4apallyg8iv334y00hv3awbsbc0ks2zf93x0n";
   };
   buildInputs = [wxGTK chmlib];
 
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index e7855c552ec3..64157f66f2f8 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -26,17 +26,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
   name = "chrome-${version}";
-  version = "31080";
+  version = "31663";
   src = 
     if stdenv.system == "x86_64-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
-        sha256 = "1km6mrhzgdlhy7pl60g8wh8hlxp0ymv6rqpp3aqd94mqj9g5asm9";
+        sha256 = "0dl3kvfwlg7clq8v67wx8xydsj181qmmpg877s75ys9h1gb01gr6";
       } 
     else if stdenv.system == "i686-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
-        sha256 = "12awdamkkcb8kq2z7kila00yhn9msihq7b6970k9hghbwq95hjrk";
+        sha256 = "1d8fmw0rar44nabqw9sfv84vfw4a2hb9mi1j7a60nwb23wzl80s8";
       } 
     else null;
 
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index 038531419b13..c0948c9dca98 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -4,13 +4,13 @@
 , freetype, fontconfig
 , application ? "browser" }:
 
-let version = "3.5.4"; in
+let version = "3.5.5"; in
 stdenv.mkDerivation {
   name = "icecat-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
-    sha256 = "0j506l2qg30xg11zlfk8b2jwrp8bghc286j21gx0ws2qy6snagnr";
+    sha256 = "1mwk81vkay007k1rcx9hdmfl2540lj5nrxxv3zagifbaala89c3d";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
new file mode 100644
index 000000000000..c6c2fd4d1b19
--- /dev/null
+++ b/pkgs/applications/office/ledger/default.nix
@@ -0,0 +1,46 @@
+# TODO: fix a problem with patchelf(?)
+
+{stdenv, fetchurl, emacs, gmp, pcre}:
+
+let
+
+  pname = "ledger";
+  version = "2.6.1";
+  name = "${pname}-${version}";
+
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "96830d77d3aa6bf6c5778f5dd52169f9b5203fb7daad0e12831abeb35b14f27a";
+  };
+
+  buildInputs = [ emacs gmp pcre ];
+
+  # Something goes wrong with pathelf...
+  # this is a small workaround: adds a small shell script for
+  # setting LD_LIBRARY_PATH
+  postInstall = ''
+    cd $out/bin
+    mv ledger ledger.bin
+    echo "#!/bin/sh" > ledger
+    echo "LD_LIBRARY_PATH=$out/lib $out/bin/ledger.bin "'"$@"' >> ledger
+    chmod +x ledger
+  '';
+
+  meta = {
+    description =
+     "A double-entry accounting system with a command-line reporting interface";
+    longDescription = ''
+      Ledger is a powerful, double-entry accounting system that is accessed
+      from the UNIX command-line. This may put off some users, as there is
+      no flashy UI, but for those who want unparalleled reporting access to
+      their data, there really is no alternative.
+    '';
+    homepage = http://wiki.github.com/jwiegley/ledger;
+    license = "BSD";
+  };
+}
diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
index 919f17f54617..6693795edd90 100644
--- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix
+++ b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
@@ -5,7 +5,7 @@ rec {
     dbs = ["monotone.ca"];
     selector = "0e9194c89eb87e62ac7d54c7b88b10b94b07fa41";
     branch = "net.venge.monotone-viz.automate";
-    sha256 = "b9189ccd64c02d158517e97bce079e87843e7b1948c5c61c534aa0b885c711ac";
+    sha256 = "d7980c9729b0a58f0dd27768b8eae46b45462fe72a88534b8aa159d889b4d624";
   } + "/";
 
   buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib 
diff --git a/pkgs/applications/virtualization/qemu/0.11.0.nix b/pkgs/applications/virtualization/qemu/0.11.0.nix
new file mode 100644
index 000000000000..bbcf18064525
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/0.11.0.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, SDL, zlib, which}:
+
+stdenv.mkDerivation {
+  name = "qemu-0.11.0";
+
+  src = fetchurl {
+    url = http://download.savannah.gnu.org/releases/qemu/qemu-0.11.0.tar.gz;
+    sha256 = "1w3n61lzwvqg1ygn0vs8syybbmbcbk7lfyya098k201lp5rpwamw";
+  };
+
+  patchFlags = "-p2";
+  
+  buildInputs = [SDL zlib which];
+  
+  meta = {
+    description = "QEmu processor emulator";
+  };
+}
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 6966b5c0bf9b..8fd86cd24815 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,6 +1,28 @@
 {stdenv, git}:
 {url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
 
+/* NOTE:
+   fetchgit has one problem: git fetch only works for refs.
+   This is because fetching arbitrary (maybe dangling) commits may be a security risk
+   and checking whether a commit belongs to a ref is expensive. This may
+   change in the future when some caching is added to git (?)
+   Usually refs are either tags (refs/tags/*) or branches (refs/heads/*)
+   Cloning branches will make the hash check fail when there is an update.
+   But not all patches we want can be accessed by tags.
+
+   The workaround is getting the last n commits so that it's likly that they
+   still contain the hash we want.
+
+   for now : increase depth iteratively (TODO)
+
+   real fix: ask git folks to add a
+   git fetch $HASH contained in $BRANCH
+   facility because checking that $HASH is contained in $BRANCH is less
+   expensive than fetching --depth $N.
+   Even if git folks implemented this feature soon it may take years until
+   server admins start using the new version?
+*/
+
 stdenv.mkDerivation {
   name = "git-export";
   builder = ./builder.sh;
diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh
index f39e38168802..4e34aad052b5 100644
--- a/pkgs/build-support/fetchmtn/builder.sh
+++ b/pkgs/build-support/fetchmtn/builder.sh
@@ -11,7 +11,7 @@ header "getting revision $selector";
 
 done=;
 for source in $dbs; do
-	if mtn pull --debug --db "$cacheDB" "$source" "${branch}"; then
+	if mtn pull --db "$cacheDB" "$source" "${branch}"; then
 		revision="$(mtn --db "$cacheDB" au toposort $(mtn --db "$cacheDB" au select "$selector") | tail -1)";
 		if [ -n "$revision" ]; then
 			if mtn --db "$cacheDB" au get_revision "$revision"; then
@@ -44,3 +44,8 @@ fi;
 
 stopNest
 
+header "clearing _MTN in the output"
+
+rm -rf "$out/_MTN"
+
+stopNest
diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index c3c9ce2d3eac..50633123491a 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     #! /bin/bash -e
     declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths
 
-    for arg in \$($out/bin/ghc-get-packages.sh 6.10.3 "$(dirname $0)"); do
+    for arg in \$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\"); do
       case "\$arg" in
         -package-conf) ;;
         *)
diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix
index f0380d25e7d6..fc94f30044b6 100644
--- a/pkgs/development/compilers/strategoxt/0.18.nix
+++ b/pkgs/development/compilers/strategoxt/0.18.nix
@@ -1,9 +1,22 @@
-{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk}:
+{stdenv, fetchurl, aterm, pkgconfig, getopt, jdk, makeStaticBinaries}:
 
 rec {
 
   inherit aterm;
 
+  atermStatic = stdenv.mkDerivation ( rec {
+    name = "${aterm.name}-static";
+    configureFlags = "--enable-shared=no --enable-static=yes";
+
+    inherit (aterm) src meta patches; 
+  } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ;
+  
+  sdfStatic = stdenv.mkDerivation ( rec {
+    name = "${sdf.name}-static";
+    configureFlags = "--enable-shared=no --enable-static=yes";
+
+    inherit (sdf) src buildInputs preConfigure meta; 
+  } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ;
   
   sdf = stdenv.mkDerivation ( rec {
     name = "sdf2-bundle-2.4";
@@ -31,7 +44,7 @@ rec {
     name = "strategoxt-0.18pre20033";
 
     src = fetchurl {
-      url = "http://hydra.nixos.org/build/82252/download/1/strategoxt-0.18pre20033.tar.gz";
+      url = "ftp://ftp.strategoxt.org/pub/stratego/StrategoXT/strategoxt-0.18pre20033.tar.gz";
       sha256 = "070052cff1fd27b2ca4bed8b6aa0238574a18922b21feae2506e6df5d2201c1c";
     };
 
diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix
index f1a8f808e8d4..01cb578f7c0b 100644
--- a/pkgs/games/neverball/default.nix
+++ b/pkgs/games/neverball/default.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
     sed -i -e 's@-lvorbisfile@-lvorbisfile -lX11 -lgcc_s@' Makefile
   '';
 
+  # The map generation code requires a writable HOME
+  preConfigure = "export HOME=$TMPDIR";
+
   installPhase = ''
     ensureDir $out/bin $out
     cp -R data locale $out
diff --git a/pkgs/os-specific/linux/cryopid/default.nix b/pkgs/os-specific/linux/cryopid/default.nix
index a5f6f4fa5b20..0cb64bcc9753 100644
--- a/pkgs/os-specific/linux/cryopid/default.nix
+++ b/pkgs/os-specific/linux/cryopid/default.nix
@@ -2,36 +2,25 @@
 
 let
 
-  src32 = fetchurl {
-    url = http://dagobah.ucc.asn.au/wacky/cryopid-0.5.9.1-i386.tar.gz;
-    sha256 = "14175pc87x932c09cl1n5iwc5v1086gd4xpb4pz7d5fvqpaxca3h";
-  };
+  pname = "cryopid";
+  version = "20090908";
+  revision = "7da69201d50e";
 
-  src64 = fetchurl {
-    url = http://dagobah.ucc.asn.au/wacky/cryopid-0.5.9.1-x86_64.tar.gz;
-    sha256 = "0y3h9fvb59c8i07das5srhprnsbj1i9m93fp37mzqcjxi2gwjw3b";
-  };
-  
 in
 
-stdenv.mkDerivation {
-  name = "cryopid-0.5.9.1";
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
-  src =
-    if stdenv.system == "i686-linux" then src32
-    else if stdenv.system == "x86_64-linux" then src64
-    else throw "unsupported platform for CryoPID";
+  src = fetchurl {
+    url = "https://sharesource.org/hg/cryopid/archive/${revision}.tar.bz2";
+    sha256 = "908a4b1cb26322ee25afe13ff59e0d86f669538cb4583766b15ca79fda6c69ca";
+  };
 
-  buildInputs = [zlibStatic];
+  buildInputs = [ zlibStatic ];
 
-  buildPhase = ''
-    make -C src ARCH=i386
-  '';
+  preBuild = "cd src";
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp src/freeze $out/bin
-  '';
+  installPhase = "mkdir -p $out/bin; cp cryopid $out/bin";
 
   meta = {
     description = "A process freezer for Linux";
@@ -40,7 +29,7 @@ stdenv.mkDerivation {
       and save it to a file.  This file can then be used to resume the process
       later on, either after a reboot or even on another machines.
     '';
-    homepage = http://cryopid.berlios.de;
+    homepage = http://sharesource.org/project/cryopid;
     license = ''
       Modified BSD license (without advertising clause).  CryoPID ships with
       and links against the dietlibc library, which is distributed under the
diff --git a/pkgs/os-specific/linux/hal/synaptics.nix b/pkgs/os-specific/linux/hal/synaptics.nix
new file mode 100644
index 000000000000..882f76137891
--- /dev/null
+++ b/pkgs/os-specific/linux/hal/synaptics.nix
@@ -0,0 +1,19 @@
+{stdenv}:
+stdenv.mkDerivation {
+  name = "hal-info-synaptics";
+  buildCommand = ''
+    mkdir -p $out/share/hal/fdi/information/15-osvendor/
+    cat << EOF > $out/share/hal/fdi/information/15-osvendor/10-x11-synaptics.fdi
+<?xml version="1.0" encoding="UTF-8"?>
+       <deviceinfo version="0.2">
+           <device>
+               <match key="info.product" contains="Synaptics TouchPad">
+                   <merge key="input.x11_driver" type="string">synaptics</merge>
+                   <merge key="input.x11_options.AlwaysCore" type="string">true</merge>
+                   <merge key="input.x11_options.Protocol" type="string">event</merge>
+               </match>
+           </device>
+       </deviceinfo>
+EOF
+  '';
+}
diff --git a/pkgs/os-specific/linux/kvm/88.nix b/pkgs/os-specific/linux/kvm/88.nix
new file mode 100644
index 000000000000..bfbfbd8e47c1
--- /dev/null
+++ b/pkgs/os-specific/linux/kvm/88.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, kernelHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
+   
+assert stdenv.isLinux;
+   
+stdenv.mkDerivation rec {
+  name = "kvm-88";
+   
+  src = fetchurl {
+    url = "mirror://sourceforge/kvm/${name}.tar.gz";
+    sha256 = "0gmmcwgkfk15wkcjaaa28nrzb0w3vbhg8p585qin61hz6kcy8ryw";
+  };
+
+  configureFlags = "--enable-io-thread";
+
+  # e2fsprogs is needed for libuuid.
+  # rsync is a weird dependency used for copying kernel header files.
+  buildInputs = [zlib SDL alsaLib pkgconfig pciutils];
+
+  preConfigure = ''
+    for i in configure kvm/configure kvm/user/configure; do
+      substituteInPlace $i --replace /bin/bash $shell
+    done
+    
+    substituteInPlace kvm/libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
+
+    # This prevents the kernel module from being built.
+    rm kvm/kernel/configure
+  '';
+
+  meta = {
+    homepage = http://kvm.qumranet.com/;
+    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
+  };
+}
diff --git a/pkgs/servers/http/jboss/builder.sh b/pkgs/servers/http/jboss/builder.sh
deleted file mode 100644
index 335620009197..000000000000
--- a/pkgs/servers/http/jboss/builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-buildInputs="$jdk5"
-source $stdenv/setup
-
-export JDK_HOME=$jdk5
-export JAVA_HOME=$jdk5
-
-tar xfvz $src
-cd jboss-*
-cd build
-sh build.sh
-ensureDir $out
-cp -av output/jboss-*/* $out
-
-# Insert JAVA_HOME variable to make sure the latest JRE is used and not version 5
-sed -i -e "/GREP/aJAVA_HOME=$jdk" $out/bin/run.sh
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index 279e4bfae71c..41eff4cf967f 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, jdk5, jdk }:
+{ stdenv, fetchurl, unzip, jdk, lib }:
 
 stdenv.mkDerivation {
-  name = "jboss-4.2.2.GA";
-
-  builder = ./builder.sh;
-  src = 
-    fetchurl {
-      url = http://garr.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.2.GA-src.tar.gz;
-      md5 = "2a626cdccabe712628555676d67ad44a";
-    };
-
-  inherit jdk5 jdk;
+  name = "jboss-5.1.0.GA";
+  src = fetchurl {
+    url = mirror://sourceforge/jboss/jboss-5.1.0.GA-jdk6.zip;
+    sha256 = "0wy5666h554x1qq4w0rzg3krp4rqrijq0ql7dkx6qgl3vpj9xr5y";
+  };
 
+  buildInputs = [ unzip ];
+      
+  buildPhase = ''
+    sed -i -e "/GREP/aJAVA_HOME=${jdk}" bin/run.sh
+  '';
+  
+  installPhase = ''
+    ensureDir $out
+    cp -av * $out
+  '';
+  
   meta = {
     homepage = "http://www.jboss.org/";
     description = "JBoss, Open Source J2EE application server";
     license = "GPL/LGPL";
+    maintainers = [ lib.maintainers.sander ];
   };
 }
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
new file mode 100644
index 000000000000..8021f7cf9df6
--- /dev/null
+++ b/pkgs/servers/openafs-client/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, autoconf, automake, flex, yacc,
+  kernel_2_6_28, glibc, ncurses, perl, krb5 }:
+
+assert stdenv.isLinux;
+
+let
+  pname = "openafs";
+  version = "1.4.11";
+  name = "${pname}-${version}";
+  webpage = http://www.openafs.org;
+  kernel = kernel_2_6_28;
+in
+
+stdenv.mkDerivation rec {
+  inherit name;
+
+  src = fetchurl {
+    url = "${webpage}/dl/${pname}/${version}/${name}-src.tar.gz";
+    sha256 = "ea5377119fd7b5317428644fa427066b9edbde395d997943a448426742d2c5c9";
+  };
+
+  buildInputs = [ autoconf automake flex yacc ncurses perl ];
+
+  replace_usrbinenv = ./replace-usrbinenv;
+  replace_usrinclude = ./replace-usrinclude;
+  replace_usrbinperl = ./replace-usrbinperl;
+  replace_usrsrc = ./replace-usrsrc;
+
+/*
+    xargs -IXX -L1 -a ${replace_usrbinenv} \
+      substituteInPlace XX --replace "/usr/bin/env" $(type -tp env)
+
+    xargs -IXX -L1 -a ${replace_usrinclude} \
+      substituteInPlace XX --replace "/usr/include" "${glibc}/include"
+
+    xargs -IXX -L1 -a ${replace_usrbinperl} \
+      substituteInPlace XX --replace "/usr/bin/perl" $(type -tp perl)
+
+    xargs -IXX -L1 -a ${replace_usrsrc} \
+      substituteInPlace XX --replace "/usr/src" "$TMP"
+*/
+
+  configurePhase = ''
+    ln -s ${kernel}/lib/modules/*/build $TMP/linux
+
+    echo "Replace ..."
+    for i in `cat ${replace_usrbinenv}`; do
+      substituteInPlace $i --replace "/usr/bin/env" $(type -tp env)
+    done
+    for i in `cat ${replace_usrinclude}`; do
+      substituteInPlace $i --replace "/usr/include" "${glibc}/include"
+    done
+    for i in `cat ${replace_usrbinperl}`; do
+      substituteInPlace $i --replace "/usr/bin/perl" $(type -tp perl)
+    done
+    for i in `cat ${replace_usrsrc}`; do
+      substituteInPlace $i --replace "/usr/src" "$TMP"
+    done
+    echo "... done"
+
+    ./regen.sh
+
+    ./configure \
+       --prefix=$out \
+       --with-linux-kernel-build=$TMP/linux \
+       --with-afs-sysname=amd64_linux26 \
+       --with-krb5-conf=${krb5}/bin/krb5-config \
+       --sysconfdir=/etc/static
+
+    substituteInPlace src/pinstall/install.c --replace "/bin/cp" $(type -tp cp)
+  '';
+
+  meta = {
+      description = "Open AFS client for Linux";
+      homepage = webpage;
+      license = "IPL";
+  };
+}
diff --git a/pkgs/servers/openafs-client/replace-usrbinenv b/pkgs/servers/openafs-client/replace-usrbinenv
new file mode 100644
index 000000000000..b014e8992727
--- /dev/null
+++ b/pkgs/servers/openafs-client/replace-usrbinenv
@@ -0,0 +1,72 @@
+src/tests/ptsmembersuser.pl
+src/tests/bossalvagevolume.pl
+src/tests/bosstop.pl
+src/tests/baduniq.pl
+src/tests/voslistvol.pl
+src/tests/aclremoveuser.pl
+src/tests/vosbackup.pl
+src/tests/bosaddhost.pl
+src/tests/vosremove.pl
+src/tests/bosexec.pl
+src/tests/boscreate.pl
+src/tests/bosremovehost.pl
+src/tests/reauth.pl
+src/tests/ptsexamineuser.pl
+src/tests/ptsmembersgroup.pl
+src/tests/bosremovekey.pl
+src/tests/voslistvldb.pl
+src/tests/bosshutdown.pl
+src/tests/bosadduser.pl
+src/tests/aclclearnegrights.pl
+src/tests/boslisthosts.pl
+src/tests/ptslistmax.pl
+src/tests/vosrestore.pl
+src/tests/acladdrights.pl
+src/tests/ptslistown.pl
+src/tests/bosstart.pl
+src/tests/vospartinfo.pl
+src/tests/bosrestartstopped.pl
+src/tests/voszap.pl
+src/tests/vosexamine.pl
+src/tests/acladdnegrights.pl
+src/tests/ptsdeletegroup.pl
+src/tests/bosdelete.pl
+src/tests/bosstatus.pl
+src/tests/aclcopy.pl
+src/tests/ptscreateuser.pl
+src/tests/vosrelease.pl
+src/tests/bosremoveuser.pl
+src/tests/ptsexaminegroup.pl
+src/tests/voslock.pl
+src/tests/vossyncserv.pl
+src/tests/ptsadduser.pl
+src/tests/bossalvagepart.pl
+src/tests/ptsdeleteuser.pl
+src/tests/voslistpart.pl
+src/tests/vosunlock.pl
+src/tests/boslistkeys.pl
+src/tests/voscreate.pl
+src/tests/vosunlockall.pl
+src/tests/vosdump.pl
+src/tests/vosaddsite.pl
+src/tests/acladdgroup.pl
+src/tests/acladduser.pl
+src/tests/afs-newcell.pl
+src/tests/bosaddkey.pl
+src/tests/ptsremove.pl
+src/tests/aclremovegroup.pl
+src/tests/vosremsite.pl
+src/tests/ptschown.pl
+src/tests/ptssetf.pl
+src/tests/afs-rmcell.pl
+src/tests/bosinstall.pl
+src/tests/boslistusers.pl
+src/tests/vossyncvldb.pl
+src/tests/vosdelentry.pl
+src/tests/vosmove.pl
+src/tests/run-suite.pl
+src/tests/vosrename.pl
+src/tests/ptscreategroup.pl
+src/tests/bosdeleterunning.pl
+src/tests/ptssetmax.pl
+src/tests/bossalvageserver.pl
diff --git a/pkgs/servers/openafs-client/replace-usrbinperl b/pkgs/servers/openafs-client/replace-usrbinperl
new file mode 100644
index 000000000000..d0742adf06b2
--- /dev/null
+++ b/pkgs/servers/openafs-client/replace-usrbinperl
@@ -0,0 +1,16 @@
+src/libafs/make_kbuild_makefile.pl
+src/mkdest.pl
+src/tools/install/write_fstab.pl
+src/tools/install/write_pam.pl
+src/tools/install/check_udebug.pl
+src/config/make_libafs_tree.pl
+src/config/make_vnode.pl
+src/packaging/Debian/afs-newcell
+src/packaging/Debian/afs-rootvol
+src/packaging/Debian/kernel-version
+src/packaging/MacOS/csrvdbmerge.pl
+src/packaging/MacOS/decode-panic
+src/packaging/MacOS/Uninstall
+src/packaging/RedHat/mockbuild.pl
+src/packaging/RedHat/openafs-buildfedora.pl
+src/packaging/RedHat/makesrpm.pl
diff --git a/pkgs/servers/openafs-client/replace-usrinclude b/pkgs/servers/openafs-client/replace-usrinclude
new file mode 100644
index 000000000000..65cd53949128
--- /dev/null
+++ b/pkgs/servers/openafs-client/replace-usrinclude
@@ -0,0 +1,42 @@
+acinclude.m4
+config.guess
+configure
+configure-libafs
+src/libafs/MakefileProto.NBSD.in
+src/libafs/MakefileProto.HPUX.in
+src/libafs/MakefileProto.FBSD.in
+src/libafs/MakefileProto.OBSD.in
+src/libafs/MakefileProto.DFBSD.in
+src/libafs/MakefileProto.AIX.in
+src/libafs/MakefileProto.DARWIN.in
+src/libafs/MakefileProto.SOLARIS.in
+src/libafs/Makefile.common.in
+src/libafs/MakefileProto.IRIX.in
+src/WINNT/kfw/inc/krb4/conf.h
+src/JAVA/libjafs/Makefile.in
+src/splint.cfg
+src/util/vice.h
+src/cf/osconf.m4
+src/vfsck/dir.c
+src/vfsck/main.c
+src/vfsck/utilities.c
+src/vfsck/vprintf.c
+src/vfsck/pass2.c
+src/vfsck/inode.c
+src/afsweb/apache_includes/1.2/buff.h
+src/afsweb/apache_includes/1.2/conf.h
+src/afsweb/apache_includes/1.3.1/buff.h
+src/afsweb/apache_includes/1.3.1/ap_config.h
+src/afsweb/apache_includes/buff.h
+src/afsweb/apache_includes/1.3.6/buff.h
+src/afsweb/apache_includes/1.3.6/ap_config.h
+src/afsweb/apache_includes/conf.h
+src/des/conf.h
+src/tests/OpenAFS/errtrans.pm
+src/wsadmin.lib/rt_r4.generic
+src/wsadmin.lib/pmax_31.generic
+src/wsadmin.lib/rt_r4.generic.dkload
+src/libuafs/Makefile.common.in
+src/afs/afs.h
+src/afs/IRIX/osi_vfs.h
+src/lwp/process.s
diff --git a/pkgs/servers/openafs-client/replace-usrsrc b/pkgs/servers/openafs-client/replace-usrsrc
new file mode 100644
index 000000000000..42f2c2709524
--- /dev/null
+++ b/pkgs/servers/openafs-client/replace-usrsrc
@@ -0,0 +1,11 @@
+acinclude.m4
+configure
+configure-libafs
+src/libafs/MakefileProto.NBSD.in
+src/tools/install/make_rpm_source
+src/tools/install/openafs-tools-cmd-1.2.5-1.spec
+src/tools/install/openafs-tools-cmd-1.2.2-1.spec
+src/config/make_vnode.pl
+src/config/linux-version
+src/wsadmin.lib/pmax_31.generic
+src/afs/OBSD/osi_vfsops.c
diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh
new file mode 100644
index 000000000000..c263500cde45
--- /dev/null
+++ b/pkgs/servers/sabnzbd/builder.sh
@@ -0,0 +1,16 @@
+source $stdenv/setup
+
+tar xvfz $src
+mv SABnzbd-* $out
+
+# Create a start script and let wrapProgram with toPythonPath wrap it so that python is started with cheetahTemplate in its importpath (classpath)
+mkdir $out/bin
+echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd
+chmod +x $out/bin/sabnzbd
+
+for i in $(cd $out/bin && ls); do
+  wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate)" \
+  			  --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
+done
+
+echo $out
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
new file mode 100644
index 000000000000..50e07f273291
--- /dev/null
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, python, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}:
+
+stdenv.mkDerivation {
+  name = "sabnzbd-0.4.12";
+  
+  src = fetchurl {
+    url = http://mesh.dl.sourceforge.net/project/sabnzbdplus/sabnzbdplus/sabnzbd-0.4.12/SABnzbd-0.4.12-src.tar.gz;
+    sha256 = "35ce4172688925ef608fba433ff676357dab7d2abdc1cf83112a1c99682fdd32";
+  };
+
+  buildInputs = [makeWrapper python cheetahTemplate];
+  inherit stdenv python cheetahTemplate par2cmdline unzip unrar; 
+
+  builder = ./builder.sh;
+  
+  meta = {
+    description = "Usenet NZB downloader, par2 repairer and auto extracting server.";
+  };
+}
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d05ae933d962..33bf8e4aa806 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -86,6 +86,10 @@
     configureScript = "./autogen.sh";
   };
 
+  xdriinfo = attrs: attrs // {
+    buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
+  };
+
   xkbcomp = attrs: attrs // {
     NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\"";
   };
diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix
index 3b60564d34e6..adbae2615370 100644
--- a/pkgs/stdenv/mingw/default.nix
+++ b/pkgs/stdenv/mingw/default.nix
@@ -39,7 +39,7 @@ let {
       path = [
         (make + "/bin")
         (binutils + "/bin")
-        (gccCore + "/bin")
+        (gccFull + "/bin")
         (mingwRuntimeBin + "/bin")
         (w32apiBin + "/bin")
         (msys + "/bin")
@@ -77,8 +77,8 @@ let {
            * binutils is on the path because it contains dlltool, which
            * is invoked on the PATH by some packages.
            */
-          initialPath = [make binutils gccCore gccCpp mingwRuntimeSrc w32apiSrc replace msys];
-          gcc = gccCore;
+          initialPath = [make binutils gccFull mingwRuntimeSrc w32apiSrc msys];
+          gcc = gccFull;
           shell = msysShell;
           inherit curl;
           isDarwin = false;
@@ -151,7 +151,7 @@ let {
       builder = ./msys-builder.sh;
       src =
         fetchurlInit1 {
-          url = http://www.cs.uu.nl/people/martin/msys-1.0.11.tar.gz;
+          url = ftp://ftp.strategoxt.org/pub/mingw/msys-1.0.11.tar.gz;
           md5 = "85ce547934797019d2d642ec3b53934b";
         };
     };
@@ -167,14 +167,8 @@ let {
       stdenv = stdenvInit2;
     };
 
-  gccCore =
-    (import ./pkgs).gccCore {
-      stdenv = stdenvInit2;
-      inherit fetchurl;
-    };
-
-  gccCpp =
-    (import ./pkgs).gccCpp {
+  gccFull =
+    (import ./pkgs).gccFull {
       stdenv = stdenvInit2;
       inherit fetchurl;
     };
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
index 6c843e8d3943..4110e250b0eb 100755
--- a/pkgs/stdenv/mingw/pkgs/default.nix
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -23,7 +23,7 @@ rec {
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = mirror://sourceforge/mingw/mingw32-make-3.81-1.tar.gz;
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-1.tar.gz;
           md5 = "74c2f44ecc699b318edeb07d838feae5";
         };
     };
@@ -31,28 +31,14 @@ rec {
   /**
    * GCC. Binary
    */
-  gccCore =  {stdenv, fetchurl} :
+  gccFull =  {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "mingw-gcc-core-3.4.2-20040916-1";
+      name = "gcc-full-4.4.0-mingw32";
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = mirror://sourceforge/mingw/gcc-core-3.4.2-20040916-1.tar.gz;
-          md5 = "d9cd78f926fc31ef101c6fa7072fc65d";
-        };
-    };
-
-  /**
-   * GCC C++. Binary.
-   */
-  gccCpp =  {stdenv, fetchurl} :
-    stdenv.mkDerivation {
-      name = "mingw-gcc-g++-3.4.2-20040916-1";
-      builder = ./bin-builder.sh;
-      src = 
-        fetchurl {
-          url = mirror://sourceforge/mingw/gcc-g++-3.4.2-20040916-1.tar.gz;
-          md5 = "e5c7eb2c1e5f7e10842eac03d1d6fcdc";
+          url = ftp://ftp.strategoxt.org/pub/mingw/gcc-full-4.4.0-mingw32-bin-2.tar.gz;
+          sha256= "6c5a125591837817c940f4c66140cd7393b3f5837dd738c7ed315157e6270a60";
         };
     };
 
@@ -61,56 +47,56 @@ rec {
    */
   binutils =  {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "mingw-binutils-2.16.91-20060119-1";
+      name = "binutils-2.19.1-mingw32";
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = mirror://sourceforge/mingw/binutils-2.16.91-20060119-1.tar.gz;
-          md5 = "a54f33ca9d6cf56dc99c0c5367f58ea3";
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/files/GNU%20Binutils/Current%20Release_%20GNU%20binutils-2.19.1/binutils-2.19.1-mingw32-bin.tar.gz;
+          sha256 = "037vh2n9iv2vccvplk48vd3al91p7yhc73p5nkfsrb6sg977shj2";
         };
     };
 
   mingwRuntimeBin = {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "mingw-runtime-3.10";
+      name = "mingwrt-3.16";
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = mirror://sourceforge/mingw/mingw-runtime-3.10.tar.gz;
-          md5 = "7fa2638d23136fd84d5d627bef3b408a";
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/files/MinGW%20Runtime/mingwrt-3.16/mingwrt-3.16-mingw32-dev.tar.gz;
+          sha256 = "1xqpp7lvsj88grs6jlk0fnlkvis2y4avcqrpwsaxxrpjlg5bwzci";
         };
     };
 
   mingwRuntimeSrc = {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "mingw-runtime-3.10";
+      name = "mingwrt-3.16-mingw32";
       builder = ./src-builder.sh;
       src =
         fetchurl {
-          url = mirror://sourceforge/mingw/mingw-runtime-3.10-src.tar.gz;
-          md5 = "9225684e663eafa900b4075731c25f4c";
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/files/MinGW%20Runtime/mingwrt-3.16/mingwrt-3.16-mingw32-src.tar.gz;
+          sha256 = "0rljw3v94z9wzfa63b7lvyprms5l5jgf11lws8vm8z7x7q7h1k38";
         };
     };
 
   w32apiBin = {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "w32api-3.7";
+      name = "w32api-3.13-mingw32";
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
-          url = mirror://sourceforge/mingw/w32api-3.7.tar.gz;
-          md5 = "0b3a6d08136581c93b3a3207588acea9";
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/files/MinGW%20API%20for%20MS-Windows/Current%20Release_%20w32api-3.13/w32api-3.13-mingw32-dev.tar.gz;
+          sha256 = "19jm2hdym5ixi9b874xmmilixlpxvfdpi5y3bx0bs88fdah03gvx";
         };
     };
 
   w32apiSrc = {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "w32api-3.7";
+      name = "w32api-3.13-mingw32";
       builder = ./src-builder.sh;
       src = 
         fetchurl {
-          url = mirror://sourceforge/mingw/w32api-3.7-src.tar.gz;
-          md5 = "d799c407b4c1b480d0339994d01f355d";
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/files/MinGW%20API%20for%20MS-Windows/Current%20Release_%20w32api-3.13/w32api-3.13-mingw32-src.tar.gz;
+          sha256 = "1i1gpwilfc21s3yr4sx39i0w4g7lbij427wwxa34gjfgz0awdkh2";
         };
     };
 
@@ -154,4 +140,4 @@ rec {
   pkgs.bash
   pkgs.patch
   */
-}
\ No newline at end of file
+}
diff --git a/pkgs/stdenv/mingw/simple-stdenv/default.nix b/pkgs/stdenv/mingw/simple-stdenv/default.nix
index bf3610e7d2bc..379cda0a598b 100644
--- a/pkgs/stdenv/mingw/simple-stdenv/default.nix
+++ b/pkgs/stdenv/mingw/simple-stdenv/default.nix
@@ -19,7 +19,7 @@ let {
       mkDerivation = attrs:
         derivation ((removeAttrs attrs ["meta"]) // {
           builder = shell;
-          args = extraShellOptions ++ ["-e" attrs.builder];
+          args = extraShellOptions ++ ["-e" ] ++ [attrs.builder]; # (if attrs ? builder then [attrs.builder] else [ ../fix-builder.sh ../default-builder.sh] ) ;
           stdenv = body;
           system = body.system;
         }
diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/1.9x.nix
index f83afdcb55a6..5f24aae7b05e 100644
--- a/pkgs/tools/misc/grub/1.9x.nix
+++ b/pkgs/tools/misc/grub/1.9x.nix
@@ -7,11 +7,11 @@ let unifont_bdf = fetchurl {
 in
 
 stdenv.mkDerivation rec {
-  name = "grub-1.97";
+  name = "grub-1.97.1";
 
   src = fetchurl {
     url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
-    sha256 = "0wsnwrng8h3d3mkwyxpc9a4c5vrsjc6c7lxfxmrpqvdb4yb2wn4d";
+    sha256 = "1grpz4jphrhlmjr0ai4vi5rs1xknwfqgb376cq7hlwzblcblbw2i";
   };
 
   buildInputs = [ bison ncurses libusb freetype ];
diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix
index c54ec9f70281..3ec035c105e2 100644
--- a/pkgs/tools/text/xml/rxp/default.nix
+++ b/pkgs/tools/text/xml/rxp/default.nix
@@ -6,6 +6,8 @@ stdenv.mkDerivation {
     url = http://ftp.de.debian.org/debian/pool/main/r/rxp/rxp_1.2.3.orig.tar.gz;
     sha256 = "1r4khvmnl5231y37ji8f3mikxy0dhdz155wi3qihfi27mc1yv534";
   };
+  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
+
   installPhase = ''
     ensureDir $out/bin
     cp rxp $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f573042f09b..33a57b49bcb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2256,7 +2256,7 @@ let
   };
 
   strategoPackages018 = import ../development/compilers/strategoxt/0.18.nix {
-    inherit fetchurl stdenv pkgconfig aterm getopt jdk;
+    inherit fetchurl stdenv pkgconfig aterm getopt jdk makeStaticBinaries; 
   };
 
   metaBuildEnv = import ../development/compilers/meta-environment/meta-build-env {
@@ -2523,7 +2523,9 @@ let
     inherit fetchurl stdenv sqlite ruby ;
   };
 
-  scsh = import ../development/interpreters/scsh { inherit stdenv fetchurl; };
+  scsh = import ../development/interpreters/scsh {
+    inherit stdenv fetchurl;
+  };
 
   spidermonkey = import ../development/interpreters/spidermonkey {
     inherit fetchurl stdenv readline;
@@ -2903,6 +2905,11 @@ let
     inherit fetchurl stdenv;
   };
 
+  openafsClient = import ../servers/openafs-client {
+    inherit stdenv fetchurl autoconf automake flex yacc;
+    inherit kernel_2_6_28 glibc ncurses perl krb5;
+  };
+
   openocd = import ../development/tools/misc/openocd {
     inherit fetchurl stdenv libftdi;
   };
@@ -4973,6 +4980,10 @@ let
     sslSupport = true;
   };
 
+  sabnzbd = import ../servers/sabnzbd {
+    inherit fetchurl stdenv python cheetahTemplate makeWrapper par2cmdline unzip unrar;
+  };
+
   bind = builderDefsPackage (selectVersion ../servers/dns/bind "9.5.0") {
     inherit openssl libtool;
   };
@@ -5019,7 +5030,7 @@ let
   };
 
   jboss = import ../servers/http/jboss {
-    inherit fetchurl stdenv jdk5 jdk;
+    inherit fetchurl stdenv unzip jdk lib;
   };
 
   jboss_mysql_jdbc = import ../servers/http/jboss/jdbc/mysql {
@@ -5363,6 +5374,10 @@ let
     inherit fetchurl stdenv pkgconfig;
   };
 
+  hal_info_synaptics = import ../os-specific/linux/hal/synaptics.nix {
+    inherit stdenv;
+  };
+
   hdparm = import ../os-specific/linux/hdparm {
     inherit fetchurl stdenv;
   };
@@ -5798,6 +5813,11 @@ let
     inherit (glibc) kernelHeaders;
   };
 
+  kvm88 = import ../os-specific/linux/kvm/88.nix {
+    inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
+    inherit (glibc) kernelHeaders;
+  };
+
   libcap = import ../os-specific/linux/libcap {
     inherit fetchurl stdenv attr;
   };
@@ -7262,6 +7282,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  ledger = import ../applications/office/ledger {
+    inherit stdenv fetchurl emacs gmp pcre;
+  };
+
   links2 = (builderDefsPackage ../applications/networking/browsers/links2) {
     inherit fetchurl stdenv bzip2 zlib libjpeg libpng libtiff
       gpm openssl SDL SDL_image SDL_net pkgconfig;
@@ -7499,9 +7523,8 @@ let
     inherit fetchurl stdenv pkgconfig imagemagick boost python;
   };
 
-  qemu = import ../applications/virtualization/qemu/0.10.3.nix {
-    inherit fetchurl SDL zlib which;
-    stdenv = overrideGCC stdenv gcc34;
+  qemu = import ../applications/virtualization/qemu/0.11.0.nix {
+    inherit stdenv fetchurl SDL zlib which;
   };
 
   qemuSVN = import ../applications/virtualization/qemu/svn-6642.nix {
@@ -7643,7 +7666,7 @@ let
   # linux only by now
   synergy = import ../applications/misc/synergy {
     inherit fetchurl bleedingEdgeRepos stdenv x11;
-    inherit (xlibs) xextproto libXtst inputproto;
+    inherit (xlibs) xextproto libXtst inputproto libXi;
   };
 
   tahoelafs = import ../tools/networking/p2p/tahoe-lafs {
@@ -7879,8 +7902,7 @@ let
   };
 
   xchm = import ../applications/misc/xchm {
-    inherit fetchurl stdenv chmlib;
-    wxGTK = wxGTK26;
+    inherit fetchurl stdenv chmlib wxGTK;
   };
 
   /* Doesn't work yet
@@ -8270,10 +8292,11 @@ let
   };
 
   arb = import ../applications/science/biology/arb {
-    inherit fetchurl stdenv readline libpng zlib x11 lesstif93 freeglut perl;
+    inherit fetchurl readline libpng zlib x11 lesstif93 freeglut perl;
     inherit (xlibs) libXpm libXaw libX11 libXext libXt;
     inherit mesa glew libtiff lynx rxp sablotron jdk transfig gv gnuplot;
     lesstif = lesstif93;
+    stdenv = overrideGCC stdenv gcc42;
   };
 
   biolib = import ../development/libraries/science/biology/biolib {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 6776ca387d54..060f389e9e04 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -573,6 +573,14 @@ in {
     dryad = linux;
   };
 
+  strategoPackages018 = {
+    sdfStatic = all;
+    sdf = all;
+    strategoxt = all;
+    javafront = all;
+    dryad = linux;
+  };
+
   perlPackages = {
     TaskCatalystTutorial = linux;
   };