svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00 · 2012-02-25 19:57:34 +00:00 · ea195b2507
parent 38e3d7bc86 385f242a40
commit ea195b2507
55 changed files with 637 additions and 367 deletions
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@ -1,15 +1,15 @@
 {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
-, libjpeg, libpng, libtiff, libxml2, zlib, libtool
+, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
 , libX11}:

-let version = "1.3.11"; in
+let version = "1.3.13"; in

 stdenv.mkDerivation {
  name = "graphicsmagick-${version}";

  src = fetchurl {
-    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.bz2";
-    sha256 = "184grcvxa5w0ghiv8zf2vdva0kgp3njf20k3h6lbylspjgd3zhxg";
+    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
+    sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5";
  };

  configureFlags = "--enable-shared";
@ -19,6 +19,8 @@ stdenv.mkDerivation {
      zlib libtool
    ];

+  buildNativeInputs = [ xz ];
+
  postInstall = ''
    sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
  '';
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@ -0,0 +1,86 @@
+{ stdenv, fetchurl, makeDesktopItem
+, xlibs, gtkLibs, gnome
+, dbus, dbus_glib, fontconfig, gcc, patchelf
+}:
+
+# this package contains the daemon version of dropbox
+# it's unfortunately closed source
+#
+# note: the resulting program has to be invoced as
+# 'dropbox' because the internal python engine takes
+# uses the name of the program as starting point.
+#
+# todo: dropbox is shipped with some copies of libraries.
+# replace these libraries with the appropriate ones in
+# nixpkgs.
+
+# note: there is a i686 version available as well
+assert stdenv.system == "x86_64-linux";
+
+let
+
+  version = "1.2.52";
+  sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252";
+
+  # relative location where the dropbox libraries are stored
+  sharedir = "share/dropbox";
+
+  # Libraries referenced by dropbox binary.
+  # Be aware that future versions of the dropbox binary may refer
+  # to different versions than are currently in these packages.
+  ldpath = with xlibs; with gtkLibs; with gnome;
+    stdenv.lib.makeSearchPath "lib" [
+      libSM libX11 libXext libXcomposite libXcursor libXdamage
+      libXfixes libXi libXinerama libXrandr libXrender
+      atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf
+      gtk pango
+    ];
+
+  desktopItem = makeDesktopItem {
+    name = "dropbox";
+    exec = "dropbox";
+    comment = "Online directories";
+    desktopName = "Dropbox";
+    genericName = "Online storage";    
+    categories = "Application;Internet;";
+  };
+
+in stdenv.mkDerivation {
+  name = "dropbox-${version}-bin";
+  src = fetchurl {
+    name = "dropbox-${version}.tar.gz";
+    url = "http://www.dropbox.com/download?plat=lnx.x86_64";
+    inherit sha256;
+  };
+
+  sourceRoot = ".";
+
+  patchPhase = ''
+    rm -f .dropbox-dist/dropboxd
+  '';
+
+  installPhase = ''
+    ensureDir "$out/${sharedir}"
+    cp -r .dropbox-dist/* "$out/${sharedir}/"
+    ensureDir "$out/bin"
+    ln -s "$out/${sharedir}/dropbox" "$out/bin/dropbox"
+
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
+      "$out/${sharedir}/dropbox"
+
+    RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${sharedir}
+    echo "updating rpaths to: $RPATH"
+    find "$out/${sharedir}" -type f -a -perm +0100 \
+      -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
+
+    ensureDir "$out/share/applications"
+    cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  buildInputs = [ patchelf ];
+
+  meta = {
+    description = "Online stored folders (daemon version)";
+    homepage = http://www.dropbox.com;
+  };
+}
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@ -0,0 +1,48 @@
+{ stdenv, fetchurl, bison, flex, autoconf, automake, openssl }:
+
+let
+
+  version = "0.8.8";
+  sha256 = "7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7";
+
+  # fetches patches from a gentoo mirror
+  fetchPatch =
+    { file, sha256 }:
+    fetchurl {
+      url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/${file}";
+      inherit sha256;
+    };
+
+in stdenv.mkDerivation {
+  name = "bip-${version}";
+
+  # fetch sources from debian, because the creator's website provides
+  # the files only via https but with an untrusted certificate.
+  src = fetchurl {
+    url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz";
+    inherit sha256;
+  };
+
+  # includes an important security patch
+  patches = map fetchPatch [
+    { file = "bip-0.8.8-configure.patch";
+      sha256 = "286e169745e6cd768f0cb95bbc9589ca2bda497eb06461174549b80a459d901c";
+    }
+    { file = "bip-CVE-2012-0806.patch";
+      sha256 = "e47523095ee1d717c762ca0195520026c6ea2c30d8adcf434d276d42f052d506";
+    }
+    { file = "bip-freenode.patch";
+      sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f";
+    }
+  ];
+
+  configureFlags = [ "--disable-pie" ];
+
+  buildInputs = [ bison flex autoconf automake openssl ];
+
+  meta = {
+    description = "An IRC proxy (bouncer)";
+    homepage = http://bip.milkypond.org/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -8,7 +8,7 @@
 }:

 let
-  version = "1.7.8";
+  version = "1.7.9.2";
  svn = subversionClient.override { perlBindings = true; };
 in
 stdenv.mkDerivation {
@ -16,7 +16,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713";
+    sha256 = "bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75";
  };

  patches = [ ./docbook2texi.patch ];
--- a/pkgs/applications/virtualization/nova/client.nix
+++ b/pkgs/applications/virtualization/nova/client.nix
@ -1,12 +1,12 @@
 { fetchurl, pythonPackages }:

 pythonPackages.buildPythonPackage rec {
-  name = "novaclient-2.4.3";
+  name = "novaclient-2012.1";
  namePrefix = "";

  src = fetchurl {
    url = "http://pypi.python.org/packages/source/p/python-novaclient/python-${name}.tar.gz";
-    md5 = "c4be4adf371d1a84ce1581af365a53d0";
+    md5 = "8f53a308e08b2af4645281917be77ffc";
  };

  pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 ];
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -1,33 +1,37 @@
 { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
+, libXcursor, libXmu, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
 , python, which, alsaLib, curl, gawk
-, xorriso, makeself, perl, jdk
+, xorriso, makeself, perl, jdk, pkgconfig
 }:

-let version = "4.1.6"; in
+let version = "4.1.8"; in

 stdenv.mkDerivation {
  name = "virtualbox-${version}-${kernel.version}";

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "0zmbq0h9g4lamzmxqg281nr9pp88606dxh2dsw6vy1m86g5kfham";
+    sha256 = "1q04825ayynzgh8zl6y038lzxp3jk1a3dxpg6f52kk4vkirdc5pg";
  };

-  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ];
+  buildInputs =
+    [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
+      hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
+      pkgconfig which libXmu
+    ];

-  patchPhase = "
+  patchPhase = ''
    set -x
    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
-    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
-        -e 's@MKISOFS --version@MKISOFS -version@' \\
+    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
+        -e 's@MKISOFS --version@MKISOFS -version@' \
        -i configure
    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
    ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 
    find . -type f | xargs sed 's/depmod -a/true/' -i
    export USER=nix
    set +x
-  ";
+  '';

  configurePhase = ''
    ./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@ -54,7 +54,7 @@ stdenv.mkDerivation (

      eval "$preAutoconf"

-      if test -x ./bootstrap; then ./bootstrap
+      if test -x ./bootstrap && test -f ./bootstrap; then ./bootstrap
      elif test -x ./bootstrap.sh; then ./bootstrap.sh
      elif test -x ./autogen.sh; then ./autogen.sh
      elif test -x ./autogen ; then ./autogen
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  installPhase = ''
    for b in cgc cgfxcat cginfo
    do
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
+        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b"
    done
    # FIXME: cgfxcat and cginfo need more patchelf
    mkdir -p "$out/bin/"
@ -33,10 +33,9 @@ stdenv.mkDerivation rec {
    mkdir -p "$out/include/"
    cp -v -r include/Cg/ "$out/include/"
    mkdir -p "$out/lib/"
-    [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
-    [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
-    for mandir in man1 man3 \
-      ${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX
+    [ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
+    [ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/"
+    for mandir in man1 man3 manCg manCgFX
    do
        mkdir -p "$out/share/man/$mandir/"
        cp -v share/man/$mandir/* "$out/share/man/$mandir/"
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@ -11,10 +11,10 @@ let
    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
  sourceInfo = rec {
    baseName="angelscript";
-    version="2.20.2";
+    version="2.22.1";
    name="${baseName}-${version}";
    url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    hash="0s5d6av27dl6kxkzns011zwznj7r8zy5ypfhl6x9r1kzaqdkqz2a";
+    hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm";
  };
 in
 rec {
--- a/pkgs/development/libraries/boost/1.49.nix
+++ b/pkgs/development/libraries/boost/1.49.nix
@ -0,0 +1,91 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+, enableExceptions ? false
+}:
+
+let
+
+  variant = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableRelease "release" ++
+     stdenv.lib.optional enableDebug "debug");
+
+  threading = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableSingleThreaded "single" ++
+     stdenv.lib.optional enableMultiThreaded "multi");
+
+  link = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableShared "shared" ++
+     stdenv.lib.optional enableStatic "static");
+
+  # To avoid library name collisions
+  finalLayout = if ((enableRelease && enableDebug) ||
+    (enableSingleThreaded && enableMultiThreaded) ||
+    (enableShared && enableStatic)) then
+    "tagged" else "system";
+
+  cflags = if (enablePIC && enableExceptions) then
+             "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
+           else if (enablePIC) then
+             "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+           else if (enableExceptions) then
+             "cflags=-fexceptions"
+           else
+             "";
+in
+
+stdenv.mkDerivation {
+  name = "boost-1.49.0";
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2";
+    sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
+  };
+
+  # See <http://svn.boost.org/trac/boost/ticket/4688>.
+  patches = [ ./boost_filesystem_post_1_49_0.patch ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = [icu expat zlib bzip2 python];
+
+  configureScript = "./bootstrap.sh";
+  configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
+
+  buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+
+  installPhase = ":";
+
+  crossAttrs = rec {
+    buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu"
+    '';
+    buildPhase = ''
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+      ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+    '';
+  };
+}
--- a/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch
+++ b/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch
@ -0,0 +1,12 @@
+diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp
+--- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp	2011-01-11 22:39:33.000000000 +0100
+++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp	2012-02-25 20:00:33.628767485 +0100
+@@ -45,7 +45,7 @@
+   {
+ #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) 
+     // ISO C calls this "the locale-specific native environment":
+-    static std::locale lc("");
+    static std::locale lc;
+ #else  // Mac OS
+     // "All BSD system functions expect their string parameters to be in UTF-8 encoding
+     // and nothing else."
--- a/pkgs/development/libraries/caelum/default.nix
+++ b/pkgs/development/libraries/caelum/default.nix
@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }:
+
+stdenv.mkDerivation rec {
+  name = "caelum-0.6.1";
+
+  src = fetchurl {
+    url = "http://caelum.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303";
+  };
+
+  buildInputs = [ ois ogre boost ];
+  buildNativeInputs = [ cmake pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Add-on for the OGRE, aimed to render atmospheric effects";
+    homepage = http://code.google.com/p/caelum/;
+    license = "LGPLv2.1+";
+  };
+}
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "attoparsec-conduit";
-  version = "0.2.0";
-  sha256 = "11jcsqyqc33xn980rac7fmdgj99dg4bp75b5whqzpnr67ginjjv9";
+  version = "0.2.0.1";
+  sha256 = "1jxb2zanfmfqdmd5q770r4yz2s0giky9ify6fcsjwc8wiah4aji1";
  buildDepends = [ attoparsec conduit text transformers ];
  meta = {
    homepage = "http://github.com/snoyberg/conduit";
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "blaze-builder-conduit";
-  version = "0.2.0";
-  sha256 = "13fcxmzw4xz7y271vdf6w6fj6isninjcxnm7h7gbk4yf31wx831r";
+  version = "0.2.0.1";
+  sha256 = "0p6kq43avsf21biskjardv7k47bag16ki2gmwjpk8ram9mwlz0zg";
  buildDepends = [ blazeBuilder conduit text transformers ];
  meta = {
    homepage = "http://github.com/snoyberg/conduit";
--- a/pkgs/development/libraries/haskell/containers-deepseq/default.nix
+++ b/pkgs/development/libraries/haskell/containers-deepseq/default.nix
@ -1,17 +0,0 @@
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "containers-deepseq";
-  version = "0.1.0.1";
-  sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Provide orphan NFData instances for containers as needed. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix
+++ b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix
@ -1,18 +0,0 @@
-{ cabal, attempt, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "control-monad-attempt";
-  version = "0.3.0.1";
-  sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
-  buildDepends = [ attempt transformers ];
-  meta = {
-    homepage = "http://github.com/snoyberg/control-monad-attempt";
-    description = "Monad transformer for attempt. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix
+++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix
@ -1,24 +0,0 @@
-{ cabal, conduit, convertibleText, dataObject, failure, text
-, transformers, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "data-object-yaml";
-  version = "0.3.4.2";
-  sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    conduit convertibleText dataObject failure text transformers yaml
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/data-object-yaml";
-    description = "Serialize data to and from Yaml files (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
+++ b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
@ -1,23 +0,0 @@
-{ cabal, blazeBuilder, blazeBuilderEnumerator, enumerator
-, jsonTypes, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "json-enumerator";
-  version = "0.0.1.2";
-  sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d";
-  buildDepends = [
-    blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text
-    transformers
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/json-enumerator";
-    description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/data-object/default.nix
+++ b/pkgs/development/libraries/haskell/data-object/default.nix
@ -1,13 +1,12 @@
-{ cabal, failure, text, time }:
+{ cabal, transformers }:

 cabal.mkDerivation (self: {
-  pname = "data-object";
-  version = "0.3.1.9";
-  sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
-  buildDepends = [ failure text time ];
+  pname = "monads-tf";
+  version = "0.1.0.0";
+  sha256 = "1d38rddm9h8crs96zhzj87a3ygix0ipyxy0qcyas88k60fgavg5i";
+  buildDepends = [ transformers ];
  meta = {
-    homepage = "http://github.com/snoyberg/data-object/tree/master";
-    description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
+    description = "Monad classes, using type families";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
    maintainers = [
--- a/pkgs/development/libraries/haskell/neither/default.nix
+++ b/pkgs/development/libraries/haskell/neither/default.nix
@ -1,18 +0,0 @@
-{ cabal, failure, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "neither";
-  version = "0.3.1";
-  sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk";
-  buildDepends = [ failure transformers ];
-  meta = {
-    homepage = "http://github.com/snoyberg/neither";
-    description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "pandoc-types";
-  version = "1.9.0.2";
-  sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl";
+  version = "1.9.1";
+  sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i";
  buildDepends = [ syb ];
  meta = {
    homepage = "http://johnmacfarlane.net/pandoc";
--- a/pkgs/development/libraries/haskell/pool/default.nix
+++ b/pkgs/development/libraries/haskell/pool/default.nix
@ -1,18 +0,0 @@
-{ cabal, monadControl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pool";
-  version = "0.1.2.1";
-  sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c";
-  buildDepends = [ monadControl transformers ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Thread-safe resource pools. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "wai-app-static";
-  version = "1.1.1";
-  sha256 = "0i73rxgmng7grs8cgxw8769jg0cvpsb5gi4s0iwrdyh3xd1vj7iy";
+  version = "1.1.2";
+  sha256 = "1nvzqg3wk7i2p1kcpb9f9wdzbrfl6gxid44l94mmvc7xjcmdl6qw";
  buildDepends = [
    base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
    httpDate httpTypes text time transformers unixCompat wai
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@ -1,16 +1,16 @@
-{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, dataDefault, fastLogger, httpTypes, network, text, time
-, transformers, wai, zlibConduit
+{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit
+, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes
+, network, text, time, transformers, wai, zlibConduit
 }:

 cabal.mkDerivation (self: {
  pname = "wai-extra";
-  version = "1.1.0";
-  sha256 = "1mj2swb2bgsay9prpw6h0wmwsqyan53ndyczmhppdax4y5088f55";
+  version = "1.1.0.1";
+  sha256 = "0kavvbywkkwj9914y622wsziwfca9qjaqz798mjhl1ip5bfy73b0";
  buildDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit
-    dataDefault fastLogger httpTypes network text time transformers wai
-    zlibConduit
+    ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
+    conduit dataDefault fastLogger httpTypes network text time
+    transformers wai zlibConduit
  ];
  meta = {
    homepage = "http://github.com/yesodweb/wai";
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "wai";
-  version = "1.1.0";
-  sha256 = "1kmmivcak9v13rgivs2vhr543dfdx19wncwlpda453570ywam7vh";
+  version = "1.1.0.1";
+  sha256 = "0klyi3d4rivgvbasamxccvkz1w44ak0rcbx840ypdcjq8mbcb85f";
  buildDepends = [
    blazeBuilder conduit httpTypes network text transformers vault
  ];
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@ -1,15 +1,16 @@
-{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, httpTypes, liftedBase, network, simpleSendfile
-, transformers, unixCompat, wai
+{ cabal, blazeBuilder, blazeBuilderConduit, bytestringLexing
+, caseInsensitive, conduit, httpTypes, liftedBase, network
+, simpleSendfile, transformers, unixCompat, wai
 }:

 cabal.mkDerivation (self: {
  pname = "warp";
-  version = "1.1.0";
-  sha256 = "1an2j89422rcvrvrmhg1hwj8vpikjj5xdzb3h37rjsfj6qlqy5cf";
+  version = "1.1.0.1";
+  sha256 = "1bgjnnkqgcyj00jd4rgsnpmac0yfd1ydd6i61b252gyrr9dd0wm9";
  buildDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
-    liftedBase network simpleSendfile transformers unixCompat wai
+    blazeBuilder blazeBuilderConduit bytestringLexing caseInsensitive
+    conduit httpTypes liftedBase network simpleSendfile transformers
+    unixCompat wai
  ];
  meta = {
    homepage = "http://github.com/yesodweb/wai";
--- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
@ -1,20 +0,0 @@
-{ cabal, pathPieces, text }:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes-quasi";
-  version = "0.7.1.1";
-  sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ pathPieces text ];
-  meta = {
-    homepage = "http://docs.yesodweb.com/web-routes-quasi/";
-    description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@ -1,21 +0,0 @@
-{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes";
-  version = "0.27.1";
-  sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz";
-  buildDepends = [
-    blazeBuilder httpTypes mtl network parsec text utf8String
-  ];
-  meta = {
-    description = "Library for maintaining correctness and composability of URLs within an application";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix
@ -1,24 +0,0 @@
-{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, blazeBuilderEnumerator, dataDefault, enumerator, failure, text
-, transformers, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xml-enumerator";
-  version = "0.4.4.1";
-  sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj";
-  buildDepends = [
-    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
-    dataDefault enumerator failure text transformers xmlTypes
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/xml";
-    description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "zlib-conduit";
-  version = "0.2.0";
-  sha256 = "1vwan9vglj7xdna3pfw71bcfcp10s4vn6fd6wwdz7wvxrbn52gsk";
+  version = "0.2.0.1";
+  sha256 = "0css7cr9jj6rn829bw8mlbdl0d6iz9ckhsbrlrdcppx8k4gzb4rg";
  buildDepends = [ conduit transformers zlibBindings ];
  meta = {
    homepage = "http://github.com/snoyberg/conduit";
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ b/pkgs/development/libraries/mysocketw/default.nix
@ -0,0 +1,23 @@
+{stdenv, fetchurl, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "mysocketw-031026";
+  src = fetchurl {
+    url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz;
+    sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4";
+  };
+
+  patches = [ ./gcc.patch ];
+
+  configurePhase = ''
+    sed -i s,/usr/local,$out, Makefile.conf
+  '';
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
+    license = "LGPLv2.1+";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
--- a/pkgs/development/libraries/mysocketw/gcc.patch
+++ b/pkgs/development/libraries/mysocketw/gcc.patch
@ -0,0 +1,13 @@
+I picked it up from:
+http://www.rigsofrods.com/wiki/images/c/c0/Socketw.patch
+
+--- a/src/sw_base.cxx.old	2009-12-19 21:19:31.057051328 -0800
+++ b/src/sw_base.cxx	2009-12-19 21:19:44.939551918 -0800
+@@ -19,6 +19,7 @@
+ #include <time.h>
+ #include <stdio.h>
+ #include <string.h>
+#include <stdlib.h>
+ 
+ #ifndef __WIN32__
+   #include <netdb.h>
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ b/pkgs/development/libraries/ogrepaged/default.nix
@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }:
+
+stdenv.mkDerivation rec {
+  name = "ogre-paged-1.1.3";
+
+  src = fetchurl {
+    url = "http://ogre-paged.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1qqlkg17plk87dm3fsm34x8lkd5rxkhiz77ppcgc71a7z050vhjq";
+  };
+
+  buildInputs = [ ois ogre libX11 boost ];
+  buildNativeInputs = [ cmake pkgconfig ];
+
+  cmakeFlags = "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Paged Geometry for Ogre3D";
+    homepage = http://code.google.com/p/ogre-paged/;
+    license = "MIT";
+  };
+}
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@ -1,5 +1,11 @@
 {stdenv, fetchurl}:

+let
+  bindir = if stdenv.system == "i686-linux" then "bin.linuxx86"
+    else if stdenv.system == "x86_64-linux" then "bin.linux"
+    else throw "Unsupported platform by now";
+in
+
 stdenv.mkDerivation {
  name = "jam-2.5";
  src = fetchurl {
@ -9,7 +15,7 @@ stdenv.mkDerivation {

  installPhase = ''
    mkdir -p $out/bin
-    cp bin.linux/jam $out/bin
+    cp ${bindir}/jam $out/bin
  '';

  meta = {
--- a/pkgs/development/tools/parsing/frown/builder.sh
+++ b/pkgs/development/tools/parsing/frown/builder.sh
@ -1,7 +0,0 @@
-source $stdenv/setup
-
-makeFlags="-e PREFIX=\"$out\""
-
-mkdir -p $out/bin
-
-genericBuild
--- a/pkgs/development/tools/parsing/frown/default.nix
+++ b/pkgs/development/tools/parsing/frown/default.nix
@ -1,11 +0,0 @@
-{stdenv, fetchurl, ghc}:
-
-stdenv.mkDerivation {
-  name = "frown-0.6.1";
-  src = fetchurl {
-    url = http://www.informatik.uni-bonn.de/~ralf/frown/frown-0.6.1.tar.gz;
-    md5 = "b6fe9a8bf029c2a7c31b574be05816cf";
-  };
-  builder = ./builder.sh;
-  buildInputs = [ghc];
-}
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8 }:
+{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }:

 stdenv.mkDerivation rec {
  version = "0.6.10";
@ -17,11 +17,17 @@ stdenv.mkDerivation rec {
    "--shared-v8-libpath=${v8}/lib"
  ];

-  patchPhase = ''
+  patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
+
+  prePatch = ''
    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
  '';

-  buildInputs = [ python openssl v8 zlib];
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
+  '';
+
+  buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;

  meta = with stdenv.lib; {
    description = "Event-driven I/O framework for the V8 JavaScript engine";
--- a/pkgs/development/web/nodejs/no-arch-flag.patch
+++ b/pkgs/development/web/nodejs/no-arch-flag.patch
@ -0,0 +1,21 @@
+diff -Naur node-v0.6.10-orig/wscript node-v0.6.10/wscript
+--- node-v0.6.10-orig/wscript	2012-02-02 19:56:42.000000000 -0500
+++ node-v0.6.10/wscript	2012-02-25 14:18:50.000000000 -0500
+@@ -443,17 +443,6 @@
+   if sys.platform.startswith("darwin"):
+     # used by platform_darwin_*.cc
+     conf.env.append_value('LINKFLAGS', ['-framework','Carbon'])
+-    # cross compile for architecture specified by DEST_CPU
+-    if 'DEST_CPU' in conf.env:
+-      arch = conf.env['DEST_CPU']
+-      # map supported_archs to GCC names:
+-      arch_mappings = {'ia32': 'i386', 'x64': 'x86_64'}
+-      if arch in arch_mappings:
+-        arch = arch_mappings[arch]
+-      flags = ['-arch', arch]
+-      conf.env.append_value('CCFLAGS', flags)
+-      conf.env.append_value('CXXFLAGS', flags)
+-      conf.env.append_value('LINKFLAGS', flags)
+   if 'DEST_CPU' in conf.env:
+     arch = conf.env['DEST_CPU']
+     # TODO: -m32 is only available on 64 bit machines, so check host type
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@ -1,21 +1,15 @@
 { fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost, 
-  pkgconfig, libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
-  angelscript
+  pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
+  angelscript, caelum, ogrepaged, mysocketw, libxcb
  }:

 stdenv.mkDerivation rec {
-  /* version = "1780"; */
-  version = "0.37";
+  version = "0.39.4";
  name = "rigsofrods-${version}";

-  /* src = fetchsvn {
-    url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk;
-    rev = version;
-  }; */
-  
  src = fetchurl {
-    url = mirror://sourceforge/rigsofrods/rigsofrods/0.37-dev/RoR-0.37.126-Sources.zip;
-    sha256 = "03mxmxpfdlsri0j3nqgyj2pc4gpzs8zq8qgg6qhnyazi7j95j4mk";
+    url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2;
+    sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx";
  };

  contentPackSrc = fetchurl {
@ -26,45 +20,34 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  cmakeFlags = [
-    "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
    "-DROR_USE_CURL=TRUE"
    "-DROR_USE_MYGUI=TRUE"
-    # "-DROR_USE_OPNEAL=TRUE"
-    # "-DROR_USE_MOFILEREADER=TRUE"
-    # "-DROR_USE_CAELUM=TRUE"
-    # "-DROR_USE_PAGED=TRUE"
+    "-DROR_USE_OPNEAL=TRUE"
+    "-DROR_USE_CAELUM=TRUE"
+    "-DROR_USE_PAGED=TRUE"
    "-DROR_USE_ANGELSCRIPT=TRUE"
-    # "-DROR_USE_SOCKETW=TRUE"
+    "-DROR_USE_SOCKETW=TRUE"
+    "-DCMAKE_BUILD_TYPE=Release"
  ];

  installPhase = ''
-    sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../bin/plugins.cfg
-    sed -e "/CgProgramManager/d" -i ../bin/plugins.cfg
+    sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
    mkdir -p $out/share/rigsofrods
-    cp -r .. $out/share/rigsofrods/build-dir
+    cp -r ../bin/* $out/share/rigsofrods
+    cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
    mkdir -p $out/bin
-    for i in RoR rorconfig RoRViewer; do
-      echo '#! ${stdenv.shell}' >> "$out/bin/$i"
-      if [ "$i" = "rorconfig" ]; then
-        echo "[ -d \"\$HOME/.rigsofrods\" ] && cp -r '$out/share/rigsofrods/build-dirs/bin/skeleton' \"\$HOME/.rigsofrods\"" >> "$out/bin/$i"
-        echo "chmod u+w -R \"\$HOME/.rigsofrods\"" >> "$out/bin/$i"
-      fi
-      echo "\"$out/share/rigsofrods/build-dir/bin/$i\"" >> "$out/bin/$i"
-      chmod a+x "$out/bin/$i"
-    done
-    cd $out/share/rigsofrods/build-dir/bin/
+    ln -s $out/share/rigsofrods/{RoR,rorconfig} $out/bin
+    cd $out/share/rigsofrods
+    mkdir packs
+    cd packs
    unzip "${contentPackSrc}"
  '';

-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -langelscript -lgtk-x11-2.0"
-    sed -e 's@wxLOCALE_CONV_ENCODING@0@g' -i source/configurator/configurator.cpp
-  '';
-
-  # patches = [ ./wx.patch ];
+  patches = [ ./doubleslash.patch ./paths.patch ];

  buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
-    libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript ];
+    libuuid openal ogre ois curl gtk mygui unzip angelscript
+    caelum ogrepaged mysocketw libxcb ];

  meta = {
    description = "3D simulator game where you can drive, fly and sail various vehicles";
--- a/pkgs/games/rigsofrods/doubleslash.patch
+++ b/pkgs/games/rigsofrods/doubleslash.patch
@ -0,0 +1,13 @@
+diff --git a/CMakeDependenciesConfig.txt b/CMakeDependenciesConfig.txt
+index 447a440..e2562de 100644
+--- a/CMakeDependenciesConfig.txt
+++ b/CMakeDependenciesConfig.txt
+@@ -228,7 +228,7 @@ ELSEIF(UNIX)
+    # Paged Geometry
+    find_path(PAGED_INCLUDE_DIRS "PagedGeometry/PagedGeometry.h")
+    if(PAGED_INCLUDE_DIRS)
+-      set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};/${PAGED_INCLUDE_DIRS}/PagedGeometry")
+      set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};${PAGED_INCLUDE_DIRS}/PagedGeometry")
+       find_library(PAGED_LIBRARIES "PagedGeometry")
+       set(ROR_USE_PAGED ON)
+    else()
--- a/pkgs/games/rigsofrods/paths.patch
+++ b/pkgs/games/rigsofrods/paths.patch
@ -0,0 +1,12 @@
+diff --git a/source/main/framework/ContentManager.cpp b/source/main/framework/ContentManager.cpp
+index 0bfea8c..82cdab9 100644
+--- a/source/main/framework/ContentManager.cpp
+++ b/source/main/framework/ContentManager.cpp
+@@ -238,6 +238,7 @@ bool ContentManager::init(void)
+ #endif // USE_OPENAL
+ 
+ 	// and the content
+	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("Program Path")+"packs", "FileSystem", "Packs", true);
+ 	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"packs", "FileSystem", "Packs", true);
+ 	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"mods",  "FileSystem", "Packs", true);
+ 
--- a/pkgs/games/rigsofrods/wx.patch
+++ b/pkgs/games/rigsofrods/wx.patch
@ -1,13 +0,0 @@
-diff --git a/source/configurator/configurator.cpp b/source/configurator/configurator.cpp
-index c058820..5a4b316 100644
--- a/source/configurator/configurator.cpp
-+++ b/source/configurator/configurator.cpp
-@@ -2155,7 +2155,7 @@ void MyDialog::OnsightrangesliderScroll(wxScrollEvent &e)
- 	int v = sightRange->GetValue();
- 	if(v == sightRange->GetMax())
- 	{
-		s = "Unlimited";
-+		s = _("Unlimited");
- 	} else
- 	{
- 		s.Printf(wxT("%i m"), v);
--- a/pkgs/lib/debug.nix
+++ b/pkgs/lib/debug.nix
@ -42,7 +42,7 @@ rec {
      else if x == null then "x is null"
      else if isInt x then "x is an integer `${toString x}'"
      else if isString x then "x is a string `${substring 0 50 x}...'"
-      else "x is probably a path `${substring 0 50 (toString x)}'";
+      else "x is probably a path `${substring 0 50 (toString x)}...'";

  # trace the arguments passed to function and its result 
  # maybe rewrite these functions in a traceCallXml like style. Then one function is enough
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@ -10,16 +10,14 @@ stdenv.mkDerivation {
  };
  
  preBuild = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
    sed -e 's/break/true/' -i test_off.sh
    sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh
-    sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/$kernelVersion@" -i Makefile
+    sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.version}@" -i Makefile
  '';
 
  installPhase = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    mkdir -p $out/lib/modules/$kernelVersion/misc
-    cp acpi_call.ko $out/lib/modules/$kernelVersion/misc
+    mkdir -p $out/lib/modules/${kernel.version}/misc
+    cp acpi_call.ko $out/lib/modules/${kernel.version}/misc
    mkdir -p $out/bin
    cp test_off.sh $out/bin/test_discrete_video_off.sh
  '';
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@ -17,14 +17,13 @@ stdenv.mkDerivation {
  preBuild = ''
    kernelVersion=$(cd ${kernel}/lib/modules && ls)
    substituteInPlace Makefile \
-      --replace "\$(shell uname -r)" "$kernelVersion" \
+      --replace "\$(shell uname -r)" "${kernel.version}" \
      --replace "/lib/modules" "${kernel}/lib/modules"
  '';
 
  installPhase = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    ensureDir $out/lib/modules/$kernelVersion/misc
-    cp bbswitch.ko $out/lib/modules/$kernelVersion/misc
+    ensureDir $out/lib/modules/${kernel.version}/misc
+    cp bbswitch.ko $out/lib/modules/${kernel.version}/misc

    ensureDir $out/bin
    tee $out/bin/discrete_vga_poweroff << EOF
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@ -0,0 +1,33 @@
+{ stdenv, fetchgit }:
+
+# Shows the machine check exceptions logged by the kernel.
+# E.g. a log is generated when intel processors cpu-throttle.
+
+# The releases of this package are no longer on kernel.org
+# hence we fetch them from github. Apparently, these
+# are also more recent.
+
+let
+
+  rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2";
+  version = "1.0pre-${rev}"; 
+  sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7";
+
+in stdenv.mkDerivation {
+
+  name = "mcelog-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/andikleen/mcelog";
+    inherit sha256;
+    inherit rev;
+  };
+
+  makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc";
+
+  meta = {
+    description = "Tool to display logged machine check exceptions";
+    homepage = http://mcelog.org/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf";
  };

-  patches = [ ./smb-tmpdir.patch ];
+  patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];

  configureFlags = "--audio-drv-list=alsa";

--- a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch
+++ b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch
@ -0,0 +1,27 @@
+From http://patchwork.ozlabs.org/patch/137186/
+
+diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c
+--- qemu-kvm-0.15.1-orig/block/vdi.c	2011-10-19 15:54:48.000000000 +0200
+++ qemu-kvm-0.15.1/block/vdi.c	2012-02-25 18:15:36.114574574 +0100
+@@ -1,7 +1,7 @@
+ /*
+  * Block driver for the Virtual Disk Image (VDI) format
+  *
+- * Copyright (c) 2009 Stefan Weil
+ * Copyright (c) 2009, 2012 Stefan Weil
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -767,8 +767,12 @@
+             acb->header_modified = 1;
+         }
+         acb->bmap_last = block_index;
+        /* Copy data to be written to new block and zero unused parts. */
+        memset(block, 0, sector_in_block * SECTOR_SIZE);
+         memcpy(block + sector_in_block * SECTOR_SIZE,
+                acb->buf, n_sectors * SECTOR_SIZE);
+        memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0,
+               (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE);
+         acb->hd_iov.iov_base = (void *)block;
+         acb->hd_iov.iov_len = s->block_size;
+         qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1);
--- a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
+++ b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Executes a hook in case of a change to the
+# rfkill state. The hook can be passed as
+# environment variable, or present as executable
+# file.
+
+if [ -z "$RFKILL_STATE" ]; then
+  echo "rfkill-hook: error: RFKILL_STATE variable not set"
+  exit 1
+fi
+
+if [ -x /var/run/current-system/etc/rfkill.hook ]; then
+  exec /var/run/current-system/etc/rfkill.hook
+elif [ ! -z "$RFKILL_HOOK" ]; then
+  exec $RFKILL_HOOK
+else
+  echo "rfkill-hook: $RFKILL_STATE"
+fi
--- a/pkgs/os-specific/linux/rfkill/udev.nix
+++ b/pkgs/os-specific/linux/rfkill/udev.nix
@ -0,0 +1,49 @@
+{ stdenv }:
+
+# Provides a facility to hook into rfkill changes.
+#
+# Exemplary usage:
+#
+# Add this package to udev.packages, e.g.:
+#   udev.packages = [ pkgs.rfkill_udev ];
+#
+# Add a hook script in the managed etc directory, e.g.:
+#   etc = [
+#     { source = pkgs.writeScript "rtfkill.hook" ''
+#         #!/bin/sh
+#
+#         if [ "$RFKILL_STATE" -eq "1" ]; then
+#           exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on
+#         else
+#           exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-off
+#         fi
+#       '';
+#       target = "rfkill.hook";
+#     }
+
+# Note: this package does not need the binaries
+# in the rfkill package.
+
+stdenv.mkDerivation {
+  name = "rfkill-udev";
+
+  unpackPhase = "true";
+  dontBuild = true;
+
+  installPhase = ''
+    ensureDir "$out/etc/udev/rules.d/";
+    cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF
+      SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" 
+    EOF
+
+    ensureDir "$out/bin/";
+    cp ${./rfkill-hook.sh} "$out/bin/rfkill-hook.sh"
+    chmod +x "$out/bin/rfkill-hook.sh";
+  '';
+
+  meta = {
+    homepage = http://wireless.kernel.org/en/users/Documentation/rfkill;
+    description = "Rules+hook for udev to catch rfkill state changes";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libnatspec }:
+{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }:
+
+assert enableNLS -> libnatspec != null;

 stdenv.mkDerivation {
  name = "zip-3.0";
@ -12,9 +14,9 @@ stdenv.mkDerivation {

  installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";

-  patches = [ ./natspec-gentoo.patch.bz2 ];
+  patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else [];

-  buildInputs = [ libnatspec ];
+  buildInputs = if enableNLS then [ libnatspec ] else [];

  meta = {
    homepage = http://www.info-zip.org;
@ -22,4 +24,3 @@ stdenv.mkDerivation {
    maintainer = [ stdenv.lib.maintainers.urkud ];
  };
 }
-
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@ -5,8 +5,8 @@ stdenv.mkDerivation {

  src = fetchsvn {
    url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced;
-    rev = 1177;
-    sha256 = "d8893599fcb7839025e7fbe24120928b4bbcd70f0e1034a21d91885c40a5c39f";
+    rev = 1656;
+    sha256 = "0mbrvd8nc52yrg8wgxcvxsajxc9qrnjqhlcks6dpdzq7qmwjy6g9";
  };

  NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@ -28,17 +28,22 @@ stdenv.mkDerivation rec {
  '';

  postInstall = ''
-    for i in $out/{bin,sbin}/*
+    for i in "$out/{bin,sbin}/"*
    do
      wrapProgram $i --prefix PATH :  \
        "${nettools}/bin:${nettools}/sbin"
    done
+
+    mkdir -p $out/share/doc/vpnc
+    cp README nortel.txt ChangeLog $out/share/doc/vpnc/
  '';

  meta = {
-    description = ''VPNC, a virtual private network (VPN) client
-                    for Cisco's VPN concentrators'';
-    homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/;
+    homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/";
+    description = "virtual private network (VPN) client for Cisco's VPN concentrators";
    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -444,6 +444,8 @@ let

  syslogng = callPackage ../tools/system/syslog-ng { };

+  mcelog = callPackage ../os-specific/linux/mcelog { };
+
  asciidoc = callPackage ../tools/typesetting/asciidoc { };

  autossh = callPackage ../tools/networking/autossh { };
@ -3221,7 +3223,8 @@ let
  boost146 = callPackage ../development/libraries/boost/1.46.nix { };
  boost147 = callPackage ../development/libraries/boost/1.47.nix { };
  boost148 = callPackage ../development/libraries/boost/1.48.nix { };
-  boost = boost148;
+  boost149 = callPackage ../development/libraries/boost/1.49.nix { };
+  boost = boost149;

  # A Boost build with all library variants enabled.  Very large (about 250 MB).
  boostFull = appendToName "full" (boost.override {
@ -3237,6 +3240,8 @@ let

  buddy = callPackage ../development/libraries/buddy { };

+  caelum = callPackage ../development/libraries/caelum { };
+
  cairomm = callPackage ../development/libraries/cairomm { };

  scmccid = callPackage ../development/libraries/scmccid { };
@ -4335,6 +4340,8 @@ let

  myguiSvn = callPackage ../development/libraries/mygui/svn.nix {};

+  mysocketw = callPackage ../development/libraries/mysocketw { };
+
  ncurses = makeOverridable (import ../development/libraries/ncurses) {
    inherit fetchurl stdenv;
    unicode = system != "i686-cygwin";
@ -4380,6 +4387,8 @@ let

  ogre = callPackage ../development/libraries/ogre {};

+  ogrepaged = callPackage ../development/libraries/ogrepaged { };
+
  openal = callPackage ../development/libraries/openal { };

  # added because I hope that it has been easier to compile on x86 (for blender)
@ -5865,6 +5874,8 @@ let

  rfkill = callPackage ../os-specific/linux/rfkill { };

+  rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
+
  ralink_fw = callPackage ../os-specific/linux/firmware/ralink { };

  rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { };
@ -6853,6 +6864,8 @@ let

  irssi = callPackage ../applications/networking/irc/irssi { };

+  bip = callPackage ../applications/networking/irc/bip { };
+
  jackmeter = callPackage ../applications/audio/jackmeter { };

  jedit = callPackage ../applications/editors/jedit { };
@ -7079,12 +7092,15 @@ let
    inherit (gnome) GConf ORBit2;
    neon = neon029;
    libwpd = libwpd_08;
+    zip = zip.override { enableNLS = false; };
  };

  go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
    inherit (perlPackages) ArchiveZip CompressZlib;
    inherit (gnome) GConf ORBit2;
    neon = neon029;
+    libwpd = libwpd_08;
+    zip = zip.override { enableNLS = false; };
  };

  openscad = callPackage ../applications/graphics/openscad {};
@ -7241,6 +7257,8 @@ let
    usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug)
  };

+  dropbox = callPackage ../applications/networking/dropbox { };
+
  slim = callPackage ../applications/display-managers/slim { };

  sndBase = builderDefsPackage (import ../applications/audio/snd) {
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -547,10 +547,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};

-  containersDeepseq = callPackage ../development/libraries/haskell/containers-deepseq {};
-
-  controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {};
-
  convertible = callPackage ../development/libraries/haskell/convertible {
    time = self.time_1_1_3;
  };
@ -600,12 +596,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  dataenc = callPackage ../development/libraries/haskell/dataenc {};

-  dataObject = callPackage ../development/libraries/haskell/data-object {
-    failure = self.failure_0_1_2;
-  };
-
-  dataObjectYaml = callPackage ../development/libraries/haskell/data-object-yaml {};
-
  dataReify = callPackage ../development/libraries/haskell/data-reify {};

  datetime = callPackage ../development/libraries/haskell/datetime {};
@ -854,7 +844,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
  #hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {};
  #hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {};
  hledgerInterest = callPackage ../applications/office/hledger-interest {};
-  hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
+  #hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};

  HList = callPackage ../development/libraries/haskell/HList {};

@ -940,8 +930,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  json = callPackage ../development/libraries/haskell/json {};

-  jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {};
-
  jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};

  languageJavascript = callPackage ../development/libraries/haskell/language-javascript {
@ -1000,6 +988,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};

+  monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
+
  mongoDB = callPackage ../development/libraries/haskell/mongoDB {
    monadControl = self.monadControl_0_2_0_3;
  };
@ -1031,8 +1021,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};

-  neither = callPackage ../development/libraries/haskell/neither {};
-
  network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {};
  network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
  network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
@ -1107,8 +1095,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  polyparse = callPackage ../development/libraries/haskell/polyparse/default.nix {};

-  pool = callPackage ../development/libraries/haskell/pool {};
-
  poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};

  ppm = callPackage ../development/libraries/haskell/ppm {};
@ -1448,12 +1434,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
  };
  WebBitsHtml = self.WebBitsHtml_1_0_2;

-  webRoutes = callPackage ../development/libraries/haskell/web-routes {};
-
-  webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {
-    pathPieces = self.pathPieces_0_0_0;
-  };
-
  CouchDB = callPackage ../development/libraries/haskell/CouchDB {};

  wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {};
@ -1479,10 +1459,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {};

-  xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator {
-    failure = self.failure_0_1_2;
-  };
-
  xmlTypes = callPackage ../development/libraries/haskell/xml-types {};

  xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
@ -1576,10 +1552,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);

  Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {};

-  # 2012-02-09: Disabled because upstream site has disappeared. This tool is clearly
-  #             unmaintained, and we should delete it unless anyone complains.
-  # frown = callPackage ../development/tools/parsing/frown {};
-
  haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {};
  haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
  haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};