Merge branch 'master' into zfs

2012-10-11 13:16:41 -07:00
parent e23bda977d 168a5f6ec2
commit 8a911c889b
141 changed files with 1411 additions and 958 deletions
@@ -1,22 +1,25 @@
-{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH
-, libglade, lv2, pkgconfig }:
+{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
+, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }:

 stdenv.mkDerivation rec {
  name = "calf-${version}";
-  version = "0.0.18.6";
+  version = "0.0.19-rc7";

  src = fetchurl {
    url = "mirror://sourceforge/calf/${name}.tar.gz";
-    sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh";
+    sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j";
  };

-  buildInputs =
-    [ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ];
+  buildInputs = [ 
+    cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH
+    libglade lv2 pkgconfig
+  ];

  meta = with stdenv.lib; {
    homepage = http://calf.sourceforge.net;
    description = "A set of high quality open source audio plugins for musicians";
    license = licenses.lgpl2;
    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
  };
 }
@@ -0,0 +1,67 @@
+{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio
+, libxslt, lv2, pkgconfig, premake, xlibs }:
+
+let
+  rev = "7815b3545978e";
+in
+stdenv.mkDerivation rec {
+  name = "distrho-${rev}";
+
+  src = fetchgit {
+    url = "git://distrho.git.sf.net/gitroot/distrho/distrho";
+    inherit rev;
+    sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844";
+  };
+
+  patchPhase = ''
+    sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
+    sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
+    sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \
+      -i ports/hybridreverb2/source/SystemConfig.cpp
+    sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf
+  '';
+
+  buildInputs = [
+    alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake
+    xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
+    xlibs.libXinerama xlibs.libXrender
+  ];
+
+  buildPhase = ''
+    sh ./scripts/premake-update.sh linux
+    make standalone
+    make lv2
+
+    # generate lv2 ttl
+    sh scripts/generate-ttl.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/standalone/* $out/bin/
+    mkdir -p $out/lib/lv2
+    cp -a bin/lv2/* $out/lib/lv2/
+
+    # HybridReverb2 data
+    mkdir -p $out/etc/HybridReverb2
+    cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/
+    mkdir -p $out/share
+    cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://distrho.sourceforge.net;
+    description = "A collection of cross-platform audio effects and plugins";
+    longDescription = ''
+      Includes:
+      3BandEQ bitmangler drowaudio-distortion drowaudio-flanger
+      drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay
+      TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
+      Wolpertinger argotlunar capsaicin drowaudio-distortionshaper
+      drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan
+      TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex
+    '';
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
@@ -0,0 +1,41 @@
+{stdenv, fetchurl, jdk, unzip, which, makeWrapper, makeDesktopItem}:
+
+let
+  desktopItem = makeDesktopItem {
+    name = "netbeans";
+    exec = "netbeans";
+    comment = "Integrated Development Environment";
+    desktopName = "Netbeans IDE";
+    genericName = "Integrated Development Environment";
+    categories = "Application;Development;";
+  };
+in
+stdenv.mkDerivation {
+  name = "netbeans-7.2";
+  src = fetchurl {
+    url = http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-ml.zip;
+    sha256 = "18ya1w291hdnc35vb12yqnai82wmqm7351wn82fax12kzha5fmci";
+  };
+  buildCommand = ''
+    # Unpack and copy the stuff
+    unzip $src
+    mkdir -p $out
+    cp -a netbeans $out
+    
+    # Create a wrapper capable of starting it
+    mkdir -p $out/bin
+    makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
+      --prefix PATH : ${jdk}/bin:${which}/bin
+      
+    # Create desktop item, so we can pick it from the KDE/GNOME menu
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  meta = {
+    description = "An integrated development environment for Java, C, C++ and PHP";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}
@@ -3,17 +3,17 @@
 , libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
 , libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
-, openexr, pixman, pkgconfig, sqlite }:
+, openexr, pixman, pkgconfig, sqlite, bash }:

 assert stdenv ? glibc;

 stdenv.mkDerivation rec {
-  version = "1.0";
+  version = "1.0.5";
  name = "darktable-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
-    sha256 = "0wjv2x62kf25db61ivbn8y8xr9hr8hdlcjq6l1qxfqn2bn8a3qkm";
+    sha256 = "0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd";
  };

  buildInputs =
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
+
+    substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
  '';

  cmakeFlags = [
@@ -1,29 +1,22 @@
-{ stdenv, fetchurl, cmake, lua5 }:
+{stdenv, fetchurl, cmake}:

 stdenv.mkDerivation {
-  name = "task-warrior-2.0.0";
-
-  src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-2.0.0.tar.gz;
-    sha256 = "1gbmcynj2n2c9dcykxn27ffk034mvm0zri5hqhfdx593dhv1x5vq";
-  };
-
-  NIX_LDFLAGS = "-ldl";
-
-  buildNativeInputs = [ cmake ];
-  buildInputs = [ lua5 ];
-
-  crossAttrs = {
-    preConfigure = ''
-      export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
-    '';
-  };
+  name = "taskwarrior-2.1.2";

  enableParallelBuilding = true;

+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
+    sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
+  };
+
+  buildInputs = [ cmake ];
+
  meta = {
-    description = "Command-line todo list manager";
-    homepage = http://taskwarrior.org/;
-    license = "GPLv2+";
+    description = "GTD (getting things done) implementation";
+    homepage = http://taskwarrior.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
  };
 }
@@ -5,6 +5,7 @@
 , libevent, expat, libjpeg
 , libpng, libxml2, libxslt
 , xdg_utils, yasm, zlib
+, libusb1, libexif

 , python, perl, pkgconfig
 , nspr, udev, krb5
@@ -55,21 +56,23 @@ let
    use_system_flac = true;
    use_system_libevent = true;
    use_system_libexpat = true;
+    use_system_libexif = true;
    use_system_libjpeg = true;
    use_system_libpng = true;
+    use_system_libusb = true;
    use_system_libxml = true;
    use_system_speex = true;
    use_system_ssl = cfg.openssl;
    use_system_stlport = true;
    use_system_xdg_utils = true;
    use_system_yasm = true;
-    use_system_zlib = true;
+    use_system_zlib = false; # http://crbug.com/143623

    use_system_harfbuzz = false;
    use_system_icu = false;
-    use_system_libwebp = false; # See chromium issue #133161
+    use_system_libwebp = false; # http://crbug.com/133161
    use_system_skia = false;
-    use_system_sqlite = false; # See chromium issue #22208
+    use_system_sqlite = false; # http://crbug.com/22208
    use_system_v8 = false;
  };

@@ -78,23 +81,20 @@ let
    libevent expat libjpeg
    libpng libxml2 libxslt
    xdg_utils yasm zlib
+    libusb1 libexif
  ];

-  seccompPatch = let
-    pre22 = versionOlder sourceInfo.version "22.0.0.0";
-  in if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch;
+  maybeSeccompPatch = let
+    pre23 = versionOlder sourceInfo.version "23.0.0.0";
+  in optional pre23 ./enable_seccomp.patch;

-  # XXX: this reverts r151720 to prevent http://crbug.com/143623
-  maybeRevertZlibChanges = let
-    below22_91 = versionOlder sourceInfo.version "22.0.1229.91";
+  maybeBpfTemporaryFix = let
    patch = fetchurl {
-      name = "revert-r151720";
-      url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;"
-          + "hp=4419ec6414b33b6b19bb2e380b4998ed5193ecab;"
-          + "h=0fabb4fda7059a8757422e8a44e70deeab28e698";
-      sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf";
+      url = "https://chromiumcodereview.appspot.com/download/issue11073003_6001_7001.diff";
+      sha256 = "bf61871cdaa8fea27ce15482a17048f67b426a55813c3832f9bd39ec47a9eb06";
    };
-  in optional (below22_91) patch;
+    needPatch = !versionOlder sourceInfo.version "23.0.1271.0";
+  in optional needPatch patch;

 in stdenv.mkDerivation rec {
  name = "${packageName}-${version}";
@@ -127,10 +127,10 @@ in stdenv.mkDerivation rec {

  prePatch = "patchShebangs .";

-  patches = optional (!cfg.selinux) seccompPatch
-         ++ optional cfg.cups ./cups_allow_deprecated.patch
+  patches = optional cfg.cups ./cups_allow_deprecated.patch
         ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch
-         ++ maybeRevertZlibChanges;
+         ++ maybeSeccompPatch
+         ++ maybeBpfTemporaryFix;

  postPatch = optionalString cfg.openssl ''
    cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
@@ -1,12 +1,12 @@
-diff --git a/content/common/seccomp_sandbox.h b/content/common/seccomp_sandbox.h
-index a07d6f3..a622a35 100644
--- a/content/common/seccomp_sandbox.h
-+++ b/content/common/seccomp_sandbox.h
-@@ -29,15 +29,9 @@ static bool SeccompSandboxEnabled() {
-   // TODO(evan): turn on for release too once we've flushed out all the bugs,
-   // allowing us to delete this file entirely and just rely on the "disabled"
-   // switch.
-#ifdef NDEBUG
+diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc
+index d4618e5..108f846 100644
+--- a/content/common/sandbox_linux.cc
+++ b/content/common/sandbox_linux.cc
+@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) {
+ // Implement the command line enabling logic for seccomp-legacy.
+ bool IsSeccompLegacyDesired() {
+ #if defined(SECCOMP_SANDBOX)
+-#if defined(NDEBUG)
 -  // Off by default; allow turning on with a switch.
 -  return CommandLine::ForCurrentProcess()->HasSwitch(
 -      switches::kEnableSeccompSandbox);
@@ -15,6 +15,6 @@ index a07d6f3..a622a35 100644
   return !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableSeccompSandbox);
 -#endif  // NDEBUG
- }
 #endif  // SECCOMP_SANDBOX
- 
+   return false;
+ }
@@ -1,20 +0,0 @@
-diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc
-index d4618e5..108f846 100644
--- a/content/common/sandbox_linux.cc
-+++ b/content/common/sandbox_linux.cc
-@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) {
- // Implement the command line enabling logic for seccomp-legacy.
- bool IsSeccompLegacyDesired() {
- #if defined(SECCOMP_SANDBOX)
-#if defined(NDEBUG)
-  // Off by default; allow turning on with a switch.
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableSeccompSandbox);
-#else
-   // On by default; allow turning off with a switch.
-   return !CommandLine::ForCurrentProcess()->HasSwitch(
-       switches::kDisableSeccompSandbox);
-#endif  // NDEBUG
- #endif  // SECCOMP_SANDBOX
-   return false;
- }
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
  dev = {
-    version = "23.0.1271.10";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.10.tar.bz2";
-    sha256 = "1jm9fhnq978lfn21xripf7l2n362axinggnxlz7rcc9as1y086y3";
+    version = "24.0.1284.2";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1284.2.tar.bz2";
+    sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx";
  };
  beta = {
-    version = "22.0.1229.91";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.91.tar.bz2";
-    sha256 = "1b47rb5hw0k2fwc4jvmjpmxbhmqxgkz66j3mrjy4f8im41hmndyw";
+    version = "23.0.1271.26";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.26.tar.bz2";
+    sha256 = "1iimpmm5lm5rvak49320lmmvwqr8xv4znp4h1pf65jzzx0apbgkh";
  };
  stable = {
-    version = "22.0.1229.79";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.79.tar.bz2";
-    sha256 = "0f7py2hd7fnx5z0xrg2vwf675xbg9xvamx79jjyzbpljh32b3jh6";
+    version = "22.0.1229.94";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.94.tar.bz2";
+    sha256 = "1bqwlgmn0dm1xvd6v52zf9gjmykgq4fnw7rancbplfpl3rl7xbx0";
  };
 }
@@ -0,0 +1,180 @@
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
+
+, # If you want the resulting program to call itself "Firefox" instead
+  # of "Shiretoko" or whatever, enable this option.  However, those
+  # binaries may not be distributed without permission from the
+  # Mozilla Foundation, see
+  # http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+}:
+
+assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
+
+rec {
+
+  firefoxVersion = "16.0";
+
+  xulVersion = "16.0"; # this attribute is used by other packages
+
+
+  src = fetchurl {
+    url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha1 = "8f79e4ccf28c57afd341b9fc258931b5f9e62064";
+  };
+
+  commonConfigureFlags =
+    [ "--enable-optimize"
+      "--enable-profiling"
+      "--disable-debug"
+      "--enable-strip"
+      "--with-system-jpeg"
+      "--with-system-zlib"
+      "--with-system-bz2"
+      "--with-system-nspr"
+      "--with-system-nss"
+      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+      # "--enable-system-cairo" # disabled for the moment because our Cairo is too old
+      "--enable-system-sqlite"
+      "--disable-crashreporter"
+      "--disable-tests"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
+      "--disable-installer"
+      "--disable-updater"
+    ];
+
+
+  xulrunner = stdenv.mkDerivation rec {
+    name = "xulrunner-${xulVersion}";
+
+    inherit src;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+        python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+        xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+        alsaLib nspr nss libnotify xlibs.pixman yasm mesa
+        xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
+        xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
+      ];
+
+    configureFlags =
+      [ "--enable-application=xulrunner"
+        "--disable-javaxpcom"
+      ] ++ commonConfigureFlags;
+
+    enableParallelBuilding = true;
+
+    preConfigure =
+      ''
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
+
+        mkdir ../objdir
+        cd ../objdir
+        configureScript=../mozilla-release/configure
+      ''; # */
+
+    #installFlags = "SKIP_GRE_REGISTRATION=1";
+
+    postInstall = ''
+      # Fix run-mozilla.sh search
+      libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
+      echo libDir: $libDir
+      test -n "$libDir"
+      cd $out/bin
+      rm xulrunner
+
+      for i in $out/lib/$libDir/*; do
+          file $i;
+          if file $i | grep executable &>/dev/null; then
+              echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
+              chmod a+x "$out/bin/$(basename "$i")";
+          fi;
+      done
+      for i in $out/lib/$libDir/*.so; do
+          patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
+      done
+      for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
+          wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
+      done
+      rm -f $out/bin/run-mozilla.sh
+    ''; # */
+
+    meta = {
+      description = "Mozilla Firefox XUL runner";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+    };
+
+    passthru = { inherit gtk; version = xulVersion; };
+  };
+
+
+  firefox = stdenv.mkDerivation rec {
+    name = "firefox-${firefoxVersion}";
+
+    inherit src;
+
+    enableParallelBuilding = true;
+
+    buildInputs =
+      [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
+        dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
+        xlibs.pixman yasm mesa sqlite file unzip pysqlite
+      ];
+
+    propagatedBuildInputs = [xulrunner];
+
+    configureFlags =
+      [ "--enable-application=browser"
+        "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
+        "--enable-chrome-format=jar"
+        "--disable-elf-hack"
+      ]
+      ++ commonConfigureFlags
+      ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
+
+    makeFlags = [
+      "SYSTEM_LIBXUL=1"
+    ];
+
+    # Hack to work around make's idea of -lbz2 dependency
+    preConfigure =
+      ''
+        find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
+          stdenv.lib.concatStringsSep ":"
+            (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
+        }' ';'
+      '';
+
+    postInstall =
+      ''
+        ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
+        for j in $out/bin/*; do
+            i="$(readlink "$j")";
+            file $i;
+            if file $i | grep executable &>/dev/null; then
+                rm "$out/bin/$(basename "$i")"
+                echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
+                chmod a+x "$out/bin/$(basename "$i")"
+            fi;
+        done;
+        cd "$out/lib/"firefox-*
+        rm firefox
+        echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
+        chmod a+x firefox
+      ''; # */
+
+    meta = {
+      description = "Mozilla Firefox - the browser, reloaded";
+      homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
+    };
+
+    passthru = {
+      inherit gtk xulrunner nspr;
+      isFirefox3Like = true;
+    };
+  };
+}
@@ -13,18 +13,18 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "opera-12.00-1467";
+  name = "opera-12.02-1578";

  src =
    if stdenv.system == "i686-linux" then
      fetchurl {
-        url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz";
-        sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc";
+        url = "${mirror}/linux/1202/${name}.i386.linux.tar.xz";
+        sha256 = "60ccef14673818a8690fe3b76f861d180e2d8d3b87513b1652e6117c6dff3e86";
      }
    else if stdenv.system == "x86_64-linux" then
      fetchurl {
-        url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz";
-        sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051";
+        url = "${mirror}/linux/1202/${name}.x86_64.linux.tar.xz";
+        sha256 = "e861f14b984898b5a2c0d04915e515a5677152dc302b614a3ac1bb13da7a9b81";
      }
    else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";

@@ -2,6 +2,7 @@
 , libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
 , libnotify, cairo, pixman, fontconfig
 , libjpeg
+, pythonPackages

 , # If you want the resulting program to call itself "Thunderbird"
  # instead of "Shredder", enable this option.  However, those
@@ -9,47 +10,26 @@
  # Mozilla Foundation, see
  # http://www.mozilla.org/foundation/trademarks/.
  enableOfficialBranding ? false
-
 }:

-let version = "11.0.1";
-
-    # This patch may become necessary when we use a more recent version of libpng
-    # for now, it's actually not needed
-    # pngPatch = fetchurl {
-    #   url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch;
-    #   sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d";
-    # };
-in
+let version = "15.0.1"; in

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

  src = fetchurl {
-    url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/11.0.1/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "037344b451b1c031472d92f96d401b15d8e3e7d3";
+    url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
+    sha1 = "688bed2b48abda000b489f3c84de0ba9f93818f0";
  };

  enableParallelBuilding = true;

  buildInputs =
    [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
-      libnotify cairo pixman fontconfig yasm mesa /* nss */
-      libjpeg
+      libnotify cairo pixman fontconfig yasm mesa nss
+      libjpeg pythonPackages.sqlite3
    ];

-  # fix some paths in pngPatch
-  # prePatch = ''
-  #   substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/"
-  #   '';
-
-  patches = [
-    # "png.patch" # produced by postUnpack
-
-    # Fix weird dependencies such as a so file which depends on "-lpthread".
-    # ./thunderbird-build-deps.patch
-  ];
-
  configureFlags =
    [ "--enable-application=mail"
      "--enable-optimize"
@@ -58,11 +38,13 @@ stdenv.mkDerivation {
      "--enable-strip"
      "--with-pthreads"
      "--with-system-jpeg"
-      # "--with-system-png"  # png 1.5.x not merged in nixpkgs yet
+      #"--with-system-png"
      "--with-system-zlib"
      "--with-system-bz2"
      "--with-system-nspr"
-      "--enable-system-cairo"
+      "--with-system-nss"
+      # Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975
+      #"--enable-system-cairo"
      "--disable-crashreporter"
      "--disable-necko-wifi"
      "--disable-webm"
@@ -84,10 +66,7 @@ stdenv.mkDerivation {

  postInstall =
    ''
-      # Fix some references to /bin paths in the Xulrunner shell script.
-      substituteInPlace $out/lib/thunderbird-*/thunderbird \
-          --replace /bin/pwd "$(type -tP pwd)" \
-          --replace /bin/ls "$(type -tP ls)"
+      rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl

      # Create a desktop item.
      mkdir -p $out/share/applications
@@ -109,7 +88,7 @@ stdenv.mkDerivation {
      # Official branding implies thunderbird name and logo cannot be reuse,
      # see http://www.mozilla.org/foundation/licensing.html
      if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
-    maintainers = with maintainers; [ pierron ];
-    platforms = with platforms; linux;
+    maintainers = maintainers.pierron;
+    platforms = platforms.linux;
  };
 }
@@ -1,24 +1,16 @@
-{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_0 }:
+{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_1, automake, autoconf }:

-let
-  name = "gravit-0.4.2";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "gravit-0.5.0";

  src = fetchurl {
-    url = "http://gravit.slowchop.com/dist/${name}.tar.gz";
-    sha256 = "f37f3ac256a4acbf575f709addaae8cb01eda4f85537affa28c45f2df6fddb07";
+    url = "http://gravit.slowchop.com/media/downloads/${name}.tgz";
+    sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp";
  };

-  buildInputs = [mesa SDL SDL_ttf SDL_image lua5_0];
+  buildInputs = [mesa SDL SDL_ttf SDL_image lua5_1 automake autoconf];

-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
-
-  postInstall = ''
-    mv $out/etc/gravit $out/share/gravit/sample-config
-    rmdir $out/etc
-  '';
+  preConfigure = "sh autogen.sh";

  meta = {
    homepage = "http://gravit.slowchop.com";
@@ -14,8 +14,8 @@ edk2 = stdenv.mkDerivation {
  
  src = fetchsvn {
    url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
-    rev = "13094";
-    sha256 = "1qfpal0y4sas204ydg3pg3634dm25q1vr94mpgmbdh6yqcviah3h";
+    rev = "13783";
+    sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil";
  };

  buildInputs = [ libuuid pythonFull ];
@@ -7,11 +7,11 @@ let
 in

 stdenv.mkDerivation {
-  name = "go-1.0.2";
+  name = "go-1.0.3";

  src = fetchurl {
-    url = http://go.googlecode.com/files/go1.0.2.src.tar.gz;
-    sha256 = "1a4mpkb3bd9dwp0r3fgrfcyk5lgw0f0cfrbskg2lrhc7a12zpz3h";
+    url = http://go.googlecode.com/files/go1.0.3.src.tar.gz;
+    sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz";
  };

  buildInputs = [ bison glibc bash makeWrapper ];
@@ -1,141 +1,37 @@
-args: with args;
+{ stdenv, fetchsvn, ocaml, zlib, neko }:

-let
+stdenv.mkDerivation {
+  name = "haxe-2.10";

-    src_haxe_swflib = {
-      # REGION AUTO UPDATE:                                { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_swflib-F_10-43-46.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_10-43-46.tar.gz"; sha256 = "a63de75e48bf500ef0e8ef715d178d32f0ef113ded8c21bbca698a8cc70e7b58"; });
-      # END
-    }.src;
+  buildInputs = [ocaml zlib neko];

-    src_haxe_extc = { 
-      # REGION AUTO UPDATE:                                { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_extc-F_10-43-47.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_10-43-47.tar.gz"; sha256 = "d0a9980527d62ac6cfe27925ddb0964d334ec382f813fdfb8bd6c59fbbede730"; });
-      # END
-    }.src;
-
-    src_haxe_extlib_dev = { 
-      # REGION AUTO UPDATE:                                { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_extlib_dev-F_10-43-48.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_10-43-48.tar.gz"; sha256 = "6b9037230e2615dd5e22f4e7f4165c84f2816bc526957683afc945394fcdf67e"; });
-      # END
-    }.src;
-
-    src_haxe_xml_light = { 
-      # REGION AUTO UPDATE:                                { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_xml_light-F_10-43-48.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_10-43-48.tar.gz"; sha256 = "be29d9e22ad0dbcb3d447cbbc14907aff5f89bb562b8db369659d299f3a5b44f"; });
-      # END
-    }.src;
-
-    src_haxe_neko_include = { 
-      # REGION AUTO UPDATE:                                { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe_neko_include-F_10-43-49.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_10-43-49.tar.gz"; sha256 = "e49efc1b348fa6e0f6fb40079a2d380b947d9ebda31843bc293f3cc77f8453db"; });
-      # END
-    }.src;
-
-    src_haxe = {
-      # REGION AUTO UPDATE:       { name="haxe-read-only"; type="svn"; url="http://haxe.googlecode.com/svn/trunk"; groups = "haxe_group"; }
-      src = sourceFromHead "haxe-read-only-3220.tar.gz"
-                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-read-only-3220.tar.gz"; sha256 = "2b6702dca95d0829e539cea07b8224e3848e584a425ce8f8e0984a7a2bf7b1f8"; });
-      # END
-    }.src;
-
-
-    # the HaXe compiler
-    haxe = stdenv.mkDerivation {
-      name = "haxe-cvs";
-
-      buildInputs = [ocaml zlib makeWrapper];
-
-      src = src_haxe;
-
-      inherit zlib;
-
-      buildPhase = ''
-        set -x
-        mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs
-
-        # strange setup. install.ml seems to co the same repo again into haxe directory!
-        mkdir haxe
-        tar xfz $src --strip-components=1 -C haxe
-
-        t(){ tar xfz $1 -C $2 --strip-components=2; }
-        t ${src_haxe_swflib} ocaml/swflib
-        t ${src_haxe_extc} ocaml/extc
-        t ${src_haxe_extlib_dev} ocaml/extlib-dev
-        t ${src_haxe_xml_light} ocaml/xml-light
-        t ${src_haxe_neko_include} neko/libs
-
-        sed -e '/download();/d' \
-            -e "s@/usr/lib/@''${zlib}/lib/@g" \
-            doc/install.ml > install.ml
-        
-        ocaml install.ml
-      '';
-
-      # probably rpath should be set properly
-      installPhase = ''
-        mkdir -p $out/lib/haxe
-        cp -r bin $out/bin
-        wrapProgram "$out/bin/haxe" \
-          --set "LD_LIBRARY_PATH" $zlib/lib \
-          --set HAXE_LIBRARY_PATH "''${HAXE_LIBRARY_PATH}''${HAXE_LIBRARY_PATH:-:}:$out/lib/haxe/std:."
-        cp -r std $out/lib/haxe/
-      '';
-
-      meta = { 
-        description = "programming language targeting JavaScript, Flash, NekVM, PHP, C++";
-        homepage = http://haxe.org;
-        license = ["GPLv2" "BSD2" /*?*/ ];  # -> docs/license.txt
-        maintainers = [args.lib.maintainers.marcweber];
-        platforms = args.lib.platforms.linux;
-      };
-    };
-
-    # build a tool found in std/tools/${name} source directory
-    # the .hxml files contain a recipe  to cerate a binary.
-    tool = { name, description }: stdenv.mkDerivation {
-
-        inherit name;
-
-        src = src_haxe;
-
-        buildPhase = ''
-          cd std/tools/${name};
-          haxe *.hxml
-          mkdir -p $out/bin
-          mv ${name} $out/bin/
-        '';
-
-        buildInputs = [haxe neko];
-
-        dontStrip=1;
-
-        installPhase=":";
-
-        meta = {
-          inherit description;
-          homepage = http://haxe.org;
-          # license = "?"; TODO
-          maintainers = [args.lib.maintainers.marcweber];
-          platforms = args.lib.platforms.linux;
-        };
-
-      };
-
-in
-
-{
-
-  inherit haxe;
-
-  haxelib = tool {
-    name = "haxelib";
-    description = "haxelib is a HaXe library management tool similar to easyinstall or ruby gems";
+  src = fetchsvn {
+    url = "http://haxe.googlecode.com/svn/tags/v2-10";
+    sha256 = "dbd3c655e4136eb68a165ef83b96bfc1f0f2eb9ec8729603b19bcd717a61a679";
  };

+  prePatch = ''
+    sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
+  '';
+
+  postBuild = ''
+    find std/tools -name '*.n' -delete
+    rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib
+  '';
+
+  installPhase = ''
+    install -vd "$out/bin" "$out/lib/haxe/std"
+    install -vt "$out/bin" haxe haxelib haxedoc
+    cp -vr std "$out/lib/haxe"
+  '';
+
+  dontStrip = true;
+
+  meta = {
+    description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
+    homepage = http://haxe.org;
+    license = ["GPLv2" "BSD2" /*?*/ ];  # -> docs/license.txt
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "idris";
-  version = "0.9.3.1";
-  sha256 = "1dqb7gd5jn5f062hfwrirrfxv6ac1f6khkfax912j01mg147hv9a";
+  version = "0.9.4.1";
+  sha256 = "1f1jrgnclr0443rbhfcnm0vvbb2jcliskqm6vq1c0xgywab7bjhx";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
@@ -0,0 +1,29 @@
+{ 
+  stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl,
+  regexCompat, HsSyck, random
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "jhc-${version}";
+
+  version = "0.8.0";
+
+  src = fetchurl {
+    url = "http://repetae.net/dist/${name}.tar.gz";
+    sha256 = "0rbv0gpp7glhd9xqy7snbiaiizwnsfg9vzhvyywcvbmb35yivy2a";
+  };
+
+  buildInputs = [
+    perl ghc binary zlib utf8String readline fgl regexCompat HsSyck random
+  ];
+
+  meta = {
+    description = ''
+      A Haskell compiler which aims to produce the most efficient programs
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.aforemny ];
+  };
+
+}
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, perl, groff, cmake, python }:
-
-let version = "3.1"; in
-
-stdenv.mkDerivation {
-  name = "llvm-${version}";
-
-  src = fetchurl {
-    url    = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
-    sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
-  };
-
-  buildInputs = [ perl groff cmake python ];
-
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://llvm.org/;
-    description = "Collection of modular and reusable compiler and toolchain technologies";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
-    platforms = with stdenv.lib.platforms; all;
-  };
-}
-
@@ -1,49 +1,21 @@
-diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp	2011-11-17 02:40:32.000000000 -0500
-+++ clang-3.0.src/lib/Driver/ToolChains.cpp	2011-12-19 06:29:27.562428830 -0500
-@@ -1926,14 +1926,17 @@
+diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
+--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp	2012-05-11 20:16:02.000000000 -0400
+++ clang-3.1.src/lib/Driver/ToolChains.cpp	2012-10-08 01:13:01.044083509 -0400
+@@ -2146,9 +2146,6 @@
   if (DriverArgs.hasArg(options::OPT_nostdinc))
     return;
 
-+#if 0
-   if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
-     addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
- 
-+#endif
+-  if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+-    addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
+-
   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
     llvm::sys::Path P(D.ResourceDir);
     P.appendComponent("include");
-     addSystemInclude(DriverArgs, CC1Args, P.str());
-   }
-+#if 0
- 
-   if (DriverArgs.hasArg(options::OPT_nostdlibinc))
-     return;
-@@ -1998,6 +2001,8 @@
+@@ -2264,6 +2261,7 @@
     return;
 
-   addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
-+#endif
-+  addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + C_INCLUDE_PATH);
- }
- 
- static bool addLibStdCXXIncludePaths(Twine Base, Twine TargetArchDir,
-@@ -2030,6 +2035,7 @@
-   bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 ||
-                         TargetArch == llvm::Triple::ppc64);
- 
-+#if 0
-   StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT);
-   if (!CxxIncludeRoot.empty()) {
-     StringRef CxxIncludeArch(CXX_INCLUDE_ARCH);
-@@ -2072,6 +2078,10 @@
-                              GCCInstallation.getTriple() + Suffix,
-                              DriverArgs, CC1Args);
-   }
-+#endif
-+    addLibStdCXXIncludePaths(CPP_INCLUDE_PATH,
-+                             CPP_HOST,
-+                             DriverArgs, CC1Args);
- }
- 
- /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly.
+   // Check if libc++ has been enabled and provide its include paths if so.
+  // !!! Will need to modify this if/when nixpkgs uses libc++
+   if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) {
+     // libc++ is always installed at a fixed path on Linux currently.
+     addSystemInclude(DriverArgs, CC1Args,
@@ -1,38 +1,57 @@
-diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp	2011-11-17 02:40:32.000000000 -0500
-+++ clang-3.0.src/lib/Driver/ToolChains.cpp	2011-12-19 05:32:38.695513475 -0500
-@@ -1800,6 +1800,7 @@
+diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
+--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp	2012-05-11 20:16:02.000000000 -0400
+++ clang-3.1.src/lib/Driver/ToolChains.cpp	2012-10-08 01:22:53.458850737 -0400
+@@ -2077,16 +2077,6 @@
+       addPathIfExists(LibPath + "/../" + Multilib, Paths);
+     }
+   }
+-  addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
+-  addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
+-  addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
+-  addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
+-
+-  // Try walking via the GCC triple path in case of multiarch GCC
+-  // installations with strange symlinks.
+-  if (GCCInstallation.isValid())
+-    addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
+-                    "/../../" + Multilib, Paths);
 
-   Linker = GetProgramPath("ld");
- 
-+#if 0
-   LinuxDistro Distro = DetectLinuxDistro(Arch);
- 
-   if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
-@@ -1882,6 +1883,7 @@
-   addPathIfExists(SysRoot + "/lib", Paths);
-   addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
-   addPathIfExists(SysRoot + "/usr/lib", Paths);
-+#endif
+   // Add the non-multilib suffixed paths (if potentially different).
+   if (GCCInstallation.isValid()) {
+@@ -2100,8 +2090,6 @@
+       addPathIfExists(LibPath, Paths);
+     }
+   }
+-  addPathIfExists(SysRoot + "/lib", Paths);
+-  addPathIfExists(SysRoot + "/usr/lib", Paths);
 }
 
 bool Linux::HasNativeLLVMSupport() const {
-diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp
--- clang-3.0.src-orig/lib/Driver/Tools.cpp	2011-11-07 05:27:39.000000000 -0500
-+++ clang-3.0.src/lib/Driver/Tools.cpp	2011-12-19 05:34:44.075325534 -0500
-@@ -4306,6 +4306,7 @@
+diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
+--- clang-3.1.src-orig/lib/Driver/Tools.cpp	2012-04-18 17:32:25.000000000 -0400
+++ clang-3.1.src/lib/Driver/Tools.cpp	2012-10-08 01:25:23.913501995 -0400
+@@ -5210,24 +5210,6 @@
       ToolChain.getArch() == llvm::Triple::thumb ||
       (!Args.hasArg(options::OPT_static) &&
        !Args.hasArg(options::OPT_shared))) {
-+#if 0
-     CmdArgs.push_back("-dynamic-linker");
-     if (ToolChain.getArch() == llvm::Triple::x86)
-       CmdArgs.push_back("/lib/ld-linux.so.2");
-@@ -4318,6 +4319,7 @@
-       CmdArgs.push_back("/lib64/ld64.so.1");
-     else
-       CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+#endif
+-    CmdArgs.push_back("-dynamic-linker");
+-    if (ToolChain.getArch() == llvm::Triple::x86)
+-      CmdArgs.push_back("/lib/ld-linux.so.2");
+-    else if (ToolChain.getArch() == llvm::Triple::arm ||
+-             ToolChain.getArch() == llvm::Triple::thumb)
+-      CmdArgs.push_back("/lib/ld-linux.so.3");
+-    else if (ToolChain.getArch() == llvm::Triple::mips ||
+-             ToolChain.getArch() == llvm::Triple::mipsel)
+-      CmdArgs.push_back("/lib/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::mips64 ||
+-             ToolChain.getArch() == llvm::Triple::mips64el)
+-      CmdArgs.push_back("/lib64/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::ppc)
+-      CmdArgs.push_back("/lib/ld.so.1");
+-    else if (ToolChain.getArch() == llvm::Triple::ppc64)
+-      CmdArgs.push_back("/lib64/ld64.so.1");
+-    else
+-      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
   }
 
   CmdArgs.push_back("-o");
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, groff, llvm, cmake }:

-let version = "3.0"; in
+let version = "3.1"; in

 stdenv.mkDerivation {
  name = "clang-${version}";
@@ -10,20 +10,19 @@ stdenv.mkDerivation {
  patches = stdenv.lib.optionals (stdenv.gcc.libc != null) 
    [ ./clang-include-paths.patch ./clang-ld-flags.patch ];

-  postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) ''
-    sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
-      -e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \
-      -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
-      lib/Driver/ToolChains.cpp
-  '';
-
-  cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all"];
+  cmakeFlags = [
+    "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_TARGETS_TO_BUILD=all"
+  ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
+    "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
+  ];

  enableParallelBuilding = true;

  src = fetchurl {
-      url = "http://llvm.org/releases/${version}/clang-${version}.tar.gz";
-      sha256 = "0v8j9rgmb7w74ihc44zfxa22q17c946n5b6prwl38z3d6pd74kmn";
+      url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
+      sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz";
  };

  passthru = { gcc = stdenv.gcc.gcc; };
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, perl, groff, cmake }:
+{ stdenv, fetchurl, perl, groff, cmake, python }:

-let version = "3.0"; in
+let version = "3.1"; in

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

  src = fetchurl {
-    url    = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz";
-    sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
+    url    = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
+    sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
  };

-  buildInputs = [ perl groff cmake ];
+  buildInputs = [ perl groff cmake python ];

  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
    homepage = http://llvm.org/;
    description = "Collection of modular and reusable compiler and toolchain technologies";
    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
    platforms = with stdenv.lib.platforms; all;
  };
 }
@@ -1,69 +1,44 @@
-{ composableDerivation, lib, fetchurl, mysql, apacheHttpd, zlib, sqlite
-, pcre, apr, gtk, boehmgc, pkgconfig, makeWrapper, sourceFromHead }:
+{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre }:

-let
+stdenv.mkDerivation rec {
+  name = "neko-${version}";
+  version = "1.8.2";

-  inherit (composableDerivation) edf wwf;
-
-  libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk ];
-
-  includes = lib.concatMapStrings (x: ''"${x}/include",'' ) libs + ''"{gkt}/include/gtk-2.0",'';
-  
-in
-
-composableDerivation.composableDerivation {} ( fixed : {
-
-  name = "neko-cvs";
-
-  # REGION AUTO UPDATE:                        { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; groups = "haxe_group"; }
-  src = sourceFromHead "neko-F_16-06-48.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; });
-  # END
-
-  # optionally remove apache mysql like gentoo does?
-  # they just remove libs/{apache,mod_neko}
-  buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs;
-  # apr should be in apacheHttpd propagatedBuildInputs
-
-  preConfigure = ''
-    sed -i \
-      -e 's@"/usr/include",@${includes}@' \
-      src/tools/install.neko
-    sed -i "s@/usr/local@$out@" Makefile vm/load.c
-    # make sure that nekotools boot finds the neko executable and not our wrapper:
-    mkdir -p $out/{bin,lib}
-
-    sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko
-    ln -s ./neko bin/.neko-wrapped
-  '';
-
-  inherit zlib;
-
-  meta = { 
-    description = "Neko is an high-level dynamicly typed programming language";
-    homepage = http://nekovm.org;
-    license = ["GPLv2" ];  # -> docs/license.txt
-    maintainers = [ lib.maintainers.marcweber ];
-    platforms = lib.platforms.linux;
+  src = fetchurl {
+    url = "http://nekovm.org/_media/neko-${version}.tar.gz";
+    sha256 = "099727w6dk689z3pcgbhsqjl74zzrh82a5vb2abxynamcqxcgz1w";
  };

-  # if stripping was done neko and nekoc would be the same. ?!
-  dontStrip = 1;
+  prePatch = with stdenv.lib; let
+    libs = concatStringsSep "," (map (lib: "\"${lib}/include\"") buildInputs);
+  in ''
+    sed -i -e '/^search_includes/,/^}/c \
+      search_includes = function(_) { return $array(${libs}) }
+    ' src/tools/install.neko
+    sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' \
+      vm/load.c
+    # temporarily, fixed in 1.8.3
+    sed -i -e 's/^#if defined(_64BITS)/& || defined(__x86_64__)/' vm/neko.h

-  # neko-wrapped: nekotools boot has to find it. So don't prefix wrapped executable by "."
-  postInstall = ''
-    for prog in nekotools nekoc; do
-      wrapProgram "$out/bin/$prog" \
-        --prefix "LD_LIBRARY_PATH" $out/lib/neko
+    for disabled_mod in mod_neko{,2} mod_tora{,2} mysql ui; do
+      sed -i -e '/^libs/,/^}/{/^\s*'"$disabled_mod"'\s*=>/,/^\s*}/d}' \
+        src/tools/install.neko
    done
-  
-    wrapProgram "$out/bin/neko" \
-      --prefix "LD_LIBRARY_PATH" $out/lib/neko
-
-    # create symlink so that nekotools boot finds not wrapped neko-wrapped executable
-    ln -s  ln -s ../../bin/.neko-wrapped $out/lib/neko
  '';

-  # TODO make them optional and make them work 
-  patches = [ ./disable-modules.patch ];
-})
+  makeFlags = "INSTALL_PREFIX=$(out)";
+  buildInputs = [ boehmgc zlib sqlite pcre ];
+  dontStrip = true;
+
+  preInstall = ''
+    install -vd "$out/lib" "$out/bin"
+  '';
+
+  meta = {
+    description = "A high-level dynamically typed programming language";
+    homepage = http://nekovm.org;
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
@@ -1,59 +0,0 @@
-diff --git a/src/tools/install.neko b/src/tools/install.neko
-index 4cffa5e..5702add 100644
--- a/src/tools/install.neko
-+++ b/src/tools/install.neko
-@@ -39,26 +39,6 @@ buffer_string = $loader.loadprim("std@buffer_string",1);
- // LIBS DATAS
- 
- libs = {
-	mod_neko => {
-		src => $array("../../vm/stats","mod_neko","cgi"),
-		inc => "httpd.h",
-		incname => "Apache 1.3.x"
-	},
-	mod_neko2 => {
-		src => $array("../../vm/stats","mod_neko","cgi"),
-		inc => $array("httpd.h","apr.h"),
-		incname => "Apache 2.2.x",
-		cflags => "-D_LARGEFILE64_SOURCE",
-		realdir => "mod_neko",
-		apache2 => true,
-	},
-	mysql => {
-		src => $array("mysql"),
-		inc => "mysql.h",
-		incname => "MySQL 4.+"
-		lib => "libmysqlclient_r.a",
-		lparams => "-lz -lssl"
-	},
- 	mysql5 => {
- 		src => $array("../common/sha1","../common/socket","my_proto/my_proto","my_proto/my_api","mysql"),
- 		inc => $array(),
-@@ -83,27 +63,6 @@ libs = {
- 		incname => "Sqlite 3",
- 		lparams => "-lsqlite3",
- 	},
-	ui => {
-		src => $array("ui"),
-		inc => switch system { "Mac" => "Carbon.h" default => "gtk/gtk.h" },
-		incname => switch system { "Mac" => "Carbon" default => "GTK+2.0" },
-		cflags => switch system { "Mac" => "" default => "`pkg-config --cflags gtk+-2.0`" },
-		lparams => switch system { "Mac" => "-framework Carbon" default => "`pkg-config --libs gtk+-2.0` -lgthread-2.0" },
-	},
-	mod_tora => {
-		src => $array("../common/socket","protocol","mod_tora"),
-		inc => "httpd.h",
-		incname => "Apache 1.3.x",
-		cflags => "-I../common",
-	},
-	mod_tora2 => {
-		src => $array("../common/socket","protocol","mod_tora"),
-		inc => $array("httpd.h","apr.h"),
-		incname => "Apache 2.2.x",
-		cflags => "-D_LARGEFILE64_SOURCE -I../common",
-		realdir => "mod_tora",
-		apache2 => true,
-	},
- }
- 
- // PLATFORM
@@ -8,11 +8,11 @@ in

 stdenv.mkDerivation rec {
  
-  name = "ocaml-4.00.0";
+  name = "ocaml-4.00.1";
  
  src = fetchurl {
    url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
-    sha256 = "ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7";
+    sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
  };

  prefixKey = "-prefix ";
@@ -17,6 +17,9 @@
 , libXrender
 , libXtst
 , libXi
+, libXinerama
+, libXcursor
+, fontconfig
 , cpio
 , jreOnly ? false
 }:
@@ -82,8 +85,13 @@ stdenv.mkDerivation rec {
    libXrender
    libXtst
    libXi
+    libXinerama
+    libXcursor
+    fontconfig
  ];

+  NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
+
  postUnpack = ''
    mkdir -p drops
    cp ${jaxp_src} drops/${jaxp_src_name}
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, readline}:
+
+stdenv.mkDerivation rec {
+  name = "lua-5.1.5";
+
+  src = fetchurl {
+    url = "http://www.lua.org/ftp/${name}.tar.gz";
+    sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
+  };
+
+  buildInputs = [ readline ];
+
+  configurePhase = "makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux )";
+
+  meta = {
+    homepage = "http://www.lua.org";
+    description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
+    longDescription = ''
+      Lua combines simple procedural syntax with powerful data
+      description constructs based on associative arrays and extensible
+      semantics. Lua is dynamically typed, runs by interpreting bytecode
+      for a register-based virtual machine, and has automatic memory
+      management with incremental garbage collection, making it ideal
+      for configuration, scripting, and rapid prototyping.
+    '';
+    license = "MIT";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ ];
+  };
+}
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
+{ stdenv, fetchurl, gtk, lv2, pkgconfig, python, serd, sord, sratom, qt4 }:

 stdenv.mkDerivation rec {
  name = "suil-${version}";
-  version = "0.6.2";
+  version = "0.6.4";

  src = fetchurl {
    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1rqi16zqnaf30gr2gwb8wbhg8a2l3m5fllf7rabldmgj4b4jlyzp";
+    sha256 = "12pz2w74rhhi6gsskfs6l71vw8qfz8906kbjf5w6jyy1x4kkdca2";
  };

-  buildInputs = [ lv2 pkgconfig python serd sord sratom ];
+  buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];

  configurePhase = "python waf configure --prefix=$out";

@@ -3,11 +3,11 @@
 }:

 stdenv.mkDerivation {
-  name = "gnu-efi-3.0p";
+  name = "gnu-efi-3.0r";

  src = fetchurl {
-    url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0p.orig.tar.gz";
-    sha256 = "1pm4wk1gma7mb8z19js7kb5y31a0zk308mkafmq6gb0b2a0i39cn";
+    url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz";
+    sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5";
  };

  meta = {
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "Cabal";
-  version = "1.16.0";
-  sha256 = "0ia2ysqbnnbfv75l8617bys5iaq8aygcbd1ijqcbzd3asf8flyms";
+  version = "1.16.0.1";
+  sha256 = "03h0fsdm00i5pq37j3d7rjw3gnqkmacvgvdhcrmmamn5q81qld5g";
  buildDepends = [ filepath ];
  meta = {
    homepage = "http://www.haskell.org/cabal/";
@@ -1,15 +1,10 @@
-{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl
-, Pathfinder, syb, text, xhtml
-}:
+{ cabal, csv, FerryCore, HaXml, HDBC, mtl, Pathfinder, text }:

 cabal.mkDerivation (self: {
  pname = "DSH";
-  version = "0.7.8.2";
-  sha256 = "1rs42c05q4s46a1a03srzdq0aijwalhilzifc8ryq4qwjgh7vkwz";
-  buildDepends = [
-    convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text
-    xhtml
-  ];
+  version = "0.8.0.1";
+  sha256 = "08bwn7jpnkzvyj2dlpk6zx97iwsjb085vbnc8hwvxnhf9y8wl96s";
+  buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ];
  meta = {
    description = "Database Supported Haskell";
    license = self.stdenv.lib.licenses.bsd3;
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "binary";
-  version = "0.6.1.0";
-  sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js";
+  version = "0.6.2.0";
+  sha256 = "0nm4vsgyz7ml6w3lk5hrh34i7s7li32gj7bgs75w636kln338aab";
  meta = {
    homepage = "https://github.com/kolmodin/binary";
    description = "Binary serialisation for Haskell values using lazy ByteStrings";
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "citeproc-hs";
-  version = "0.3.4";
-  sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv";
+  version = "0.3.5";
+  sha256 = "134sdz22h2aqwy3cmn0vw91nmbp3ckpjg5djxsg93ddl08ahr4zr";
  buildDepends = [
    filepath hsBibutils HTTP json mtl network pandocTypes parsec syb
    time utf8String xml
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "conduit";
-  version = "0.5.2.4";
-  sha256 = "17959j5frfbl5af4pmxhfb4swrjckk4fh5wmd5bwsbs824glb97a";
+  version = "0.5.2.6";
+  sha256 = "0zmls6gl02mdwapdggw340s7pn5fjsvaky40m31ph3n28qr71kww";
  buildDepends = [
    liftedBase monadControl resourcet text transformers
    transformersBase void
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "criterion";
-  version = "0.6.1.1";
-  sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw";
+  version = "0.6.2.0";
+  sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx";
  buildDepends = [
    aeson deepseq filepath hastache mtl mwcRandom parsec statistics
    time transformers vector vectorAlgorithms
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "data-accessor-template";
-  version = "0.2.1.9";
-  sha256 = "14zp2zjxlkdi33cjif9lc1kl8m0x4brh0pk3d34wk1g1bfzynijc";
+  version = "0.2.1.10";
+  sha256 = "11a4c0g74ppl7nls0dhx6xs47dfcq1wp7bd8qgdba6hhn645afzy";
  buildDepends = [ dataAccessor utilityHt ];
  meta = {
    homepage = "http://www.haskell.org/haskellwiki/Record_access";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "data-memocombinators";
-  version = "0.4.3";
-  sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc";
+  version = "0.4.4";
+  sha256 = "06x79rgxi6cxrpzjzzsjk7yj7i0ajmcgns0n12lxakz9vxbqxyn2";
  buildDepends = [ dataInttrie ];
  meta = {
    homepage = "http://github.com/luqui/data-memocombinators";
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "distributed-process-simplelocalnet";
-  version = "0.2.0.5";
-  sha256 = "04cx5pb3pf4wpmqx1zhdc9lrfs0mb8zk7p1qxxlsqg0x63f3353w";
+  version = "0.2.0.6";
+  sha256 = "1mgsmxxy1fcbxh8p82078c70fj7iv6wr8g47r4d0c3jwz84xya57";
  buildDepends = [
    binary dataAccessor distributedProcess network networkMulticast
    networkTransport networkTransportTcp transformers
@@ -5,8 +5,10 @@

 cabal.mkDerivation (self: {
  pname = "distributed-process";
-  version = "0.3.1";
-  sha256 = "048j27mpdmknz2s4ja3q2mla1d2sjbvrpmzx0lz2qas123qz1siq";
+  version = "0.4.0.1";
+  sha256 = "0yi0403665l01gkqbsix9f4hj8c8m4i42nwjq2i63x259qz2njwi";
+  isLibrary = true;
+  isExecutable = true;
  buildDepends = [
    binary dataAccessor distributedStatic mtl networkTransport random
    rank1dynamic stm syb time transformers
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "distributed-static";
-  version = "0.2.0.0";
-  sha256 = "04s3iils9ji8bwizvm36r5ihnd11098346br0919dv1x6g67a610";
+  version = "0.2.1";
+  sha256 = "0cdwizm4fr2akw7hsqdrvqk06h1lybpxjiczv3kmd0lyc4cb7kyc";
  buildDepends = [ binary rank1dynamic ];
  meta = {
    homepage = "http://www.github.com/haskell-distributed/distributed-process";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "edit-distance";
-  version = "0.2.1";
-  sha256 = "1zhiyzgqmxi4mn7zn5q6rg03hgff9y5f9xizbs00069v7ncygi38";
+  version = "0.2.1.1";
+  sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [ random ];
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "file-embed";
-  version = "0.0.4.5";
-  sha256 = "18rhcjll5gj790g5balk3xhnmmgjh2bixik8vna5drs7y9i0innp";
+  version = "0.0.4.6";
+  sha256 = "0p2vs56s1jy5xaw3axzfsir925z2a46624n32x797lga9khm3qvp";
  meta = {
    homepage = "https://github.com/snoyberg/file-embed";
    description = "Use Template Haskell to embed file contents directly";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "ghc-mtl";
-  version = "1.0.1.1";
-  sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn";
+  version = "1.0.1.2";
+  sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva";
  buildDepends = [ MonadCatchIOMtl mtl ];
  meta = {
    homepage = "http://darcsden.com/jcpetruzza/ghc-mtl";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "gloss";
-  version = "1.7.6.1";
-  sha256 = "1gwmrnwn1x0hs9jp2qsjp737wahbdsjrp2kp7gpz9pkq4a6jmjmx";
+  version = "1.7.6.4";
+  sha256 = "0nyz9iicc6d96yn6yxzwz08g106qb2aadrxlw120wl01aqfw4xis";
  buildDepends = [ bmp GLUT OpenGL ];
  meta = {
    homepage = "http://gloss.ouroborus.net";
@@ -6,8 +6,8 @@

 cabal.mkDerivation (self: {
  pname = "happstack-server";
-  version = "7.0.5";
-  sha256 = "11ialzvjdqmf62yl5r9yxir8fg5agfg1fysf3c3ja5456k07b466";
+  version = "7.0.7";
+  sha256 = "0r9bk82zjzlsi6j6dnz5b73qacpfdyhsn5ds98cn7gkqyf4yg7cj";
  buildDepends = [
    base64Bytestring blazeHtml extensibleExceptions filepath hslogger
    html monadControl mtl network parsec sendfile syb systemFilepath
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "hashtables";
-  version = "1.0.1.7";
-  sha256 = "0swk501whj08jj9q1d1lwg06nakimxnr7797zx8y8275f5mmisi7";
+  version = "1.0.1.8";
+  sha256 = "0skrzvzasm0hg4631nhfppsb7mn60pnxk4v31gipzz780sbx9zi8";
  buildDepends = [ hashable primitive vector ];
  meta = {
    homepage = "http://github.com/gregorycollins/hashtables";
@@ -1,16 +1,16 @@
 { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
 , filepath, MonadCatchIOTransformers, mtl, random, text, time
-, transformers, unorderedContainers, vector, xmlhtml
+, unorderedContainers, vector, xmlhtml
 }:

 cabal.mkDerivation (self: {
  pname = "heist";
-  version = "0.8.1.1";
-  sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh";
+  version = "0.8.2";
+  sha256 = "0zamggvfq9054vxznbnfq1fihk110ih8q0dza1rmsjb1h2s88rkj";
  buildDepends = [
    aeson attoparsec blazeBuilder blazeHtml directoryTree filepath
-    MonadCatchIOTransformers mtl random text time transformers
-    unorderedContainers vector xmlhtml
+    MonadCatchIOTransformers mtl random text time unorderedContainers
+    vector xmlhtml
  ];
  meta = {
    homepage = "http://snapframework.com/";
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hint";
-  version = "0.3.3.4";
-  sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy";
+  version = "0.3.3.5";
+  sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq";
  buildDepends = [
    extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
    MonadCatchIOMtl mtl random utf8String
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "hspec";
-  version = "1.3.0";
-  sha256 = "0kl9mdksy8bifb37dfb9y8mnnjlq0x1h970cgzv9idq61gafii4n";
+  version = "1.3.0.1";
+  sha256 = "1xgj1yg49vb524blswclr0yw4pvfpbmjyh0b62fac14mawl89v36";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@@ -8,8 +8,8 @@

 cabal.mkDerivation (self: {
  pname = "http-conduit";
-  version = "1.6.1";
-  sha256 = "1yzsa6gqhq6s4b2drhx4jd6qdfawf1swrjyffi2bfq1vq8i9ikf2";
+  version = "1.6.1.2";
+  sha256 = "02dh7gh9pk5dj6dl28hn3vqvf9280b57bqas4w7zsgnhjivxy20x";
  buildDepends = [
    asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
    blazeBuilderConduit caseInsensitive certificate conduit cookie
@@ -1,10 +1,10 @@
-{ cabal, mtl, parsec, syb }:
+{ cabal, mtl, parsec, syb, text }:

 cabal.mkDerivation (self: {
  pname = "json";
-  version = "0.6";
-  sha256 = "1f5l1992r2gm8fivqfljhgs3nix4qf7h3rji78rsq1kf3r9shz32";
-  buildDepends = [ mtl parsec syb ];
+  version = "0.7";
+  sha256 = "18v8vbx3pyskf3ap4lpy2d3461gghfsq5bzjyrjvqsd2r9r44rfk";
+  buildDepends = [ mtl parsec syb text ];
  meta = {
    description = "Support for serialising Haskell to and from JSON";
    license = self.stdenv.lib.licenses.bsd3;
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "libmpd";
-  version = "0.8.0";
-  sha256 = "0sn9yqiqr011glb7q0f3xj24wkkvnib0khzf833npcas4420d0ya";
+  version = "0.8.0.1";
+  sha256 = "16j2c0dnwllsb979gqf1cl4ylvpldcj8k32ddpp4wf62lbb1mqxm";
  buildDepends = [ filepath mtl network text time utf8String ];
  meta = {
    homepage = "http://github.com/joachifm/libmpd-haskell";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "lifted-base";
-  version = "0.1.2";
-  sha256 = "0js94dlfy2wjl026jcj2l399ly4zgw0cgxkmil6lsm34gcy9vrvq";
+  version = "0.2";
+  sha256 = "12ai34wb1sd6fza50arlpvsdc6l2nwrrcik0xakf2q0ddzjmhjfb";
  buildDepends = [
    baseUnicodeSymbols monadControl transformersBase
  ];
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "multiarg";
-  version = "0.4.0.0";
-  sha256 = "04m4ynf6x8rlnlmnl6a7jj42fszjc1bly4h3jyjxxsqjdynrv81q";
+  version = "0.6.0.0";
+  sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y";
  buildDepends = [ explicitException utf8String ];
  meta = {
    homepage = "https://github.com/massysett/multiarg";
@@ -3,8 +3,8 @@

 cabal.mkDerivation (self: {
  pname = "network-conduit";
-  version = "0.5.0.2";
-  sha256 = "0ragnwhc8szh680iyzyz6fbprqd3drr8sb970h1p2l4i22srkm39";
+  version = "0.6.1.1";
+  sha256 = "00x5ks1qcq5smmd2g4bm23lb3ngdxmdlz822qkkj9l9c27lkn67n";
  buildDepends = [
    conduit liftedBase monadControl network transformers
  ];
@@ -2,12 +2,12 @@

 cabal.mkDerivation (self: {
  pname = "network-transport-tcp";
-  version = "0.2.0.3";
-  sha256 = "0jlw59ib6yzkv2qggza571k2nhxnwvwj42zdgzz6wh2bgdyihayw";
+  version = "0.3.0";
+  sha256 = "0x2rz0h890bfay52af2wcvja706dr4r6wgfs9csjf7y3jf53nc63";
  buildDepends = [ dataAccessor network networkTransport ];
  meta = {
    homepage = "http://github.com/haskell-distributed/distributed-process";
-    description = "TCP instantation of Network.Transport";
+    description = "TCP instantiation of Network.Transport";
    license = self.stdenv.lib.licenses.bsd3;
    platforms = self.ghc.meta.platforms;
    maintainers = [ self.stdenv.lib.maintainers.andres ];
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "network-transport";
-  version = "0.2.0.2";
-  sha256 = "1pipykqwbjmbkgkmk0ss2pvfp72rkxwmz49d1j5xi8b0rlfgw05c";
+  version = "0.3.0";
+  sha256 = "1i6sn5x3z1r9l7xwag68s5gsii137d5dajwr0abcbv6143ph3bvm";
  buildDepends = [ binary transformers ];
  meta = {
    homepage = "http://github.com/haskell-distributed/distributed-process";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "numbers";
-  version = "3000.0.0.0";
-  sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb";
+  version = "3000.1.0.0";
+  sha256 = "0iqpch8j2i2pnjq8waqb5y95jpmvbzx2r6zsvkja7sl4d578fgpn";
  meta = {
    homepage = "https://github.com/DanBurton/numbers";
    description = "Various number types";
@@ -2,12 +2,11 @@

 cabal.mkDerivation (self: {
  pname = "parallel-io";
-  version = "0.3.2";
-  sha256 = "1n9y1d1lcdwvhjsfqdlxknl89fxncq17kgin43wlki0c39cgirga";
+  version = "0.3.2.1";
+  sha256 = "0wrmz0i5s8p87840pacdnpf2fi12nips4yc72vymifrc1wvlc42q";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [ extensibleExceptions random ];
-  jailbreak = true;
  meta = {
    homepage = "http://batterseapower.github.com/parallel-io";
    description = "Combinators for executing IO actions in parallel on a thread pool";
@@ -6,8 +6,8 @@

 cabal.mkDerivation (self: {
  pname = "persistent";
-  version = "1.0.1.2";
-  sha256 = "0gw635mhbn6w8aswiw9j41rdpi7rhnnhay2qgvlc8103s0g5lp9j";
+  version = "1.0.1.3";
+  sha256 = "156iv1iv807wm39sr98z0f10sbw4q0ac3lafgai0mq3ph5xysi80";
  buildDepends = [
    aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
    liftedBase monadControl monadLogger pathPieces poolConduit
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "primitive";
+  version = "0.5.0.1";
+  sha256 = "04s33xqxz68ddppig5pjf7ki1y5y62xzzzmg3b5pkcxp0r6rsv2j";
+  meta = {
+    homepage = "http://code.haskell.org/primitive";
+    description = "Primitive memory-related operations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "resourcet";
-  version = "0.4.0.1";
-  sha256 = "0idyb2xvjk9cbz9gy1gr6sw1mz6v9d8fgk0kw778n6k3h488dw9x";
+  version = "0.4.0.2";
+  sha256 = "0w4hm29dig6m4jm6y9zmyfnhwii7b88hqjqlvl6xmk5zxp1q7hc2";
  buildDepends = [
    liftedBase monadControl mtl transformers transformersBase
  ];
@@ -1,19 +1,19 @@
 { cabal, attoparsec, attoparsecEnumerator, blazeBuilder
 , blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq
 , enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl
-, random, regexPosix, text, time, transformers, unixCompat
-, unorderedContainers, vector, zlibEnum
+, random, regexPosix, text, time, unixCompat, unorderedContainers
+, vector, zlibEnum
 }:

 cabal.mkDerivation (self: {
  pname = "snap-core";
-  version = "0.9.2.1";
-  sha256 = "18i0hfzc37q12nyp7g4sc87s4xcqz1crjwpnhh4y5fw66glzmq3q";
+  version = "0.9.2.2";
+  sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf";
  buildDepends = [
    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
    bytestringMmap caseInsensitive deepseq enumerator filepath HUnit
-    MonadCatchIOTransformers mtl random regexPosix text time
-    transformers unixCompat unorderedContainers vector zlibEnum
+    MonadCatchIOTransformers mtl random regexPosix text time unixCompat
+    unorderedContainers vector zlibEnum
  ];
  meta = {
    homepage = "http://snapframework.com/";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "snap-loader-dynamic";
-  version = "0.9.0";
-  sha256 = "1pbpvi20an077klvha1dflnlxpfb6m81n9d50hjhidf6430cmmhm";
+  version = "0.9.0.1";
+  sha256 = "1pzn8lfqngn8cqm1dpxn5wsx70xcd7r90rd2948n4p5309qgh9mq";
  buildDepends = [ directoryTree hint mtl snapCore time ];
  meta = {
    homepage = "http://snapframework.com/";
@@ -1,20 +1,18 @@
-{ cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder
-, blazeBuilderEnumerator, caseInsensitive, directoryTree
-, enumerator, filepath, MonadCatchIOTransformers, mtl, network
-, snapCore, text, time, transformers, unixCompat
+{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
+, blazeBuilderEnumerator, caseInsensitive, enumerator
+, MonadCatchIOTransformers, mtl, network, snapCore, text, time
+, unixCompat
 }:

 cabal.mkDerivation (self: {
  pname = "snap-server";
-  version = "0.9.2.3";
-  sha256 = "0wl7clzwrd34d32sikd6vkj3pla9yni26mmdsnrjw1s3lq412yqd";
+  version = "0.9.2.4";
+  sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl";
  buildDepends = [
-    attoparsec attoparsecEnumerator binary blazeBuilder
-    blazeBuilderEnumerator caseInsensitive directoryTree enumerator
-    filepath MonadCatchIOTransformers mtl network snapCore text time
-    transformers unixCompat
+    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
+    caseInsensitive enumerator MonadCatchIOTransformers mtl network
+    snapCore text time unixCompat
  ];
-  jailbreak = true;
  meta = {
    homepage = "http://snapframework.com/";
    description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
@@ -2,14 +2,14 @@
 , dataLens, dataLensTemplate, directoryTree, filepath, hashable
 , heist, logict, MonadCatchIOTransformers, mtl, mwcRandom
 , pwstoreFast, snapCore, snapServer, stm, syb, text, time
-, transformers, unorderedContainers, utf8String, vector
-, vectorAlgorithms, xmlhtml
+, transformers, unorderedContainers, vector, vectorAlgorithms
+, xmlhtml
 }:

 cabal.mkDerivation (self: {
  pname = "snap";
-  version = "0.9.2.1";
-  sha256 = "0gxnkr6icx2g16w3ab54cqy4x15xj6y9cs6qv8dg0xamm7kyyfhl";
+  version = "0.9.2.2";
+  sha256 = "1ql9c8b9arcd8zwlwsiipl4diah87sp339ljc5bc7yls1g4d9zsw";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@@ -17,9 +17,8 @@ cabal.mkDerivation (self: {
    dataLensTemplate directoryTree filepath hashable heist logict
    MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore
    snapServer stm syb text time transformers unorderedContainers
-    utf8String vector vectorAlgorithms xmlhtml
+    vector vectorAlgorithms xmlhtml
  ];
-  jailbreak = true;
  meta = {
    homepage = "http://snapframework.com/";
    description = "Top-level package for the Snap Web Framework";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "stringsearch";
-  version = "0.3.6.3";
-  sha256 = "1f0sl1zjya8glvlscf3g5i0in0ai1knls7kg9dp82grg2k287sgz";
+  version = "0.3.6.4";
+  sha256 = "16g0x0n8x3bg3mij7w3r5m3h2i2dn3bd298n14iccdwhfnlzm91b";
  meta = {
    homepage = "https://bitbucket.org/dafis/stringsearch";
    description = "Fast searching, splitting and replacing of ByteStrings";
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "stylish-haskell";
-  version = "0.5.1.0";
-  sha256 = "0vriwgx7z8azqmci9lq7xlvn0v12p5nj9s6i4jvxsjam538qll94";
+  version = "0.5.2.0";
+  sha256 = "1g02ih4hgn2chv56vy8dcql7x421w15m4fsgqnff236znxarn0v7";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "temporary";
-  version = "1.1.2.3";
-  sha256 = "1x4jljggbcdq90h578yyvc8z1i9zmlhvqfz2dym8kj8pq4qiwixd";
+  version = "1.1.2.4";
+  sha256 = "1j8kc22rz2wqg90n5wcxb06ylqv3lnz764077kvwhrw7mhmbp7jz";
  buildDepends = [ filepath ];
  meta = {
    homepage = "http://www.github.com/batterseapower/temporary";
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "tls-extra";
-  version = "0.4.6";
-  sha256 = "1xl55i4nr7kyc3qxi8zmq18m0xhlwlrx9fwkck22krshqgq2i6nn";
+  version = "0.4.7";
+  sha256 = "1ykmwkzq2vwjvcvg8c9b020baqxp3w7w0x7ka7jrk88aqmil9hiq";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "uu-parsinglib";
-  version = "2.7.3.4";
-  sha256 = "1f582cr17qxwrhxx6pdv503ldm4ccbnbv9pcksibgparfyc25bnv";
+  version = "2.7.4";
+  sha256 = "1cznyn09a3glfkvvzqma3bhjinddkp6v2xwiy5x403v0wy8y565j";
  buildDepends = [ ListLike time ];
  meta = {
    homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "vector-algorithms";
-  version = "0.5.4.1";
-  sha256 = "00dikjmy1pyyn3mmq7sjnmd91xcg7q3n3yiil3dqi1fgr0787xng";
+  version = "0.5.4.2";
+  sha256 = "08pb6mkghf9h5011vxrfdrfq6g26jk4gxmjh9s3hpdiwybf3ab64";
  buildDepends = [ primitive vector ];
  meta = {
    homepage = "http://code.haskell.org/~dolio/";
@@ -0,0 +1,15 @@
+{ cabal, deepseq, primitive }:
+
+cabal.mkDerivation (self: {
+  pname = "vector";
+  version = "0.10.0.1";
+  sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc";
+  buildDepends = [ deepseq primitive ];
+  meta = {
+    homepage = "http://code.haskell.org/vector";
+    description = "Efficient Arrays";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
@@ -6,8 +6,8 @@

 cabal.mkDerivation (self: {
  pname = "wai-extra";
-  version = "1.3.0.2";
-  sha256 = "0w69wjfbzgg523n0rcs700qx0gsdhvlr0qjvqg1hppvi188llpwl";
+  version = "1.3.0.3";
+  sha256 = "0nfk24mwzf2v35vlvvhzb7a6ldr6pvw37m3ws3b3cv2m80jdd7kr";
  buildDepends = [
    ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
    conduit dataDefault dateCache fastLogger httpTypes network
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "warp";
-  version = "1.3.2";
-  sha256 = "14yib72x3z6fylpkzpr77cvvnr4bn1vdadh2pq6rknszspl6g7iq";
+  version = "1.3.3.2";
+  sha256 = "1w2i5nf3qh7p0xfrrp6x34rw3sxa48v703w1vlsikhyjdqs2crq8";
  buildDepends = [
    blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
    httpTypes liftedBase network networkConduit simpleSendfile
@@ -4,8 +4,8 @@

 cabal.mkDerivation (self: {
  pname = "yaml";
-  version = "0.8.0.2";
-  sha256 = "14blcsylbf9wx4yw8fsk8ddjvg844x97xfc1h7r4ls9l9ar7k95j";
+  version = "0.8.1";
+  sha256 = "0cirffxydjh5650s1i0mq1v839pl2dljwmrjnmjf44fcqsvanvyg";
  buildDepends = [
    aeson attoparsec conduit resourcet text transformers
    unorderedContainers vector
@@ -7,8 +7,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-auth";
-  version = "1.1.1.1";
-  sha256 = "1ryq3jxcgb55ijjmcv0j234n9nay2ianifb59gz9akyv0sc3zcl9";
+  version = "1.1.1.2";
+  sha256 = "1agyazzkgwmp63vwx84bzalf9lwg14k5jshj6n97g1iagsiaxqa0";
  buildDepends = [
    aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
    liftedBase mimeMail persistent persistentTemplate pureMD5
@@ -9,8 +9,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-core";
-  version = "1.1.2";
-  sha256 = "1pgwqghj9kc9kh90515nswz5ssbmm2y6miw5j6sx4dha0xncqvgs";
+  version = "1.1.2.2";
+  sha256 = "13852r6s7p9b4zvg4pi9qfmgv8g21m0gqlw7bky05jy5a9c8v3a7";
  buildDepends = [
    aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
    clientsession conduit cookie failure fastLogger hamlet httpTypes
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-default";
-  version = "1.1.0";
-  sha256 = "124407a0in474l71jja04ds0xh84ac5i3jv62iswxlcp1y9f52bq";
+  version = "1.1.0.2";
+  sha256 = "0gjf819mrg3h50c8qlnh8i3xzq0z8mdz8bbqrpjx1haljcgxrzm3";
  buildDepends = [
    dataDefault hamlet networkConduit shakespeareCss shakespeareJs text
    transformers unorderedContainers wai waiExtra warp yaml yesodCore
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod-routes";
-  version = "1.1.0";
-  sha256 = "0r0a3s1dngqp2vcq0cdsbqf1lsyhygj2x4a93csr2iyn244zgxnx";
+  version = "1.1.0.1";
+  sha256 = "1b248ry96p1nyp21c3r9rd3awpdhpqrwj3s6d66pmjf8p0gl5vda";
  buildDepends = [ pathPieces text vector ];
  meta = {
    homepage = "http://www.yesodweb.com/";
@@ -8,8 +8,8 @@

 cabal.mkDerivation (self: {
  pname = "yesod";
-  version = "1.1.1";
-  sha256 = "0666g2ap6ignqif9vwis2bnsb45jb19llw9z20nsfs0q3wj8ykn3";
+  version = "1.1.1.2";
+  sha256 = "0gq4ijfjlkiqw4bp9hxs8r41vlhz33v5l9k1maqjy62d446lrgvw";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
@@ -19,7 +19,6 @@ cabal.mkDerivation (self: {
    transformers unixCompat unorderedContainers wai waiExtra warp yaml
    yesodAuth yesodCore yesodForm yesodJson yesodPersistent zlib
  ];
-  jailbreak = true;
  meta = {
    homepage = "http://www.yesodweb.com/";
    description = "Creation of type-safe, RESTful web applications";
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, cmake }:
+
+let rev = "165151"; in
+
+stdenv.mkDerivation {
+  name = "libc++-pre${rev}";
+
+  src = fetchsvn {
+    url = "http://llvm.org/svn/llvm-project/libcxx/trunk";
+    inherit rev;
+    sha256 = "00l8xx5nc3cjlmln7c1sy1i4v844has9kbfxrsziwkalzbgwaslz";
+  };
+
+  buildInputs = [ cmake ];
+
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://libcxx.llvm.org/;
+    description = "A new implementation of the C++ standard library, targeting C++11";
+    license = "BSD";
+    maintainers = stdenv.lib.maintainers.shlevy;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, jasper }:

-stdenv.mkDerivation {
-  name = "libicns-0.8.0";
+stdenv.mkDerivation rec {
+  name = "libicns-0.8.1";

  src = fetchurl {
-    url = mirror://sourceforge/icns/libicns-0.8.0.tar.gz;
-    sha256 = "0jh67nm07jr1nfkfjid3jjw7fyw5hvj6a2fqan1bhg6gyr2hswla";
+    url = "mirror://sourceforge/icns/${name}.tar.gz";
+    sha256 = "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk";
  };

  buildInputs = [ libpng jasper ];
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "libraw1394-2.0.8";
+  name = "libraw1394-2.1.0";

  src = fetchurl {
    url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
-    sha256 = "0cwd8xn7wsm7nddbz7xgynxcjb1m4v2vjw1ky4dd6r5cv454hslk";
+    sha256 = "0w5sw06p51wfq2ahgql93ljkkp3hqprifzcxq8dq71c8zcbgyg58";
  };

  meta = { 
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, gtk, libgnomecanvas, pkgconfig }:
- 
-stdenv.mkDerivation rec {
-  name = "phat-${version}";
-  version = "0.4.1";
-
-  src = fetchurl {
-    url = "http://download.berlios.de/phat/${name}.tar.gz";
-    sha256 = "1icncp2d8hbarzz8mmflkw13blg7blgwfic8q2wll7s6n01ii2av";
-  };
-
-  buildInputs = [ gtk libgnomecanvas pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "GTK+ widgets geared toward pro-audio apps";
-    homepage = http://phat.berlios.de;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
@@ -4,11 +4,10 @@ stdenv.mkDerivation {
  name = "ocaml-extlib-1.5.2";

  src = fetchurl {
-    url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz";
-    sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa";
+    url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz;
+    sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
  };

-  patches = [ ./hashtable-ocaml4-compat.patch ];
  buildInputs = [ocaml findlib];

  createFindlibDestdir = true;
@@ -19,9 +18,9 @@ stdenv.mkDerivation {
  '';

  meta = {
-    homepage = "http://code.google.com/p/ocaml-extlib/";
+    homepage = http://code.google.com/p/ocaml-extlib/;
    description = "Enhancements to the OCaml Standard Library modules";
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl21;
    platforms = ocaml.meta.platforms;
  };
 }
@@ -1,12 +0,0 @@
-Revision 396 from the official extlib repository.
-
--- extlib/extHashtbl.ml	(revision 395)
-+++ extlib/extHashtbl.ml	(working copy)
-@@ -32,6 +32,7 @@
- 	}
- 
- 	include Hashtbl
-+	let create n = Hashtbl.create (* no seed *) n
- 
- 	external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
- 	external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"
@@ -2,15 +2,14 @@

 let
  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "3.1";
 in

 stdenv.mkDerivation {
-  name = "ocamlnet-${version}";
+  name = "ocamlnet-3.6";

  src = fetchurl {
-    url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
-    sha256 = "0kdc2540ad84j6haj9jxlwryz9cb8q8kjdr48f2wgvcaii38v9f5";
+    url = http://download.camlcity.org/download/ocamlnet-3.6.tar.gz;
+    sha256 = "306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69";
  };

  buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl];
@@ -5,11 +5,11 @@ let
 in

 stdenv.mkDerivation {
-  name = "ounit-1.1.0";
+  name = "ounit-1.1.2";

  src = fetchurl {
-    url = http://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz;
-    sha256 = "12vybg9xlw5c8ip23p8cljfzhkdsm25482sf1yh46fcqq8p2jmqx";
+    url = http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz;
+    sha256 = "e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3";
  };

  buildInputs = [ocaml findlib];
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
    description = "Unit test framework for OCaml";
-    license = "MIT/X11";
+    license = stdenv.lib.licenses.mit;
    platforms = ocaml.meta.platforms;
    maintainers = [
      stdenv.lib.maintainers.z77z
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, sqlite, pkgconfig
+, buildllvmsparse ? true
+, buildc2xml ? true
+, llvm ? null, libxml2 ? null
+}:
+
+assert buildllvmsparse -> llvm != null;
+assert buildc2xml -> libxml2 != null;
+
+stdenv.mkDerivation {
+  name = "smatch";
+
+  src = fetchgit {
+    url = git://repo.or.cz/smatch.git;
+    rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9";
+    sha256 = "09a44967d4cff026c67062f778e251d0b432af132e9d59a47b7d3167f379adfa";
+  };
+
+  buildInputs = [sqlite pkgconfig]
+   ++ stdenv.lib.optional buildllvmsparse llvm
+   ++ stdenv.lib.optional buildc2xml libxml2;
+
+  installFlags = "DESTDIR=$(out)";
+
+  meta = {
+    description = "A semantic analysis tool for C";
+    homepage = "http://smatch.sourceforge.net/";
+    license = "free"; /* OSL, see http://www.opensource.org */
+  };
+}
@@ -7,7 +7,7 @@ with stdenv.lib;
 let
  os = stdenv.lib.optionalString;
  majorVersion = "2.8";
-  minorVersion = "7";
+  minorVersion = "9";
  version = "${majorVersion}.${minorVersion}";
 in

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "17zmxh0gyis6w05d2km0swlvy94h3w10jgra0fpa5qcg7l2j628k";
+    sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
  };

  patches =
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "BNFC-meta";
-  version = "0.3.0.3";
-  sha256 = "06k8jnb4gw96gc0ffmczbywn4q2n87zwqa0pl0ada3ldvwaagv4l";
+  version = "0.3.0.5";
+  sha256 = "0blssa72r2ff4avbibw9a4p8gxy228f3lb1vc9aqr881v79b2cpp";
  buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ];
  noHaddock = true;
  meta = {
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "alex-meta";
-  version = "0.3.0.3";
-  sha256 = "08w7z2iq2s557vi9kp2x8qp1lwvh49skffbjm8kxrf2bn2il5q48";
+  version = "0.3.0.4";
+  sha256 = "0d0ii1djigydj2papcilkr8mazp70vg6hy179h28j9i1bshp3anp";
  buildDepends = [ haskellSrcMeta QuickCheck ];
  noHaddock = true;
  meta = {
@@ -2,8 +2,8 @@

 cabal.mkDerivation (self: {
  pname = "happy-meta";
-  version = "0.2.0.4";
-  sha256 = "1s1inv2l2hwdlvypn6wpiadmi5y5mpcjawiqjb1hv0d8y43dpz54";
+  version = "0.2.0.5";
+  sha256 = "103hi87azqv11l8lq1rv0v9v88sl227g31snvkn8db6b4cfrwrxk";
  buildDepends = [ haskellSrcMeta mtl ];
  meta = {
    description = "Quasi-quoter for Happy parsers";
@@ -1,10 +1,10 @@
-{ cabal, filepath }:
+{ cabal, filepath, time }:

 cabal.mkDerivation (self: {
  pname = "tar";
-  version = "0.4.0.0";
-  sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3";
-  buildDepends = [ filepath ];
+  version = "0.4.0.1";
+  sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
+  buildDepends = [ filepath time ];
  meta = {
    description = "Reading, writing and manipulating \".tar\" archive files.";
    license = self.stdenv.lib.licenses.bsd3;
@@ -2,28 +2,18 @@

 let
  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  pname = "camlp5";
-  version = "6.02.3";
-  webpage = http://pauillac.inria.fr/~ddr/camlp5/;
  metafile = ./META;
 in

 stdenv.mkDerivation {

-  name = "${pname}${if transitional then "_transitional" else ""}-${version}";
+  name = "camlp5${if transitional then "_transitional" else ""}-6.06";

  src = fetchurl {
-    url = "${webpage}/distrib/src/${pname}-${version}.tgz";
-    sha256 = "1z9bwh267117br0vlhirv9yy2niqp2n25zfnl14wg6kgg9bqx7rj";
+    url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz;
+    sha256 = "763f89ee6cde4ca063a50708c3fe252d55ea9f8037e3ae9801690411ea6180c5";
  };

-  patches = fetchurl {
-    url = "${webpage}/distrib/src/patch-${version}-1";
-    sha256 = "159qpvr07mnn72yqwx24c6mw7hs6bl77capsii7apg9dcxar8w7v";
-  };
-
-  patchFlags = "-p 0";
-
  buildInputs = [ ocaml ];

  prefixKey = "-prefix ";
@@ -41,8 +31,8 @@ stdenv.mkDerivation {
      Camlp5 is a preprocessor and pretty-printer for OCaml programs.
      It also provides parsing and printing tools.
    '';
-    homepage = "${webpage}";
-    license = "BSD";
+    homepage = http://pauillac.inria.fr/~ddr/camlp5/;
+    license = stdenv.lib.licenses.bsd3;
    platforms = ocaml.meta.platforms;
    maintainers = [
      stdenv.lib.maintainers.z77z
@@ -25,6 +25,16 @@ stdenv.mkDerivation rec {

  meta = {
    description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".'';
+    longDescription = ''
+      OpenTTD is a transportation economics simulator. In single player mode,
+      players controll a transportation business, and use rail, road, sea, and air
+      transport to move goods and people around the simulated world. 
+
+      In multiplayer networked mode, players may:
+        - play competitively as different businesses
+        - play cooperatively controling the same business
+        - observe as spectators
+    '';
    homepage = http://www.openttd.org/;
    license = "GPLv2";
    maintainers = with stdenv.lib.maintainers; [ jcumming ];
@@ -12,6 +12,7 @@ stdenv.mkDerivation {

  preConfigure = ''
    export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include"
+    autoreconf -i
  '';
  
  buildInputs = [SDL SDL_mixer autoconf automake];
@@ -19,7 +20,12 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://ri-li.sourceforge.net;
    license = "GPL2+";
-    description = "Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win.";
+    description = "A children's train game";
+    longDescription = ''
+     Ri-li is an arcade game licensed under the GPL (General Public License).
+You drive a toy wood engine in many levels and you must collect all the coaches
+to win.
+    '';
    maintainers = with stdenv.lib.maintainers; [ jcumming ];
  };
 }
@@ -64,7 +64,13 @@ stdenv.mkDerivation rec {
    '';

  meta = {
-    description = ''Urquan Masters is an open source clone of the Classic top-down space battle Star Cotnrol '';
+    description = "Remake of Star Control II";
+    longDescription = ''
+    The goals for the The Ur-Quan Masters project are:
+      - to bring Star Control II to modern platforms, thereby making a lot of people happy
+      - to make game translations easy, thereby making even more people happy
+      - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy!
+    '';
    homepage = http://sc2.sourceforge.net/;
    license = "GPLv2";
    maintainers = with stdenv.lib.maintainers; [ jcumming ];
--- a/Show More
+++ b/Show More