Merge remote-tracking branch 'origin/master' into stdenv-updates.

.gitignore

@@ -2,3 +2,6 @@
 ,*
 .*.swp
 .*.swo
+cpan-info
+cpan_tmp/
+result

pkgs/applications/audio/lame/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, nasm}:
 
 stdenv.mkDerivation rec {
-  name = "lame-3.98.4";
+  name = "lame-3.99.5";
   src = fetchurl {
     url = "mirror://sourceforge/lame/${name}.tar.gz";
-    sha256 = "1j3jywv6ic2cy0x0q1a1h6rcl6xmcs5f58xawjdkl8hpcv3l8cdc";
+    sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14";
   };
 
   buildInputs = [ nasm ];

pkgs/applications/audio/ncmpcpp/default.nix

@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     homepage = http://unkart.ovh.org/ncmpcpp/;
     license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.mornfall ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
 

pkgs/applications/audio/shntool/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, flac }:
+
+stdenv.mkDerivation rec {
+  version = "3.0.10";
+  name = "shntool-${version}";
+
+  src = fetchurl {
+    url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz;
+    sha256 = "00i1rbjaaws3drkhiczaign3lnbhr161b7rbnjr8z83w8yn2wc3l";
+  };
+
+  buildInputs = [ flac ];
+
+  meta = {
+    description = "multi-purpose WAVE data processing and reporting utility";
+    homepage = http://www.etree.org/shnutils/shntool/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+  };
+}

pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }:
+
+stdenv.mkDerivation {
+  name = "lightdm-gtk-greeter";
+
+  src = fetchurl {
+    url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz";
+    sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621";
+  };
+
+  buildInputs = [ pkgconfig gtk3 lightdm intltool ];
+
+  patches =
+    [ ./lightdm-gtk-greeter.patch
+    ];
+
+  patchFlags = "-p0";
+
+  postInstall = ''
+      substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
+        --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
+    '';
+}

pkgs/applications/display-managers/lightdm-gtk-greeter/lightdm-gtk-greeter.patch

@@ -0,0 +1,13 @@
+=== modified file 'src/lightdm-gtk-greeter.c'
+--- src/lightdm-gtk-greeter.c	2013-02-09 23:20:39 +0000
++++ src/lightdm-gtk-greeter.c	2013-03-29 12:21:34 +0000
+@@ -1273,7 +1273,7 @@
+     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (session_combo), renderer, TRUE);
+     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (session_combo), renderer, "text", 0);
+     model = gtk_combo_box_get_model (session_combo);
+-    items = lightdm_get_sessions ();
++    items = lightdm_get_sessions (greeter);
+     for (item = items; item; item = item->next)
+     {
+         LightDMSession *session = item->data;
+

pkgs/applications/display-managers/lightdm/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "lightdm-1.5.1";
+
+  src = fetchurl {
+    url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz;
+    sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86";
+  };
+
+  buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ];
+
+  configureFlags = [ "--enable-liblightdm-gobject" ];
+
+  patches =
+    [ ./lightdm.patch
+    ];
+
+  patchFlags = "-p0";
+
+  meta = {
+    homepage = http://launchpad.net/lightdm;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/applications/display-managers/lightdm/lightdm.patch

@@ -0,0 +1,193 @@
+=== modified file 'liblightdm-gobject/greeter.c'
+--- liblightdm-gobject/greeter.c	2013-01-31 20:56:09 +0000
++++ liblightdm-gobject/greeter.c	2013-03-29 14:15:58 +0000
+@@ -567,6 +567,21 @@
+ }
+ 
+ /**
++ * lightdm_greeter_get_config_path
++ * @greeter: A #LightDMGreeter
++ *
++ * Get the config path to LightDM.
++ *
++ * Return value: The path to the current LightDM configuration file.
++ **/
++const gchar *
++lightdm_greeter_get_config_path (LightDMGreeter *greeter)
++{
++    g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
++    return lightdm_greeter_get_hint (greeter, "config-path");
++}
++
++/**
+  * lightdm_greeter_get_hide_users_hint:
+  * @greeter: A #LightDMGreeter
+  *
+
+=== modified file 'liblightdm-gobject/lightdm/greeter.h'
+--- liblightdm-gobject/lightdm/greeter.h	2013-01-31 20:56:09 +0000
++++ liblightdm-gobject/lightdm/greeter.h	2013-03-29 11:56:11 +0000
+@@ -93,6 +93,8 @@
+ 
+ const gchar *lightdm_greeter_get_autologin_user_hint (LightDMGreeter *greeter);
+ 
++const gchar *lightdm_greeter_get_config_path (LightDMGreeter *greeter);
++
+ gboolean lightdm_greeter_get_autologin_guest_hint (LightDMGreeter *greeter);
+ 
+ gint lightdm_greeter_get_autologin_timeout_hint (LightDMGreeter *greeter);
+
+=== modified file 'liblightdm-gobject/lightdm/session.h'
+--- liblightdm-gobject/lightdm/session.h	2013-01-31 20:56:09 +0000
++++ liblightdm-gobject/lightdm/session.h	2013-03-29 11:59:16 +0000
+@@ -12,6 +12,7 @@
+ #define _LIGHTDM_SESSION_H_
+ 
+ #include <glib-object.h>
++#include "greeter.h"
+ 
+ G_BEGIN_DECLS
+ 
+@@ -42,9 +43,9 @@
+ 
+ GType lightdm_session_get_type (void);
+ 
+-GList *lightdm_get_sessions (void);
++GList *lightdm_get_sessions (LightDMGreeter *greeter);
+ 
+-GList *lightdm_get_remote_sessions (void);
++GList *lightdm_get_remote_sessions (LightDMGreeter *greeter);
+ 
+ const gchar *lightdm_session_get_key (LightDMSession *session);
+ 
+
+=== modified file 'liblightdm-gobject/session.c'
+--- liblightdm-gobject/session.c	2013-01-31 20:56:09 +0000
++++ liblightdm-gobject/session.c	2013-03-29 14:16:48 +0000
+@@ -11,6 +11,7 @@
+ #include <string.h>
+ #include <gio/gdesktopappinfo.h>
+ 
++#include "lightdm/greeter.h"
+ #include "lightdm/session.h"
+ 
+ enum {
+@@ -167,7 +168,7 @@
+ }
+ 
+ static void
+-update_sessions (void)
++update_sessions (LightDMGreeter *greeter)
+ {
+     GKeyFile *config_key_file = NULL;
+     gchar *config_path = NULL;
+@@ -183,8 +184,8 @@
+     remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR);
+ 
+     /* Use session directory from configuration */
+-    /* FIXME: This should be sent in the greeter connection */
+-    config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL);
++    config_path = g_strdup (lightdm_greeter_get_config_path (greeter));
++
+     config_key_file = g_key_file_new ();
+     result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error);
+     if (error)
+@@ -228,9 +229,9 @@
+  * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
+  **/
+ GList *
+-lightdm_get_sessions (void)
++lightdm_get_sessions (LightDMGreeter *greeter)
+ {
+-    update_sessions ();
++    update_sessions (greeter);
+     return local_sessions;
+ }
+ 
+@@ -242,9 +243,9 @@
+  * Return value: (element-type LightDMSession) (transfer none): A list of #LightDMSession
+  **/
+ GList *
+-lightdm_get_remote_sessions (void)
++lightdm_get_remote_sessions (LightDMGreeter *greeter)
+ {
+-    update_sessions ();
++    update_sessions (greeter);
+     return remote_sessions;
+ }
+ 
+
+=== modified file 'src/display.c'
+--- src/display.c	2013-03-26 22:22:49 +0000
++++ src/display.c	2013-03-29 12:12:43 +0000
+@@ -62,6 +62,9 @@
+     /* Program to run sessions through */
+     gchar *session_wrapper;
+ 
++    /* Path to the configuration file that lightdm is running under */
++    gchar *config_path;
++
+     /* TRUE if in a user session */
+     gboolean in_user_session;
+ 
+@@ -213,6 +216,14 @@
+ }
+ 
+ void
++display_set_config_path (Display *display, const gchar *config_path)
++{
++    g_return_if_fail (display != NULL);
++    g_free (display->priv->config_path);
++    display->priv->config_path = g_strdup (config_path);
++}
++
++void
+ display_set_show_remote_login_hint (Display *display, gboolean show_remote_login)
+ {
+     g_return_if_fail (display != NULL);
+@@ -436,6 +447,7 @@
+     greeter_set_hint (display->priv->greeter, "show-remote-login", display->priv->greeter_show_remote_login ? "true" : "false");
+     if (display->priv->greeter_is_lock)
+         greeter_set_hint (display->priv->greeter, "lock-screen", "true");
++    greeter_set_hint (display->priv->greeter, "config-path", display->priv->config_path);
+ 
+     /* Run greeter as unprivileged user */
+     if (getuid () != 0)
+
+=== modified file 'src/display.h'
+--- src/display.h	2013-03-26 22:22:49 +0000
++++ src/display.h	2013-03-29 12:12:37 +0000
+@@ -80,6 +80,8 @@
+ 
+ void display_set_user_session (Display *display, SessionType type, const gchar *session_name);
+ 
++void display_set_config_path (Display *display, const gchar *config_path);
++
+ gboolean display_start (Display *display);
+ 
+ gboolean display_get_is_ready (Display *display);
+
+=== modified file 'src/lightdm.c'
+--- src/lightdm.c	2013-03-07 21:40:31 +0000
++++ src/lightdm.c	2013-03-29 11:48:45 +0000
+@@ -1050,6 +1050,7 @@
+     g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ());
+ 
+     g_debug ("Loaded configuration from %s", config_path);
++    config_set_string (config_get_instance (), "LightDM", "config-path", config_path);
+     g_free (config_path);
+ 
+     g_debug ("Using D-Bus name %s", LIGHTDM_BUS_NAME);
+
+=== modified file 'src/seat.c'
+--- src/seat.c	2013-03-26 22:22:49 +0000
++++ src/seat.c	2013-03-29 12:13:00 +0000
+@@ -536,6 +536,7 @@
+     if (!session_name)
+         session_name = seat_get_string_property (seat, "user-session");
+     display_set_user_session (display, SESSION_TYPE_LOCAL, session_name);
++    display_set_config_path (display, config_get_string (config_get_instance (), "LightDM", "config-path"));
+ 
+     seat->priv->displays = g_list_append (seat->priv->displays, display);
+     g_signal_emit (seat, signals[DISPLAY_ADDED], 0, display);
+

pkgs/applications/graphics/rawtherapee/default.nix

@@ -1,18 +1,18 @@
 { stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
-, libXdmcp, lcms2, libiptcdata
+, libXdmcp, lcms2, libiptcdata, libcanberra, fftw
 , mercurial  # Not really needed for anything, but it fails if it does not find 'hg'
 }:
 
 stdenv.mkDerivation rec {
-  name = "rawtherapee-4.0.9";
+  name = "rawtherapee-4.0.10";
   
   src = fetchurl {
-    url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz;
+    url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz;
-    sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a";
+    sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g";
   };
   
   buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
-    lcms2 libiptcdata mercurial ];
+    lcms2 libiptcdata mercurial libcanberra fftw ];
 
   # Disable the use of the RAWZOR propietary libraries
   cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "RAW converter and digital photo processing software";
     homepage = http://www.rawtherapee.com/;
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [viric jcumming];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/misc/pitz/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock
+, nose, decorator, docutils }:
+
+# TODO: pitz has a pitz-shell utility that depends on ipython, but it just
+# errors out and dies (it probably depends on an old ipython version):
+#
+#   from IPython.Shell import IPShellEmbed
+#   ImportError: No module named Shell
+#
+# pitz-shell is not the primary interface, so it is not critical to have it
+# working. Concider fixing pitz upstream.
+
+buildPythonPackage rec {
+  name = "pitz-1.2.4";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "http://pypi.python.org/packages/source/p/pitz/${name}.tar.gz";
+    sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr";
+  };
+
+  # propagatedBuildInputs is needed for pitz to find its dependencies at
+  # runtime. If we use buildInputs it would just build, not run.
+  propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ];
+
+  meta = {
+    description = "Distributed bugtracker";
+    license = stdenv.lib.licenses.bsd3;
+    homepage = http://pitz.tplus1.com/;
+  };
+}

pkgs/applications/video/omxplayer/default.nix

@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, raspberrypifw, pcre, boostHeaders, freetype, zlib }:
+
+let
+  ffmpeg = stdenv.mkDerivation rec {
+    name = "ffmpeg-1.1.3";
+    
+    src = fetchurl {
+      url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+      sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
+    };
+    
+    configureFlags = [
+      "--arch=arm"
+      "--cpu=arm1176jzf-s"
+      "--disable-muxers"
+      "--enable-muxer=spdif"
+      "--enable-muxer=adts"
+      "--disable-encoders"
+      "--enable-encoder=ac3"
+      "--enable-encoder=aac"
+      "--disable-decoder=mpeg_xvmc"
+      "--disable-devices"
+      "--disable-ffprobe"
+      "--disable-ffplay"
+      "--disable-ffserver"
+      "--disable-ffmpeg"
+      "--enable-shared"
+      "--disable-doc"
+      "--enable-postproc"
+      "--enable-gpl"
+      "--enable-protocol=http"
+      "--enable-pthreads"
+      "--disable-runtime-cpudetect"
+      "--enable-pic"
+      "--disable-armv5te"
+      "--disable-neon"
+      "--enable-armv6t2"
+      "--enable-armv6"
+      "--enable-hardcoded-tables"
+      "--disable-runtime-cpudetect"
+      "--disable-debug"
+    ];
+
+    enableParallelBuilding = true;
+      
+    crossAttrs = {
+      dontSetConfigureCross = true;
+      configureFlags = configureFlags ++ [
+        "--cross-prefix=${stdenv.cross.config}-"
+        "--enable-cross-compile"
+        "--target_os=linux"
+        "--arch=${stdenv.cross.arch}"
+        ];
+    };
+
+    meta = {
+      homepage = http://www.ffmpeg.org/;
+      description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    };
+  };
+in
+stdenv.mkDerivation rec {
+  name = "omxplayer-20130328-fbee325dc2";
+  src = fetchurl {
+    url = https://github.com/huceke/omxplayer/tarball/fbee325dc2;
+    name = "${name}.tar.gz";
+    sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg";
+  };
+  patchPhase = ''
+    sed -i 1d Makefile
+    export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/"
+  '';
+  installPhase = ''
+    ensureDir $out/bin
+    cp omxplayer.bin $out/bin
+  '';
+  buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ];
+
+  meta = {
+    homepage = https://github.com/huceke/omxplayer;
+    description = "Commandline OMX player for the Raspberry Pi";
+    license = "GPLv2+";
+  };
+}

pkgs/applications/video/xbmc/default.nix

@@ -30,11 +30,11 @@ assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
 
 stdenv.mkDerivation rec {
-    name = "xbmc-12.0";
+    name = "xbmc-12.1";
 
     src = fetchurl {
       url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
-      sha256 = "0vy1a38gfbp9vhbjvwqm11sd76gl3s9q0h7gwpsks85m2k88q0ak";
+      sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9";
     };
 
     buildInputs = [

pkgs/applications/window-managers/i3/default.nix

@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "http://i3wm.org";
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
   };
 
 }

pkgs/applications/window-managers/i3/lock.nix

@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://i3wm.org;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
   };
 
 }

pkgs/applications/window-managers/i3/status.nix

@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     homepage = http://i3wm.org;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
   };
 
 }

pkgs/development/compilers/chicken/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "chicken-4.8.1";
+
+  meta = {
+    homepage = http://www.call-cc.org/;
+    description = "Chicken Scheme";
+  };
+
+  src = fetchurl {
+    url = http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz;
+    md5 = "bd758ec7abeaeb4f4c92c290fb5f3db7";
+  };
+
+  buildFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
+  installFlags = "PLATFORM=linux PREFIX=$(out) VARDIR=$(out)/var/lib";
+}

pkgs/development/compilers/gcc/4.7/arm-eabi.patch

@@ -0,0 +1,230 @@
+Index: gcc-4_7-branch/libstdc++-v3/configure.host
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/configure.host	(revision 194580)
+@@ -340,7 +340,7 @@
+         fi
+     esac
+     case "${host}" in
+-      arm*-*-linux-*eabi)
++      arm*-*-linux-*eabi*)
+ 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
+ 	;;
+     esac
+Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	(revision 194580)
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+Index: gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
+===================================================================
+--- gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194579)
++++ gcc-4_7-branch/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	(revision 194580)
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+Index: gcc-4_7-branch/libjava/configure.ac
+===================================================================
+--- gcc-4_7-branch/libjava/configure.ac	(revision 194579)
++++ gcc-4_7-branch/libjava/configure.ac	(revision 194580)
+@@ -931,7 +931,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+Index: gcc-4_7-branch/libjava/configure
+===================================================================
+--- gcc-4_7-branch/libjava/configure	(revision 194579)
++++ gcc-4_7-branch/libjava/configure	(revision 194580)
+@@ -20542,7 +20542,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+Index: gcc-4_7-branch/libgcc/config.host
+===================================================================
+--- gcc-4_7-branch/libgcc/config.host	(revision 194579)
++++ gcc-4_7-branch/libgcc/config.host	(revision 194580)
+@@ -327,7 +327,7 @@
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
+ 	case ${host} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	  tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
+ 	  tm_file="$tm_file arm/bpabi-lib.h"
+ 	  unwind_header=config/arm/unwind-arm.h
+Index: gcc-4_7-branch/gcc/doc/install.texi
+===================================================================
+--- gcc-4_7-branch/gcc/doc/install.texi	(revision 194579)
++++ gcc-4_7-branch/gcc/doc/install.texi	(revision 194580)
+@@ -3222,7 +3222,7 @@
+ @heading @anchor{arm-x-eabi}arm-*-eabi
+ ARM-family processors.  Subtargets that use the ELF object format
+ require GNU binutils 2.13 or newer.  Such subtargets include:
+-@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi}
++@code{arm-*-netbsdelf}, @code{arm-*-*linux-gnueabi*}
+ and @code{arm-*-rtemseabi}.
+ 
+ @html
+Index: gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gcc.target/arm/synchronize.c	(revision 194580)
+@@ -1,4 +1,4 @@
+-/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */
++/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi* } } } */
+ 
+ void *foo (void)
+ {
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.jason/enum6.C	(revision 194580)
+@@ -7,10 +7,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ #include <limits.h>
+ 
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.other/enum4.C	(revision 194580)
+@@ -9,10 +9,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ enum E { 
+   a = -312
+Index: gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/g++.old-deja/g++.law/enum9.C	(revision 194580)
+@@ -7,10 +7,10 @@
+ // enum-size attributes should only be emitted if there are values of
+ // enum type that can escape the compilation unit, gcc cannot currently
+ // detect this; if this facility is added then this linker option should
+-// not be needed.  arm-*-linux*eabi should be a good approximation to
++// not be needed.  arm-*-linux*eabi* should be a good approximation to
+ // those platforms where the EABI supplement defines enum values to be
+ // 32 bits wide.
+-// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ 
+ // GROUPS passed enums
+   extern "C" int printf (const char *, ...);
+Index: gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/lib/target-supports.exp	(revision 194580)
+@@ -3818,7 +3818,7 @@
+ 		}
+ 	    } ""
+ 	}]
+-    } elseif { [istarget arm*-*-linux-gnueabi] } {
++    } elseif { [istarget arm*-*-linux-gnueabi*] } {
+ 	return [check_runtime sync_longlong_runtime {
+ 	    #include <stdlib.h>
+ 	    int main ()
+@@ -3860,7 +3860,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-gnueabi*] 
+ 	     || [istarget bfin*-*linux*]
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+@@ -3890,7 +3890,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-gnueabi*] 
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+ 	     || [istarget powerpc*-*-*]
+Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_9.f90	(revision 194580)
+@@ -1,6 +1,6 @@
+ ! { dg-do run }
+ ! { dg-options "-fshort-enums" }
+-! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ ! Program to test enumerations when option -fshort-enums is given
+ 
+ program main
+Index: gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90
+===================================================================
+--- gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194579)
++++ gcc-4_7-branch/gcc/testsuite/gfortran.dg/enum_10.f90	(revision 194580)
+@@ -1,7 +1,7 @@
+ ! { dg-do run }
+ ! { dg-additional-sources enum_10.c }
+ ! { dg-options "-fshort-enums -w" }
+-! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
+ ! Make sure short enums are indeed interoperable with the
+ ! corresponding C type.
+ 
+Index: gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in
+===================================================================
+--- gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194579)
++++ gcc-4_7-branch/gcc/ada/gcc-interface/Makefile.in	(revision 194580)
+@@ -1866,7 +1866,7 @@
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
+-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
++ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+Index: gcc-4_7-branch/gcc/config.gcc
+===================================================================
+--- gcc-4_7-branch/gcc/config.gcc	(revision 194579)
++++ gcc-4_7-branch/gcc/config.gcc	(revision 194580)
+@@ -855,7 +855,7 @@
+ 	esac
+ 	tmake_file="${tmake_file} arm/t-arm"
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+ 	    # Define multilib configuration for arm-linux-androideabi.

pkgs/development/compilers/gcc/4.7/default.nix

@@ -54,7 +54,8 @@ let version = "4.7.2";
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
-    patches = [ ]
+    patches = []
+      ++ optional stdenv.isArm [ ./arm-eabi.patch ]
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its

pkgs/development/interpreters/python/3.3/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   inherit majorVersion version;
 
   src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2";
     sha256 = "1pnsbdzbd3750jcy32sv1760lv7am4x3f33jn1kmdmd82za279gv";
   };
 

pkgs/development/interpreters/ruby/generated.nix

@@ -4,12 +4,12 @@ g: # Get dependencies from patched gems
 {
   aliases = {
     ZenTest = g.ZenTest_4_9_0;
-    actionmailer = g.actionmailer_3_2_12;
+    actionmailer = g.actionmailer_3_2_13;
-    actionpack = g.actionpack_3_2_12;
+    actionpack = g.actionpack_3_2_13;
-    activemodel = g.activemodel_3_2_12;
+    activemodel = g.activemodel_3_2_13;
-    activerecord = g.activerecord_3_2_12;
+    activerecord = g.activerecord_3_2_13;
-    activeresource = g.activeresource_3_2_12;
+    activeresource = g.activeresource_3_2_13;
-    activesupport = g.activesupport_3_2_12;
+    activesupport = g.activesupport_3_2_13;
     addressable = g.addressable_2_3_3;
     arel = g.arel_3_0_2;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
@@ -17,7 +17,7 @@ g: # Get dependencies from patched gems
     aws_sdk = g.aws_sdk_1_8_5;
     bitbucket_backup = g.bitbucket_backup_0_2_2;
     builder = g.builder_3_2_0;
-    buildr = g.buildr_1_4_10;
+    buildr = g.buildr_1_4_11;
     bundler = g.bundler_1_3_4;
     childprocess = g.childprocess_0_3_9;
     chronic = g.chronic_0_9_1;
@@ -28,48 +28,51 @@ g: # Get dependencies from patched gems
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
+    execjs = g.execjs_1_4_0;
     fakes3 = g.fakes3_0_1_5;
-    faraday = g.faraday_0_8_6;
+    faraday = g.faraday_0_8_7;
     faraday_middleware = g.faraday_middleware_0_8_8;
-    ffi = g.ffi_1_4_0;
+    ffi = g.ffi_1_6_0;
     file_tail = g.file_tail_1_0_12;
     foreman = g.foreman_0_62_0;
-    highline = g.highline_1_6_15;
+    highline = g.highline_1_6_16;
     hike = g.hike_1_2_1;
     hoe = g.hoe_3_1_0;
     i18n = g.i18n_0_6_4;
     journey = g.journey_1_0_4;
     jruby_pageant = g.jruby_pageant_1_1_1;
-    jsduck = g.jsduck_4_6_2;
+    jsduck = g.jsduck_4_7_1;
     json = g.json_1_7_7;
     json_pure = g.json_pure_1_7_7;
     libv8 = g.libv8_3_3_10_4;
     macaddr = g.macaddr_1_6_1;
-    mail = g.mail_2_4_4;
+    mail = g.mail_2_5_3;
     mime_types = g.mime_types_1_21;
     minitar = g.minitar_0_5_3;
-    multi_json = g.multi_json_1_6_1;
+    multi_json = g.multi_json_1_7_2;
     multipart_post = g.multipart_post_1_2_0;
     net_sftp = g.net_sftp_2_0_5;
     net_ssh = g.net_ssh_2_6_6;
     nix = g.nix_0_1_1;
-    nokogiri = g.nokogiri_1_5_6;
+    nokogiri = g.nokogiri_1_5_9;
     papertrail = g.papertrail_0_9_7;
     papertrail_cli = g.papertrail_cli_0_9_3;
-    parallel = g.parallel_0_6_2;
+    parallel = g.parallel_0_6_3;
     polyglot = g.polyglot_0_3_3;
     rack = g.rack_1_5_2;
     rack_cache = g.rack_cache_1_2;
     rack_protection = g.rack_protection_1_5_0;
     rack_ssl = g.rack_ssl_1_3_3;
     rack_test = g.rack_test_0_6_2;
-    rails = g.rails_3_2_12;
+    rails = g.rails_3_2_13;
-    railties = g.railties_3_2_12;
+    railties = g.railties_3_2_13;
-    rake = g.rake_10_0_3;
+    rake = g.rake_10_0_4;
     rb_fsevent = g.rb_fsevent_0_9_3;
     rdiscount = g.rdiscount_2_0_7_1;
     rdoc = g.rdoc_3_12_2;
     remote_syslog = g.remote_syslog_1_6_13;
+    right_aws = g.right_aws_3_0_5;
+    right_http_connection = g.right_http_connection_1_3_0;
     rjb = g.rjb_1_4_6;
     rspec = g.rspec_2_11_0;
     rspec_core = g.rspec_core_2_11_1;
@@ -85,9 +88,9 @@ g: # Get dependencies from patched gems
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
     therubyracer = g.therubyracer_0_10_2;
-    thin = g.thin_1_5_0;
+    thin = g.thin_1_5_1;
-    thor = g.thor_0_17_0;
+    thor = g.thor_0_18_0;
-    tilt = g.tilt_1_3_5;
+    tilt = g.tilt_1_3_6;
     tins = g.tins_0_7_2;
     treetop = g.treetop_1_4_12;
     tzinfo = g.tzinfo_0_3_37;
@@ -97,7 +100,7 @@ g: # Get dependencies from patched gems
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
   gems = {
     ZenTest_4_9_0 = {
       basename = ''ZenTest'';
@@ -130,71 +133,71 @@ installed versions.'';
       requiredGems = [  ];
       sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96'';
     };
-    actionmailer_3_2_12 = {
+    actionmailer_3_2_13 = {
       basename = ''actionmailer'';
       meta = {
         description = ''Email composition, delivery, and receiving framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
       };
-      name = ''actionmailer-3.2.12'';
+      name = ''actionmailer-3.2.13'';
-      requiredGems = [ g.actionpack_3_2_12 g.mail_2_4_4 ];
+      requiredGems = [ g.actionpack_3_2_13 g.mail_2_5_3 ];
-      sha256 = ''0rjcyz5p139iv7r9gb9nw6c490mksf6n3rnfxsg6bdaxpabinlc7'';
+      sha256 = ''0ksw1b5rba8l6400qgc6zjdn14q68n6crjmm76ggg32r4wv3xn06'';
     };
-    actionpack_3_2_12 = {
+    actionpack_3_2_13 = {
       basename = ''actionpack'';
       meta = {
         description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
       };
-      name = ''actionpack-3.2.12'';
+      name = ''actionpack-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ];
-      sha256 = ''19p8slf607ssvhd1xkqmk0ddhxqh99faqbgw9i0gyjh1hxyh4apk'';
+      sha256 = ''1m3kd3rwa4z0yik68xi0l9q71lyzq4gdciqaw5w2w9pal1cj8y5w'';
     };
-    activemodel_3_2_12 = {
+    activemodel_3_2_13 = {
       basename = ''activemodel'';
       meta = {
         description = ''A toolkit for building modeling frameworks (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
       };
-      name = ''activemodel-3.2.12'';
+      name = ''activemodel-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_12 g.builder_3_0_4 ];
+      requiredGems = [ g.activesupport_3_2_13 g.builder_3_0_4 ];
-      sha256 = ''1w43k2yhdybrrhph87zhb9shc1j8z1ryhpqy15y7cj9gc4a1bnqf'';
+      sha256 = ''0lpc9ylwm00g66hmgj06iq51m2l234ii7k6qsjiywf9x5fq6khn5'';
     };
-    activerecord_3_2_12 = {
+    activerecord_3_2_13 = {
       basename = ''activerecord'';
       meta = {
         description = ''Object-relational mapper framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
       };
-      name = ''activerecord-3.2.12'';
+      name = ''activerecord-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_37 ];
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.arel_3_0_2 g.tzinfo_0_3_37 ];
-      sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi'';
+      sha256 = ''1z5rrjy2v27xldr24sd4sxi6k6f5anyg20kwj3qyc0jjn8c0gv85'';
     };
-    activeresource_3_2_12 = {
+    activeresource_3_2_13 = {
       basename = ''activeresource'';
       meta = {
         description = ''REST modeling framework (part of Rails).'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
       };
-      name = ''activeresource-3.2.12'';
+      name = ''activeresource-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 ];
+      requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 ];
-      sha256 = ''0dmy7n93ndxfqkccs0mv82dzkr130414djg96qi8njyj07ad84fi'';
+      sha256 = ''1r4ph4cqd32d4lq9bfyv1dpfxc4qndcqhqx7h7xg4p0va7dz251l'';
     };
-    activesupport_3_2_12 = {
+    activesupport_3_2_13 = {
       basename = ''activesupport'';
       meta = {
         description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
-      name = ''activesupport-3.2.12'';
+      name = ''activesupport-3.2.13'';
-      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_6_1 ];
+      requiredGems = [ g.i18n_0_6_1 g.multi_json_1_7_2 ];
-      sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
+      sha256 = ''1vailj8ja9g3s029p5qbvqdpxcis5gcpkl2d6j7a6d36hxlwlf8y'';
     };
     addressable_2_3_3 = {
       basename = ''addressable'';
@@ -270,7 +273,7 @@ rails support and extra plugins for migrations and fixtures.'';
         longDescription = ''AWS SDK for Ruby'';
       };
       name = ''aws-sdk-1.8.5'';
-      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
+      requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_9 g.json_1_7_7 ];
       sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb'';
     };
     bitbucket_backup_0_2_2 = {
@@ -281,7 +284,7 @@ rails support and extra plugins for migrations and fixtures.'';
         longDescription = ''A tool to backup Bitbucket repos.'';
       };
       name = ''bitbucket-backup-0.2.2'';
-      requiredGems = [ g.highline_1_6_15 g.json_1_7_7 ];
+      requiredGems = [ g.highline_1_6_16 g.json_1_7_7 ];
       sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys'';
     };
     builder_3_0_4 = {
@@ -332,7 +335,7 @@ simple to do.  Currently the following builder objects are supported:
       requiredGems = [  ];
       sha256 = ''0f2cpfx6lpazb1wrz3lf06qp6f0qf0gdq5z8xnhkplc3fz3kslb0'';
     };
-    buildr_1_4_10 = {
+    buildr_1_4_11 = {
       basename = ''buildr'';
       meta = {
         description = ''Build like you code'';
@@ -344,9 +347,9 @@ to do, and it takes care of the rest.  But also something we can easily extend
 for those one-off tasks, with a language that's a joy to use.
 '';
       };
-      name = ''buildr-1.4.10'';
+      name = ''buildr-1.4.11'';
       requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ];
-      sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
+      sha256 = ''0bdrwl9jvxc5h2wqsyacr688hxvzcqan1bhqyryb5bg9a5gpscb4'';
     };
     bundler_1_3_4 = {
       basename = ''bundler'';
@@ -367,7 +370,7 @@ for those one-off tasks, with a language that's a joy to use.
         longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
       };
       name = ''childprocess-0.3.9'';
-      requiredGems = [ g.ffi_1_4_0 ];
+      requiredGems = [ g.ffi_1_6_0 ];
       sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
     };
     chronic_0_9_1 = {
@@ -492,6 +495,17 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
+    execjs_1_4_0 = {
+      basename = ''execjs'';
+      meta = {
+        description = ''Run JavaScript code from Ruby'';
+        homepage = ''https://github.com/sstephenson/execjs'';
+        longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
+      };
+      name = ''execjs-1.4.0'';
+      requiredGems = [ g.multi_json_1_7_2 ];
+      sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs'';
+    };
     fakes3_0_1_5 = {
       basename = ''fakes3'';
       meta = {
@@ -499,18 +513,18 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3'';
       };
       name = ''fakes3-0.1.5'';
-      requiredGems = [ g.thor_0_17_0 g.builder_3_2_0 ];
+      requiredGems = [ g.thor_0_18_0 g.builder_3_2_0 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
-    faraday_0_8_6 = {
+    faraday_0_8_7 = {
       basename = ''faraday'';
       meta = {
         description = ''HTTP/REST API client library.'';
         homepage = ''https://github.com/lostisland/faraday'';
       };
-      name = ''faraday-0.8.6'';
+      name = ''faraday-0.8.7'';
       requiredGems = [ g.multipart_post_1_2_0 ];
-      sha256 = ''16jd0gnqfrh5v4v88nlasyjjm8cmf2w2p6gphxq64mvdxlcdy5jy'';
+      sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi'';
     };
     faraday_middleware_0_8_8 = {
       basename = ''faraday_middleware'';
@@ -520,19 +534,19 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Various middleware for Faraday'';
       };
       name = ''faraday_middleware-0.8.8'';
-      requiredGems = [ g.faraday_0_8_6 ];
+      requiredGems = [ g.faraday_0_8_7 ];
       sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
     };
-    ffi_1_4_0 = {
+    ffi_1_6_0 = {
       basename = ''ffi'';
       meta = {
         description = ''Ruby FFI'';
         homepage = ''http://wiki.github.com/ffi/ffi'';
         longDescription = ''Ruby FFI library'';
       };
-      name = ''ffi-1.4.0'';
+      name = ''ffi-1.6.0'';
       requiredGems = [  ];
-      sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
+      sha256 = ''0jhjzj8gb6cakv32a6czgrx8krb0hx8mmkwh5yv2lhdcv3ak013v'';
     };
     file_tail_1_0_12 = {
       basename = ''file_tail'';
@@ -553,10 +567,10 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Process manager for applications with multiple components'';
       };
       name = ''foreman-0.62.0'';
-      requiredGems = [ g.thor_0_17_0 ];
+      requiredGems = [ g.thor_0_18_0 ];
       sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr'';
     };
-    highline_1_6_15 = {
+    highline_1_6_16 = {
       basename = ''highline'';
       meta = {
         description = ''HighLine is a high-level command-line IO library.'';
@@ -567,9 +581,9 @@ crank out anything from simple list selection to complete shells with just
 minutes of work.
 '';
       };
-      name = ''highline-1.6.15'';
+      name = ''highline-1.6.16'';
       requiredGems = [  ];
-      sha256 = ''1ilwlgylv92md9dnw6hqhrw8hiwk3f4k8qz6airqjp1rq9r594m1'';
+      sha256 = ''1v9dps96hryg7c8hqw41vbm1q02d7wpq7fj1c3bkzsd5518idgzi'';
     };
     highline_1_6_2 = {
       basename = ''highline'';
@@ -617,6 +631,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.rake_0_9_6 ];
       sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
     };
+    i18n_0_6_1 = {
+      basename = ''i18n'';
+      meta = {
+        description = ''New wave Internationalization support for Ruby'';
+        homepage = ''http://github.com/svenfuchs/i18n'';
+        longDescription = ''New wave Internationalization support for Ruby.'';
+      };
+      name = ''i18n-0.6.1'';
+      requiredGems = [  ];
+      sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl'';
+    };
     i18n_0_6_4 = {
       basename = ''i18n'';
       meta = {
@@ -650,16 +675,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
     };
-    jsduck_4_6_2 = {
+    jsduck_4_7_1 = {
       basename = ''jsduck'';
       meta = {
         description = ''Simple JavaScript Duckumentation generator'';
         homepage = ''https://github.com/senchalabs/jsduck'';
         longDescription = ''Documentation generator for Sencha JS frameworks'';
       };
-      name = ''jsduck-4.6.2'';
+      name = ''jsduck-4.7.1'';
-      requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
+      requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_3 g.execjs_1_4_0 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
-      sha256 = ''035w4igfa6yy6234ff4zbiqfjn0bhwqs6k8kji52l7gzgskwmzln'';
+      sha256 = ''0yn568ix4j4xpyrsk07cp5c3migsl7ymlg07fsyn5a65yrwyaiyv'';
     };
     json_1_7_7 = {
       basename = ''json'';
@@ -716,16 +741,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [ g.systemu_2_5_2 ];
       sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch'';
     };
-    mail_2_4_4 = {
+    mail_2_5_3 = {
       basename = ''mail'';
       meta = {
         description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.'';
         homepage = ''http://github.com/mikel/mail'';
         longDescription = ''A really Ruby Mail handler.'';
       };
-      name = ''mail-2.4.4'';
+      name = ''mail-2.5.3'';
       requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_4 ];
-      sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
+      sha256 = ''1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k'';
     };
     mime_types_1_21 = {
       basename = ''mime_types'';
@@ -770,16 +795,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
     };
-    multi_json_1_6_1 = {
+    multi_json_1_7_2 = {
       basename = ''multi_json'';
       meta = {
         description = ''A gem to provide swappable JSON backends.'';
         homepage = ''http://github.com/intridea/multi_json'';
         longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
       };
-      name = ''multi_json-1.6.1'';
+      name = ''multi_json-1.7.2'';
       requiredGems = [  ];
-      sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
+      sha256 = ''17mfs58bilkn2b9g3ggh6pz1w4c2a72mqsr6zf0qd8vahw5h158q'';
     };
     multipart_post_1_2_0 = {
       basename = ''multipart_post'';
@@ -836,7 +861,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
       requiredGems = [  ];
       sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k'';
     };
-    nokogiri_1_5_6 = {
+    nokogiri_1_5_9 = {
       basename = ''nokogiri'';
       meta = {
         description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser'';
@@ -847,9 +872,9 @@ many features is the ability to search documents via XPath or CSS3 selectors.
 XML is like violence - if it doesn’t solve your problems, you are not using
 enough of it.'';
       };
-      name = ''nokogiri-1.5.6'';
+      name = ''nokogiri-1.5.9'';
       requiredGems = [  ];
-      sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
+      sha256 = ''08qx4p3p6dd1yh58c4waz5rjmkzv3v315fr0l6n0dgkg71dczbi9'';
     };
     papertrail_0_9_7 = {
       basename = ''papertrail'';
@@ -859,7 +884,7 @@ enough of it.'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
       name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_6 g.faraday_middleware_0_8_8 ];
+      requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
       sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
     };
     papertrail_cli_0_9_3 = {
@@ -873,15 +898,15 @@ enough of it.'';
       requiredGems = [ g.papertrail_0_9_7 ];
       sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv'';
     };
-    parallel_0_6_2 = {
+    parallel_0_6_3 = {
       basename = ''parallel'';
       meta = {
         description = ''Run any kind of code in parallel processes'';
-        homepage = ''http://github.com/grosser/parallel'';
+        homepage = ''https://github.com/grosser/parallel'';
       };
-      name = ''parallel-0.6.2'';
+      name = ''parallel-0.6.3'';
       requiredGems = [  ];
-      sha256 = ''05rdbb1jqv0179wjfj74a1739rsqv7ijf4jp1i5s6lzh878c6l6p'';
+      sha256 = ''17mg4vfx1c4z7399azf982a3cn522m43kavdqfhfs6i89m7z0l9n'';
     };
     polyglot_0_3_3 = {
       basename = ''polyglot'';
@@ -981,27 +1006,27 @@ request helpers feature.'';
       requiredGems = [ g.rack_1_5_2 ];
       sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky'';
     };
-    rails_3_2_12 = {
+    rails_3_2_13 = {
       basename = ''rails'';
       meta = {
         description = ''Full-stack web application framework.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
       };
-      name = ''rails-3.2.12'';
+      name = ''rails-3.2.13'';
-      requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_4 ];
+      requiredGems = [ g.activesupport_3_2_13 g.actionpack_3_2_13 g.activerecord_3_2_13 g.activeresource_3_2_13 g.actionmailer_3_2_13 g.railties_3_2_13 g.bundler_1_3_4 ];
-      sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
+      sha256 = ''1f5w4ivy0jxpjf1gkav064i0gd5x9xqnznwrkbc3slc9savprifz'';
     };
-    railties_3_2_12 = {
+    railties_3_2_13 = {
       basename = ''railties'';
       meta = {
         description = ''Tools for creating, working with, and running Rails applications.'';
         homepage = ''http://www.rubyonrails.org'';
         longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
       };
-      name = ''railties-3.2.12'';
+      name = ''railties-3.2.13'';
-      requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_2 g.activesupport_3_2_12 g.actionpack_3_2_12 ];
+      requiredGems = [ g.rake_10_0_4 g.rack_ssl_1_3_3 g.thor_0_18_0 g.rdoc_3_12_2 g.activesupport_3_2_13 g.actionpack_3_2_13 ];
-      sha256 = ''0d8wy1n591x12bigj3jh8c9djzi8k68vh14342mc22raxwp5rwdw'';
+      sha256 = ''01wbqfnlrs9nbs0b97dbxh7aap2bma7my530pcggxdf8ckms8kr9'';
     };
     rake_0_9_2_2 = {
       basename = ''rake'';
@@ -1025,16 +1050,16 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc'';
     };
-    rake_10_0_3 = {
+    rake_10_0_4 = {
       basename = ''rake'';
       meta = {
         description = ''Ruby based make-like utility.'';
         homepage = ''http://rake.rubyforge.org'';
         longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.'';
       };
-      name = ''rake-10.0.3'';
+      name = ''rake-10.0.4'';
       requiredGems = [  ];
-      sha256 = ''09vvf3ylhdkr10vz7ajl3c7ql6dsnzkh3qclpafar433bzadfbpf'';
+      sha256 = ''032z0csyi5bjfgzq3winvqvi9fpf3bfx518hzzapkfy90y702ds1'';
     };
     rb_fsevent_0_9_3 = {
       basename = ''rb_fsevent'';
@@ -1083,6 +1108,73 @@ See RDoc for a description of RDoc's markup and basic use.'';
       requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ];
       sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw'';
     };
+    right_aws_3_0_5 = {
+      basename = ''right_aws'';
+      meta = {
+        description = ''The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.'';
+        longDescription = ''== DESCRIPTION:
+
+The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.
+These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon.
+The RightScale AWS gems comprise:
+
+- RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the
+  associated EBS (Elastic Block Store)
+- RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
+- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01)
+- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01)
+- RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
+- RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
+
+== FEATURES:
+
+- Full programmmatic access to EC2, EBS, S3, SQS, SDB, and CloudFront.
+- Complete error handling: all operations check for errors and report complete
+  error information by raising an AwsError.
+- Persistent HTTP connections with robust network-level retry layer using
+  RightHttpConnection).  This includes socket timeouts and retries.
+- Robust HTTP-level retry layer.  Certain (user-adjustable) HTTP errors returned
+  by Amazon's services are classified as temporary errors.
+  These errors are automaticallly retried using exponentially increasing intervals.
+  The number of retries is user-configurable.
+- Fast REXML-based parsing of responses (as fast as a pure Ruby solution allows).
+- Uses libxml (if available) for faster response parsing.
+- Support for large S3 list operations.  Buckets and key subfolders containing
+  many (> 1000) keys are listed in entirety.  Operations based on list (like
+  bucket clear) work on arbitrary numbers of keys.
+- Support for streaming GETs from S3, and streaming PUTs to S3 if the data source is a file.
+- Support for single-threaded usage, multithreaded usage, as well as usage with multiple
+  AWS accounts.
+- Support for both first- and second-generation SQS (API versions 2007-05-01
+  and 2008-01-01).  These versions of SQS are not compatible.
+- Support for signature versions 0 and 1 on SQS, SDB, and EC2.
+- Interoperability with any cloud running Eucalyptus (http://eucalyptus.cs.ucsb.edu)
+- Test suite (requires AWS account to do "live" testing).
+'';
+      };
+      name = ''right_aws-3.0.5'';
+      requiredGems = [ g.right_http_connection_1_3_0 ];
+      sha256 = ''0pxdmxmqiidy3dpxsp4l0b1l6nq9b1sh4p1gkzalqm4l24646h4k'';
+    };
+    right_http_connection_1_3_0 = {
+      basename = ''right_http_connection'';
+      meta = {
+        description = ''RightScale's robust HTTP/S connection module'';
+        homepage = ''http://rightscale.rubyforge.org/'';
+        longDescription = ''Rightscale::HttpConnection is a robust HTTP/S library.  It implements a retry
+algorithm for low-level network errors.
+
+== FEATURES:
+
+- provides put/get streaming
+- does configurable retries on connect and read timeouts, DNS failures, etc.
+- HTTPS certificate checking
+'';
+      };
+      name = ''right_http_connection-1.3.0'';
+      requiredGems = [  ];
+      sha256 = ''0900zy2ya57vhxdkdm2gj7xmvzj4gwm5l7ad0lh68ka3vxhdi7ap'';
+    };
     rjb_1_4_2 = {
       basename = ''rjb'';
       meta = {
@@ -1202,7 +1294,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
       name = ''selenium-webdriver-2.31.0'';
-      requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
+      requiredGems = [ g.multi_json_1_7_2 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
       sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
     };
     servolux_0_10_0 = {
@@ -1227,7 +1319,7 @@ interpreters.'';
         longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
       };
       name = ''sinatra-1.3.2'';
-      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_5 ];
+      requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_6 ];
       sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
     };
     sprockets_2_2_2 = {
@@ -1238,7 +1330,7 @@ interpreters.'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
       name = ''sprockets-2.2.2'';
-      requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_5 ];
+      requiredGems = [ g.hike_1_2_1 g.multi_json_1_7_2 g.rack_1_5_2 g.tilt_1_3_6 ];
       sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
     };
     syslog_protocol_0_9_2 = {
@@ -1274,38 +1366,38 @@ interpreters.'';
       requiredGems = [ g.libv8_3_3_10_4 ];
       sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
     };
-    thin_1_5_0 = {
+    thin_1_5_1 = {
       basename = ''thin'';
       meta = {
         description = ''A thin and fast web server'';
         homepage = ''http://code.macournoyer.com/thin/'';
         longDescription = ''A thin and fast web server'';
       };
-      name = ''thin-1.5.0'';
+      name = ''thin-1.5.1'';
       requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ];
-      sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1'';
+      sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga'';
     };
-    thor_0_17_0 = {
+    thor_0_18_0 = {
       basename = ''thor'';
       meta = {
         description = ''A scripting framework that replaces rake, sake and rubigen'';
         homepage = ''http://whatisthor.com/'';
         longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
       };
-      name = ''thor-0.17.0'';
+      name = ''thor-0.18.0'';
       requiredGems = [  ];
-      sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2'';
+      sha256 = ''0m7pl518j5q1ymgxmsi6xfjp6k40mwbmzk33s760v53azwxkfxan'';
     };
-    tilt_1_3_5 = {
+    tilt_1_3_6 = {
       basename = ''tilt'';
       meta = {
         description = ''Generic interface to multiple Ruby template engines'';
         homepage = ''http://github.com/rtomayko/tilt/'';
         longDescription = ''Generic interface to multiple Ruby template engines'';
       };
-      name = ''tilt-1.3.5'';
+      name = ''tilt-1.3.6'';
       requiredGems = [  ];
-      sha256 = ''081saxdxnal4ky38a904jw3n2837m80g211w0zm5rx6m712mb6qd'';
+      sha256 = ''1yz6zfnwq0qyjn71115vd63ly8zm1jss0b2v7fbcbzzj9lrnq9y6'';
     };
     tins_0_7_2 = {
       basename = ''tins'';

pkgs/development/libraries/fftw/default.nix

@@ -1,4 +1,4 @@
-{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}:
+{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false, float ? false}:
 let
   version = "3.3.2";
   localDefs = builderDefs.passthru.function { 
@@ -12,6 +12,7 @@ let
                         # some distros seem to be shipping both versions within the same package?
                         # why does --enable-float still result in ..3f.so instead of ..3.so?
                    ++ (if singlePrecision then [ "--enable-single" ] else [ ])
+                   ++ (if float then [ "--enable-float" ] else [ ])
 		   ++ (stdenv.lib.optional (!pthreads) "--enable-openmp")
 		   ++ (stdenv.lib.optional pthreads "--enable-threads")
                         # I think all i686 has sse

pkgs/development/libraries/glibc/2.17/common.nix

@@ -32,14 +32,17 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
 
   patches =
-    [ /* Have rpcgen(1) look for cpp(1) in $PATH.  */
+    [ /* Have rpcgen(1) look for cpp(1) in $PATH.
-      ./rpcgen-path.patch
+         On GNU/Hurd, use the old version of the patch since the new one
+         doesn't apply.  */
+      (if hurdHeaders != null
+       then ../2.13/rpcgen-path.patch
+       else ./rpcgen-path.patch)
 
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch
 
-      /* Don't use /etc/ld.so.cache, for non-NixOS systems.  Currently
+      /* Don't use /etc/ld.so.cache, for non-NixOS systems.  */
-         disabled on GNU/Hurd, which uses a more recent libc snapshot. */
       ./dont-use-system-ld-so-cache.patch
 
       /* Without this patch many KDE binaries crash. */

pkgs/development/libraries/haskell/case-insensitive/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "1.0";
+  version = "1.0.0.1";
-  sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk";
+  sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {

pkgs/development/libraries/haskell/certificate/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "certificate";
-  version = "1.3.5";
+  version = "1.3.6";
-  sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j";
+  sha256 = "1w7xndslapy4ycgf2xshgx90i3v04nsck9l2mzc74nrnwm817b2m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/conduit/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.0.4.1";
+  version = "1.0.4.2";
-  sha256 = "1fihn6ixs6cmim5y605w2mzjrcwplr58r835wq9k3arb25d5wnys";
+  sha256 = "11xrqn7jc4vccfwds6hy0d3jpm0d0ycwaszv18xk237zwl63w159";
   buildDepends = [
     liftedBase mmorph monadControl resourcet text transformers
     transformersBase void

pkgs/development/libraries/haskell/cryptohash/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.8.3";
+  version = "0.8.4";
-  sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2";
+  sha256 = "0h58apxcrvpkyj3s2c7l68g7biv80snkn53g6jya1s687xff8fmn";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit

pkgs/development/libraries/haskell/diagrams/lib.nix

@@ -4,13 +4,12 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "0.6.0.1";
+  version = "0.6.0.2";
-  sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj";
+  sha256 = "0jxpbggwgbjnl2yx7y0zcjs2fls7y1wm33wllq5j9snkiz1n81hb";
   buildDepends = [
     active colour dataDefault diagramsCore monoidExtras newtype
     NumInstances semigroups vectorSpace
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative graphics";

pkgs/development/libraries/haskell/dual-tree/default.nix

@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "dual-tree";
-  version = "0.1.0.1";
+  version = "0.1.0.2";
-  sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2";
+  sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0";
   buildDepends = [ monoidExtras newtype semigroups ];
-  jailbreak = true;
   meta = {
     description = "Rose trees with cached and accumulating monoidal annotations";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/fclabels/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.1.4.3";
+  version = "1.1.5";
-  sha256 = "10qr0ncsqxg0dg2f73ip873gr342saxhidaf3c6g5vr03cvmmkap";
+  sha256 = "0g9h1mayzf8v9dg84b54cqjbz9m9hdmj9a2zh0lg2kbc1v7iwlx1";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";

pkgs/development/libraries/haskell/generic-deriving/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.4.0";
+  version = "1.5.0";
-  sha256 = "15av3l4m4qn5by41rkpdvp1kyp3fi9ixvy76wmyj20c46kjbmra7";
+  sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/hackage-db/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, filepath, tar }:
+{ cabal, Cabal, filepath, tar, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "hackage-db";
-  version = "1.4";
+  version = "1.5";
-  sha256 = "12z1ak21xc9v373j956gz8l4ryj0582lgbl9ykp8q46n9b8sxfph";
+  sha256 = "1m7f6vwgjzibk8rd14y6m62xv5969ns94a57sansi9d83q6rj9iv";
-  buildDepends = [ Cabal filepath tar ];
+  buildDepends = [ Cabal filepath tar utf8String ];
   meta = {
     homepage = "http://github.com/peti/hackage-db";
     description = "provide access to the Hackage database via Data.Map";

pkgs/development/libraries/haskell/hspec-expectations/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-expectations";
-  version = "0.3.0.3";
+  version = "0.3.2";
-  sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74";
+  sha256 = "0962wlngqck0wc7mcby9bzci1s8d9a91vsm39rnab5wifhc2c6xi";
   buildDepends = [ HUnit ];
   testDepends = [ hspec HUnit markdownUnlit silently ];
   doCheck = false;

pkgs/development/libraries/haskell/hspec-meta/default.nix

@@ -1,16 +1,16 @@
 { cabal, ansiTerminal, filepath, hspecExpectations, HUnit
-, QuickCheck, setenv, silently, time, transformers
+, QuickCheck, quickcheckIo, setenv, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.4.5";
+  version = "1.5.1";
-  sha256 = "0k50vwzg3ka4727bj63y4gsvw4g80gnalj31rsbvj3afl9gikkk7";
+  sha256 = "1js62n2mxv4mj4w89ymz5cn3d2qznjndzk3c78gmy6chvig23zlf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
+    ansiTerminal filepath hspecExpectations HUnit QuickCheck
-    silently time transformers
+    quickcheckIo setenv time transformers
   ];
   doCheck = false;
   meta = {

pkgs/development/libraries/haskell/hspec/default.nix

@@ -1,21 +1,21 @@
 { cabal, ansiTerminal, doctest, filepath, ghcPaths
-, hspecExpectations, hspecMeta, HUnit, QuickCheck, setenv, silently
+, hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
-, time, transformers
+, setenv, silently, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.4.5";
+  version = "1.5.1";
-  sha256 = "1dfwc1gjsawafi6k19hsw4kd5ahp8a9hdkyrm7nhjp4kjzgd2ymf";
+  sha256 = "0iz34hgwir07g2qv3zdkg5k5wrv68qd0c77xkpfcs653fi28i91a";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
+    ansiTerminal filepath hspecExpectations HUnit QuickCheck
-    silently time transformers
+    quickcheckIo setenv time transformers
   ];
   testDepends = [
     ansiTerminal doctest filepath ghcPaths hspecExpectations hspecMeta
-    HUnit QuickCheck setenv silently time transformers
+    HUnit QuickCheck quickcheckIo setenv silently time transformers
   ];
   meta = {
     homepage = "http://hspec.github.com/";

pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix

@@ -0,0 +1,28 @@
+{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy
+, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol
+, testFramework, testFrameworkHunit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "language-c-quote";
+  version = "0.7.1";
+  sha256 = "14gh944wpwg4csxwswr9jlll4p5wc3x1fhbqsfh9lqf98ys7ij3z";
+  buildDepends = [
+    exceptionMtl exceptionTransformers filepath haskellSrcMeta
+    mainlandPretty mtl srcloc syb symbol
+  ];
+  testDepends = [
+    HUnit srcloc symbol testFramework testFrameworkHunit
+  ];
+  buildTools = [ alex happy ];
+  meta = {
+    homepage = "http://www.eecs.harvard.edu/~mainland/";
+    description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/lens/default.nix

@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.8.7.3";
+  version = "3.9.0.2";
-  sha256 = "0z28vv3k6zg2zsd3pb1vlhv75q0zjlh4zf1md77cviyyljwc0j09";
+  sha256 = "0ch38z33zgdyzjmc7jqwabwq68iidicpzhbwzpd4fvcqdp27apl2";
   buildDepends = [
     bifunctors comonad comonadsFd comonadTransformers contravariant
     distributive filepath genericDeriving hashable

pkgs/development/libraries/haskell/liblastfm/default.nix

@@ -1,14 +1,18 @@
-{ cabal, aeson, cereal, cryptoApi, httpConduit, httpTypes, network
+{ cabal, aeson, attoparsec, cereal, cryptoApi, httpConduit
-, pureMD5, text
+, httpTypes, HUnit, network, pureMD5, testFramework
+, testFrameworkHunit, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "liblastfm";
-  version = "0.1.1.0";
+  version = "0.1.1.2";
-  sha256 = "1yrgyb0m1gdhsrkv3b8a5a0qii67v9gx1kbv79ixlac60bsm4q95";
+  sha256 = "1zckgjc0r2s1s6s9s309dr2ri8bzj1fi8gcbhm3hifczq1v149w9";
   buildDepends = [
     aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
   ];
+  testDepends = [
+    aeson attoparsec HUnit testFramework testFrameworkHunit text
+  ];
   meta = {
     description = "Lastfm API interface";
     license = self.stdenv.lib.licenses.mit;

pkgs/development/libraries/haskell/lifted-base/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.0.2";
+  version = "0.2.0.3";
-  sha256 = "19xzparj0k5h4wx71gvbd7l653fak1p57za236sncmar8cps5pdx";
+  sha256 = "1sfrak4jf3mvns9y6iadyhj8zvy4wyrqiaxihrxv2qby14c45psx";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];

pkgs/development/libraries/haskell/monoid-extras/default.nix

@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.2.2.2";
+  version = "0.2.2.3";
-  sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22";
+  sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax";
   buildDepends = [ semigroups ];
-  jailbreak = true;
   meta = {
     description = "Various extra monoid-related definitions and utilities";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/multiarg/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "multiarg";
-  version = "0.10.0.0";
+  version = "0.12.0.2";
-  sha256 = "09clgin66i2m0b3ws7di9p15cy9bd144as832xpx4li6cfbg16ip";
+  sha256 = "0f90dsa5ya55lrc0x0ziz01fjvaq85q4f8zsfci1w1rgxa9m7naa";
   buildDepends = [ explicitException utf8String ];
   meta = {
     homepage = "https://github.com/massysett/multiarg";

pkgs/development/libraries/haskell/persistent-postgresql/default.nix

@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     aeson conduit monadControl persistent postgresqlLibpq
     postgresqlSimple text time transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Backend for the persistent library using postgresql";

pkgs/development/libraries/haskell/profunctors/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctors";
-  version = "3.3";
+  version = "3.3.0.1";
-  sha256 = "0cvar0qr2yf0lmqwhiy2ibajiq9cmqy2ikwn8l5mdxxh5q5rwgjj";
+  sha256 = "16d7xg929r4smmmcgi54bz7rsjxs6psksrdvzl4336sjpp3dw5h2";
   buildDepends = [ comonad tagged ];
   meta = {
     homepage = "http://github.com/ekmett/profunctors/";

pkgs/development/libraries/haskell/quickcheck-io/default.nix

@@ -0,0 +1,13 @@
+{ cabal, HUnit, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "quickcheck-io";
+  version = "0.1.0";
+  sha256 = "167ds7c7p1lcfsylxhq2sr0jxbviyim1n42dhyr0s0b6hazw8cjs";
+  buildDepends = [ HUnit QuickCheck ];
+  meta = {
+    description = "Use HUnit assertions as QuickCheck properties";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/reflection/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reflection";
-  version = "1.1.7";
+  version = "1.2.0.1";
-  sha256 = "073v9y09fvh7nsfqp1jp2ncrq0xkcv5fvikl769ghv2ycgkfxl4z";
+  sha256 = "17pzw45yr13nq9y9nb3siypj5amkixy82xm8bpy0nzs1cdfyawx6";
   buildDepends = [ tagged ];
   meta = {
     homepage = "http://github.com/ekmett/reflection";

pkgs/development/libraries/haskell/shake/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.10.1";
+  version = "0.10.2";
-  sha256 = "0k8hk5aw5xk4aq7g8yjlkn1rjhcdy3jd5mna9phjs23kmfsmayk6";
+  sha256 = "0045dz46iacrihqlsdg00zmnkrma5swnmy2bp4h91fx0829lki9n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/snap/snap.nix

@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   jailbreak = true;
+  patchPhase = ''
+    sed -i -e 's|lens .*>= 3.7.6.*$|lens|' snap.cabal
+  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";

pkgs/development/libraries/haskell/split/0.2.1.3.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "split";
-  version = "0.2.1.2";
+  version = "0.2.1.3";
-  sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi";
+  sha256 = "1s3aga7asxz495bx7i72a6fkdlz1zv20rrrqg1avj7b1sjn3gy9w";
   testDepends = [ QuickCheck ];
   meta = {
     description = "Combinator library for splitting lists";

pkgs/development/libraries/haskell/unix-compat/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-compat";
-  version = "0.4.1.0";
+  version = "0.4.1.1";
-  sha256 = "155m3zg692zbfyck4njx1vzvb5vgs0dkzyzlqf2x78ds6j9bzjzi";
+  sha256 = "1cjny6zca5wdj7d56kjkaxlad85kknn91pisrizjy6wngszyaigf";
   meta = {
     homepage = "http://github.com/jystic/unix-compat";
     description = "Portable POSIX-compatibility layer";

pkgs/development/libraries/haskell/vector-space-points/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-space-points";
-  version = "0.1.2.0";
+  version = "0.1.2.1";
-  sha256 = "19azl6g14rsxs0qbik6x637qw9jv4xl01w65xd0xh7833mypmj6d";
+  sha256 = "0prbmk48xdr2gbxqpv0g89xz5v3k9wps9v2gymkh32jag2lgzi66";
   buildDepends = [ newtype vectorSpace ];
   meta = {
     description = "A type for points, as distinct from vectors";

pkgs/development/libraries/libiconv/default.nix

@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
   # will actually use.
   configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ];
 
+  crossAttrs = {
+    # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
+    dontStrip = true;
+    dontCrossStrip = true;
+  };
+
   meta = {
     description = "GNU libiconv, an iconv(3) implementation";
 

pkgs/development/libraries/libvirt/default.nix

@@ -3,14 +3,14 @@
 , libtasn1, ebtables, libgcrypt, yajl
 }:
 
-let version = "1.0.2"; in
+let version = "1.0.3"; in
 
 stdenv.mkDerivation {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
-    sha256 = "0yf104r1377pg0kmx6sshmh8v5z0bdvv6266y5gbcn46yx92g34v";
+    sha256 = "0mr727n0ygxk6y69srg3ahmjd7wligamw683x2snmz6wgk6llkzn";
   };
 
   buildInputs =
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
   postInstall =
     ''
-      substituteInPlace $out/etc/rc.d/init.d/libvirt-guests \
+      substituteInPlace $out/libexec/libvirt-guests.sh \
         --replace "$out/bin" "${gettext}/bin"
     '';
 

pkgs/development/libraries/ti-rpc/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-0.2.2";
+  name = "libtirpc-0.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705";
+    sha256 = "0g4jd8da0kfxz5lv1x5v7f3mfxw53cck8g2zz4llrjmlj42flaag";
   };
 
   # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf

pkgs/development/libraries/xmlsec/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool }:
+
+let
+  version = "1.2.19";
+in
+stdenv.mkDerivation rec {
+  name = "xmlsec-${version}";
+
+  src = fetchurl {
+    url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
+    sha256 = "1h5ar0h8n0l8isgic82w00cwfpw7i9wxw17kbdb6q3yvzb4zgj1g";
+  };
+
+  buildInputs = [ libxml2 gnutls libxslt pkgconfig libgcrypt libtool ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://www.aleksey.com/xmlsec;
+    description = "XML Security Library in C based on libxml2";
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/tools/build-managers/leiningen/default.nix

@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.0.0";
+  version = "2.1.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "0malymlswxwgh8amkw37qjb8n34ylw3chgbdxgxkq34rkvhv60hb";
+    sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
   };
 
   jarsrc = fetchurl {
-    url = "https://leiningen.s3.amazonaws.com/downloads/leiningen-2.0.0-standalone.jar";
+    url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
-    sha256 = "10jvk19mr5dcl5a9kzna9zslh77v3ixi8awhrhxi30dn1yj3r7ck";
+    sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
   };
 
-  patches = ./lein_2.0.0.patch;
+  patches = ./lein_2.1.2.patch;
 
   inherit rlwrap clojure;
 
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     description = "Project automation for Clojure";
     license = "EPL";
     platforms = stdenv.lib.platforms.unix;
+    maintainer = with stdenv.lib.maintainers; [the-kenny];
   };
 }

pkgs/games/anki/default.nix

@@ -63,5 +63,6 @@ stdenv.mkDerivation rec {
         * even practicing guitar chords!
       '';
       license = "GPLv3";
+      platforms = stdenv.lib.platforms.all;
     };
 }

pkgs/games/spring/default.nix

@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "0.91.0";
+  version = "94.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/springrts/spring_91.0_src.tar.lzma";
+    url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "0ycn9yxpbw58a8p3j3wf3r0x102k665l27bfp1vxq7kpwlk6314l";
+    sha256 = "19myqwpz4mi4zdlcv8318dps0ymmw7qpawhq1rgk73ycmaiyaaka";
   };
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL

pkgs/games/spring/springlobby.nix

@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar
+{ stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar, libpng, libX11
 , gettext, bash, gawk, boost}:
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.146";
+  version = "0.169";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "55899baf6732e48bfaa36d80974aa135c051d2cbb6fe92fbcffd80440639eedf";
+    sha256 = "1wr8q2ha3wh718rr5rg7l6v404nf1rgkg4wkja77rfqy7r18zn7g";
   };
 
-  buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost];
+  buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 ];
 
   prePatch = ''
     substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"

pkgs/lib/maintainers.nix

@@ -26,6 +26,7 @@
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
+  the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   neznalek = "Vladimír Čunát <vcunat@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";

pkgs/misc/emulators/mupen64plus/1.5.nix

@@ -0,0 +1,33 @@
+{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
+
+stdenv.mkDerivation {
+  name = "mupen64plus-1.5";
+  src = fetchurl {
+    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
+    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
+  };
+  
+  buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
+  
+  preConfigure = ''
+    # Some C++ incompatibility fixes
+    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
+    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
+
+    # Fix some hardcoded paths
+    sed -i -e "s|/usr/local|$out|g" main/main.c
+
+    # Remove PATH environment variable from install script
+    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
+  '';
+  
+  buildPhase = "make all";
+  installPhase = "PREFIX=$out make install";
+  
+  meta = {
+    description = "A Nintendo 64 Emulator";
+    license = "GPLv2+";
+    homepage = http://code.google.com/p/mupen64plus;
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}

pkgs/misc/emulators/wine/winetricks.nix

@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url = "http://winetricks.googlecode.com/svn/trunk";
     inherit rev;
+    sha256 = "01v13qw4sxmfm09g9amqycnzy743gdrhvv23rjr9255dzlrj1s8f";
   };
 
   buildInputs = [ perl which ];

pkgs/misc/emulators/wxmupen64plus/default.nix

@@ -0,0 +1,28 @@
+{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, mesa}:
+
+stdenv.mkDerivation {
+  name = "wxmupen64plus-0.3";
+  src = fetchurl {
+    url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2";
+    sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
+  };
+  
+  buildInputs = [ python wxGTK29 SDL libX11 mesa ];
+
+  configurePhase = ''
+    tar xf ${mupen64plus.src}
+    APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api)
+    export CXXFLAGS="-I${libX11}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\""
+    export LDFLAGS="-lwx_gtk2u_adv-2.9"
+    python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out
+  '';
+
+  buildPhase = "python waf";
+  installPhase = "python waf install";
+  
+  meta = {
+    description = "GUI for the Mupen64Plus 2.0 emulator";
+    license = "GPLv2+";
+    homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home;
+  };
+}

pkgs/os-specific/linux/google-authenticator/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pam }:
+
+stdenv.mkDerivation rec {
+  name = "google-authenticator-1.0";
+
+  src = fetchurl {
+    url = "https://google-authenticator.googlecode.com/files/libpam-${name}-source.tar.bz2";
+    sha1 = "017b7d89989f1624e360abe02d6b27a6298d285d";
+  };
+
+  buildInputs = [ pam ];
+
+  installPhase = ''
+    ensureDir $out/bin $out/lib/security
+    cp pam_google_authenticator.so $out/lib/security
+    cp google-authenticator $out/bin
+  '';
+
+  meta = {
+    homepage = https://code.google.com/p/google-authenticator/;
+    description = "Two-step verification, with pam module";
+    license = "ASL2.0";
+  };
+}

pkgs/os-specific/linux/kernel/linux-3.8.nix

@@ -252,7 +252,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.8.4";
+    version = "3.8.5";
     testing = false;
 
     preConfigure = ''
@@ -261,7 +261,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0sxh4nwmj49n9l0rnfpgvgvgxx47mdfmpg5syvn854zfb5sv0fvy";
+      sha256 = "1f1b6e09cb6ba656b28a41eb9e16e11576879f14574c0cb861b24734f3c5899f";
     };
 
     config = configWithPlatform stdenv.platform;

pkgs/os-specific/linux/otpw/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pam }:
+
+stdenv.mkDerivation rec {
+  name = "otpw-1.3";
+
+  src = fetchurl {
+    url = "http://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz";
+    sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk";
+  };
+
+  patchPhase = ''
+    sed -i 's/^CFLAGS.*/CFLAGS=-O2 -fPIC/' Makefile
+    sed -i -e 's,PATH=.*;,,' conf.h
+    sed -i -e '/ENTROPY_ENV/d' otpw-gen.c
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/lib/security $out/share/man/man{1,8}
+    cp pam_*.so $out/lib/security
+    cp otpw-gen $out/bin
+    cp *.1 $out/share/man/man1
+    cp *.8 $out/share/man/man8
+  '';
+
+  buildInputs = [ pam ];
+
+  meta = {
+    homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html;
+    description = "A one-time password login package";
+    license = "GPLv2+";
+  };
+}

pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch

@@ -1,7 +1,7 @@
-From ebbb4bc256e1ed53c594fc54d9e1a9faf5a5f77a Mon Sep 17 00:00:00 2001
+From 75bc507c854a8fe1f819a6b04ebe9e05cd9c425c Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:44:33 +0100
-Subject: [PATCH 1/8] Make "systemctl daemon-reexec" do the right thing on
+Subject: [PATCH 1/7] Make "systemctl daemon-reexec" do the right thing on
  NixOS
 
 ---

pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch

@@ -1,14 +1,14 @@
-From 64c36ac79fca8f0214faed8b7aff19b379b1ac1b Mon Sep 17 00:00:00 2001
+From b8acf19dbd37f801d5eeb76170f84bc8d75e464c Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:45:01 +0100
-Subject: [PATCH 2/8] Ignore duplicate paths in "systemctl start"
+Subject: [PATCH 2/7] Ignore duplicate paths in "systemctl start"
 
 ---
  src/systemctl/systemctl.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index edd136a..86ce32a 100644
+index 1191c7a..4cd64f5 100644
 --- a/src/systemctl/systemctl.c
 +++ b/src/systemctl/systemctl.c
 @@ -1510,8 +1510,10 @@ static int start_unit_one(

pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch

@@ -1,7 +1,7 @@
-From 776093e73b86bcddfeb0971cb6267d13d07f0a81 Mon Sep 17 00:00:00 2001
+From 7e7d0ebc8617dfdae4ece9f5b66dc63031bb3fbc Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:46:30 +0100
-Subject: [PATCH 3/8] Start device units for uninitialised encrypted devices
+Subject: [PATCH 3/7] Start device units for uninitialised encrypted devices
 
 This is necessary because the NixOS service that initialises the
 filesystem depends on the appearance of the device unit.  Also, this

pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch

@@ -1,7 +1,7 @@
-From 0bc7513439a8b77f62bc8ebcf220b77f83321b75 Mon Sep 17 00:00:00 2001
+From fa5fabd0123f2d5be7efa877f8dbbf0ae7b929da Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:48:19 +0100
-Subject: [PATCH 4/8] Set switch-to-configuration hints for some units
+Subject: [PATCH 4/7] Set switch-to-configuration hints for some units
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch

@@ -1,7 +1,7 @@
-From 5337d8f5a555f83ba8731472a2f3b0d36ac607d9 Mon Sep 17 00:00:00 2001
+From c2dce9a0088f7d155659bcbf1e9e69467e679244 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 15:56:03 +0100
-Subject: [PATCH 5/8] sysinit.target: Drop the dependency on local-fs.target
+Subject: [PATCH 5/7] sysinit.target: Drop the dependency on local-fs.target
  and swap.target
 
 Having all services with DefaultDependencies=yes depend on

pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch

@@ -1,7 +1,7 @@
-From b944fede26773167cb6a9f86888a9209dda4c35e Mon Sep 17 00:00:00 2001
+From f1b273a7203da1dd3ef51529b5b2e481c7a8d999 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Tue, 8 Jan 2013 18:36:28 +0100
-Subject: [PATCH 6/8] Don't call "plymouth quit"
+Subject: [PATCH 6/7] Don't call "plymouth quit"
 
 NixOS doesn't use Plymouth (yet).
 ---

pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch

@@ -1,7 +1,7 @@
-From b9f175c7b3ea6ac34d148f5afba598f985c5b9fe Mon Sep 17 00:00:00 2001
+From 61fa587560634d5c71a62a4a2fc2a37eb043e9a4 Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra@logicblox.com>
 Date: Mon, 4 Feb 2013 12:41:14 +0100
-Subject: [PATCH 7/8] Ignore IPv6 link-local addresses
+Subject: [PATCH 7/7] Ignore IPv6 link-local addresses
 
 Returning IPv6 link-local addresses is a bad idea, because they only
 work if an application connects specifically over the corresponding

pkgs/os-specific/linux/systemd/0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch

@@ -1,28 +0,0 @@
-From dcfb048af5face4787ecdf29c00454898c52963d Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Wed, 27 Mar 2013 13:33:09 +0100
-Subject: [PATCH 8/8] systemd-sysctl: Handle missing /etc/sysctl.conf properly
-
-Since fabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda, systemd-sysctl returns
-a non-zero exit code if /etc/sysctl.conf does not exist, due to a
-broken ENOENT check.
----
- src/sysctl/sysctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 2d43660..79f3f77 100644
---- a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -125,7 +125,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
- 
-         r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f);
-         if (r < 0) {
--                if (ignore_enoent && errno == -ENOENT)
-+                if (ignore_enoent && r == -ENOENT)
-                         return 0;
- 
-                 log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r));
--- 
-1.8.1
-

pkgs/os-specific/linux/systemd/default.nix

@@ -6,11 +6,11 @@
 assert stdenv.gcc.libc or null != null;
 
 stdenv.mkDerivation rec {
-  name = "systemd-199";
+  name = "systemd-200";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
-    sha256 = "1vazjqi95pri5zx21gs4chyd7c8kg5lf1rc26w47zkry9yh64i4c";
+    sha256 = "05y2r25441nznif5xi5gab4c6xdywiqzgcl3nsmg0j2wzalbl24s";
   };
 
   patches =
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
       ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
       ./0006-Don-t-call-plymouth-quit.patch
       ./0007-Ignore-IPv6-link-local-addresses.patch
-      ./0008-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch
     ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
 
   buildInputs =
@@ -74,8 +73,6 @@ stdenv.mkDerivation rec {
       # Work around our kernel headers being too old.  FIXME: remove
       # this after the next stdenv update.
       "-DFS_NOCOW_FL=0x00800000"
-      # Enable udev's firmware builtin for now.
-      "-DENABLE_FIRMWARE=1"
     ];
 
   # Use /var/lib/udev rather than /etc/udev for the generated hardware

pkgs/os-specific/linux/wpa_supplicant/default.nix

@@ -38,13 +38,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  patches =
+  patches = [ ./libnl.patch ];
-    [ (fetchurl {
-        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/hostap_allow-linking-with-libnl-3.2.patch?h=packages/wpa_supplicant";
-        name = "hostap_allow-linking-with-libnl-3.2.patch";
-        sha256 = "0iwvjq0apc6mv1r03k5pnyjgda3q47yx36c4lqvv8i8q1vn7kbf2";
-      })
-    ];
 
   postInstall = ''
     mkdir -p $out/share/man/man5 $out/share/man/man8

pkgs/os-specific/linux/wpa_supplicant/libnl.patch

@@ -0,0 +1,13 @@
+diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak
+--- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo	2012-03-02 16:11:43.176448714 -0600
++++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak	2012-03-02 16:12:29.759866341 -0600
+@@ -48,7 +48,7 @@ NEED_RFKILL=y
+ ifdef CONFIG_LIBNL32
+   DRV_LIBS += -lnl-3
+   DRV_LIBS += -lnl-genl-3
+-  DRV_CFLAGS += -DCONFIG_LIBNL20
++  DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
+ else
+   ifdef CONFIG_LIBNL_TINY
+     DRV_LIBS += -lnl-tiny
+

pkgs/os-specific/windows/pthread-w32/default.nix

@@ -28,6 +28,14 @@ stdenv.mkDerivation {
        cp -v pthread.h semaphore.h sched.h "$out/include"
     '';
 
+  postFixup =
+    # By default `mingw_headers' is propagated.  Prevent that, because
+    # otherwise MinGW headers appear twice in `-I', and thus the
+    # "#include_next <float.h>" in MinGW's <float.h> picks up itself instead
+    # of picking up GCC's (hence, FLT_RADIX is left undefined, for instance.)
+    '' rm -f "$out/nix-support/propagated-build-inputs"
+    '';
+
   meta = {
     description = "POSIX threads for Woe32";
 

pkgs/servers/dns/bind/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.9.2"; in
+let version = "9.9.2-P2"; in
 
 stdenv.mkDerivation rec {
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0j4v01ch4xkgnsnngmh6bpapzi53n4k79gbbhmxf44nmk2qk0rby";
+    sha256 = "1lk5npyr6bkm4gs2m90k4s8lmlcpfdphzqhi2hjnj2amwcs2g0pz";
   };
 
   patchPhase = ''
@@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var" ];
 
   meta = {
-    homepage = http://www.isc.org/software/bind;
+    homepage = "http://www.isc.org/software/bind";
     description = "ISC BIND: a domain name server";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = stdenv.lib.licenses.isc;
+
+    maintainers = with stdenv.lib.maintainers; [viric simons];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/servers/prayer/default.nix

@@ -5,11 +5,11 @@ let
     "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'";
 in
 stdenv.mkDerivation rec {
-  name = "prayer-1.3.4";
+  name = "prayer-1.3.5";
   
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${name}.tar.gz";
-    sha256 = "0a2nmrlwdq4n5019j3mw2xbbc61s7sssjih5ql6r5rvyrrr48szc";
+    sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
   };
 
   buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ];

pkgs/servers/varnish/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "3.0.3";
+  name = "varnish-${version}";
+
+  src = fetchurl {
+    url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
+    sha256 = "1cla2igwfwcm07srvk0z9cqdxh74sga0c1rsmh4b4n1gjn6x2drd";
+  };
+
+  buildInputs = [ pcre libxslt groff ncurses pkgconfig ];
+
+  meta = {
+    description = "Varnish Cache is a web application accelerator also known as a caching HTTP reverse proxy.";
+    homepage = "https://www.varnish-cache.org";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/servers/x11/xorg/overrides.nix

@@ -153,6 +153,11 @@ in
     installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
   };
 
+  xf86inputvoid = attrs: attrs // {
+    NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+    buildInputs = attrs.buildInputs ++ [xorg.pixman];
+  };
+
   xf86videointel = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
   };
@@ -172,6 +177,11 @@ in
     buildInputs = attrs.buildInputs ++ [xorg.pixman];
   };
 
+  xf86videodummy = attrs: attrs // {
+    NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+    buildInputs = attrs.buildInputs ++ [xorg.pixman];
+  };
+
   xf86videofbdev = attrs: attrs // {
     NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
     buildInputs = attrs.buildInputs ++ [xorg.pixman];

pkgs/tools/X11/xpra/default.nix

@@ -1,44 +1,40 @@
-{ stdenv, fetchurl, pkgconfig, python, cython
+{ stdenv, fetchurl, buildPythonPackage
-, pygtk, pygobject, pycairo, notify, xlibs, gtk
+, python, cython, pkgconfig
-, ffmpeg, x264, libvpx, makeWrapper}:
+, xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
+, ffmpeg_1_1, x264, libvpx, pil, libwebp }:
 
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
-  name = "xpra-0.3.2";
+  name = "xpra-0.8.8";
   
   src = fetchurl {
-    url = http://xpra.org/src/xpra-0.3.2.tar.bz2;
+    url = "http://xpra.org/src/${name}.tar.bz2";
-    sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y";
+    sha256 = "248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683";
   };
 
-  nativeBuildInputs = [ cython ];
+  buildInputs = [ 
+    python cython pkgconfig 
 
-  buildInputs = [
+    xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
-    pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper
+    xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
-    xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst
+    xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
+    xorg.libXrandr
+
+    pango cairo gdk_pixbuf atk gtk glib
+
+    ffmpeg_1_1 libvpx x264 libwebp
   ];
 
+  propagatedBuildInputs = [ 
+    pil pygtk pygobject
+  ];
+
+  # Even after i tried monkey patching, their tests just fail, looks like
+  # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177
+  doCheck = false;
+
   buildPhase = ''
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0)"
+    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
-    NIX_LDFLAGS="$NIX_LDFLAGS -lXcomposite -lXdamage"
+    python ./setup.py build --enable-Xdummy
-    ./do-build
-  '';
-
-  pythonPaths = [
-    "$out/lib/python"
-    "$(toPythonPath ${pygtk})/gtk-2.0"
-  ] ++ map (i: "$(toPythonPath ${i})") [
-    pygobject pycairo notify
-  ];
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r install/* $out
-
-    for i in $(cd $out/bin && ls); do
-        wrapProgram $out/bin/$i \
-            --set PYTHONPATH "${stdenv.lib.concatStringsSep ":" pythonPaths}" \
-            --prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin"
-    done
   '';
   
   meta = {

pkgs/tools/cd-dvd/cuetools/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, automake, autoconf, flex, bison }:
+
+stdenv.mkDerivation {
+  name = "cuetools-1.3.1";
+
+  src = fetchurl {
+    url = https://github.com/svend/cuetools/archive/cuetools-1.3.1.tar.gz;
+    sha256 = "1cap3wl0mlcqrjywpz46003w8jws05rr3r87pzqkz1g89v9459dg";
+  };
+
+  preConfigure = "autoreconf -fiv";
+
+  buildInputs = [ automake autoconf flex bison ]; 
+
+  meta = {
+    description = "cd/dvd cue and toc file parsers and utilities";
+    homepage = https://github.com/svend/cuetools;
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+  };
+}

pkgs/tools/misc/multitail/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation {
+  name = "multitail-5.2.12";
+
+  src = fetchurl {
+    url = http://www.vanheusden.com/multitail/multitail-5.2.12.tgz;
+    sha256 = "681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c";
+  };
+
+  buildInputs = [ ncurses ];
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp multitail $out/bin
+  '';
+
+  meta = {
+    homepage = http://www.vanheusden.com/multitail/;
+    description = "tail on Steroids";
+  };
+}

pkgs/tools/networking/aircrack-ng/default.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}:
 
 let
-  rev = "2212";
+  rev = "2268";
 in
 stdenv.mkDerivation rec {
   name = "aircrack-ng-1.1-${rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url = "http://trac.aircrack-ng.org/svn/trunk";
     inherit rev;
-    sha256 = "80e567b4e4bc501721cd58f7efadcd13fc3b235a41486174826694a6e701ce09";
+    sha256 = "0zjkk3s65v9w92fhzhyknhjcsx6whcm0an0qcawn2ggs0n0ss9ij";
   };
 
   buildInputs = [libpcap openssl zlib];

pkgs/tools/networking/network-manager-applet/default.nix

@@ -1,6 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf
 , libnotify, libgnome_keyring, dbus_glib, polkit, isocodes
-, mobile_broadband_provider_info }:
+, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
+, makeWrapper }:
 
 let
   pn = "network-manager-applet";
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib
-    polkit isocodes 
+    polkit isocodes makeWrapper
   ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
@@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
   ];
 
+  postInstall = ''
+    wrapProgram "$out/bin/nm-applet" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \
+      --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
+      --prefix PATH ":" "${GConf}/bin"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://projects.gnome.org/NetworkManager/;
     description = "NetworkManager control applet for GNOME";

pkgs/tools/networking/weighttp/default.nix

@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, python, libev}:
+stdenv.mkDerivation {
+  name = "weighttp-0.3";
+  src = fetchurl {
+    url = http://cgit.lighttpd.net/weighttp.git/snapshot/weighttp-0.3.tar.gz;
+    sha256 = "0gl83vnip3nj7fdgbwqkmrx7kxp51sri9jfiwd04q9iz8f9bsmz5";
+  };
+
+  buildInputs = [ python libev ];
+  installPhase = ''
+    python waf configure --prefix=$out
+    python waf build
+    python waf install
+  '';
+}

pkgs/tools/security/oath-toolkit/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pam }:
+
+stdenv.mkDerivation rec {
+  name = "oath-toolkit-2.0.2";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/oath-toolkit/${name}.tar.gz";
+    sha256 = "0i2rf5j83kb8h3sd9lsm0a46zq805kzagvccc4rk7879lg1fnl99";
+  };
+
+  buildInputs = [ pam ];
+
+  meta = {
+    homepage = http://www.nongnu.org/oath-toolkit/;
+    description = "Components for building one-time password authentication systems";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/tools/security/pwgen/default.nix

@@ -8,5 +8,6 @@ stdenv.mkDerivation {
   };
   meta = {
 	description = "Small, GPL'ed password generator which creates passwords which can be easily memorized by a human.";
+        platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/tools/text/wgetpaste/default.nix

@@ -23,5 +23,6 @@
       homepage = http://wgetpaste.zlin.dk/;
       license = "publicDomain";
       maintainers = with stdenv.lib.maintainers; [qknight];
+      platforms = stdenv.lib.platforms.all;
     };
   }

pkgs/top-level/all-packages.nix

@@ -579,6 +579,8 @@ let
 
   cowsay = callPackage ../tools/misc/cowsay { };
 
+  cuetools = callPackage ../tools/cd-dvd/cuetools { };
+
   unifdef = callPackage ../development/tools/misc/unifdef { };
 
   "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };
@@ -879,6 +881,8 @@ let
 
   gnuvd = callPackage ../tools/misc/gnuvd { };
 
+  googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
+
   gource = callPackage ../applications/version-management/gource {};
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };
@@ -1052,6 +1056,8 @@ let
 
   most = callPackage ../tools/misc/most { };
 
+  multitail = callPackage ../tools/misc/multitail { };
+
   netperf = callPackage ../applications/networking/netperf { };
 
   ninka = callPackage ../development/tools/misc/ninka { };
@@ -1269,6 +1275,8 @@ let
 
   nzbget = callPackage ../tools/networking/nzbget { };
 
+  oathToolkit = callPackage ../tools/security/oath-toolkit { };
+
   obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
 
   obexd = callPackage ../tools/bluetooth/obexd { };
@@ -1317,6 +1325,8 @@ let
 
   ossec = callPackage ../tools/security/ossec {};
 
+  otpw = callPackage ../os-specific/linux/otpw { };
+
   p7zip = callPackage ../tools/archivers/p7zip { };
 
   pal = callPackage ../tools/misc/pal { };
@@ -1785,6 +1795,8 @@ let
 
   uptimed = callPackage ../tools/system/uptimed { };
 
+  varnish = callPackage ../servers/varnish { };
+
   vlan = callPackage ../tools/networking/vlan { };
 
   wakelan = callPackage ../tools/networking/wakelan { };
@@ -1806,6 +1818,8 @@ let
       libxml2 geoip;
   };
 
+  weighttp = callPackage ../tools/networking/weighttp { };
+
   wget = callPackage ../tools/networking/wget {
     inherit (perlPackages) LWP;
   };
@@ -1942,6 +1956,8 @@ let
 
   bigloo = callPackage ../development/compilers/bigloo { };
 
+  chicken = callPackage ../development/compilers/chicken { };
+
   ccl = builderDefsPackage ../development/compilers/ccl {};
 
   clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix {
@@ -5220,6 +5236,8 @@ let
     jvm    = gcj;
     xerces = xercesJava;  };
 
+  xmlsec = callPackage ../development/libraries/xmlsec { };
+
   zziplib = callPackage ../development/libraries/zziplib { };
 
 
@@ -5234,6 +5252,7 @@ let
 
   perlPackages = recurseIntoAttrs (import ./perl-packages.nix {
     inherit pkgs;
+    __overrides = (config.perlPackageOverrides or (p: {})) pkgs;
   });
 
   perl510Packages = import ./perl-packages.nix {
@@ -5241,6 +5260,7 @@ let
       perl = perl510;
       buildPerlPackage = import ../development/perl-modules/generic perl510;
     };
+    __overrides = (config.perl510PackageOverrides or (p: {})) pkgs;
   };
 
   perlXMLParser = perlPackages.XMLParser;
@@ -5270,9 +5290,10 @@ let
     python = python27;
   });
 
-  plone42Packages = recurseIntoAttrs (import ../development/web/plone {
+  plone43Packages = recurseIntoAttrs (import ../development/web/plone {
-    inherit pkgs buildPythonPackage;
+    inherit pkgs;
     python = python27;
+    pythonPackages = python27Packages;
   });
 
   foursuite = callPackage ../development/python-modules/4suite { };
@@ -6014,6 +6035,8 @@ let
   linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
   linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7);
   linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
+  # Update this when adding a new version!
+  linuxPackages_latest = pkgs.linuxPackages_3_8;
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
@@ -6307,7 +6330,7 @@ let
     };
 
     pthreads = callPackage ../os-specific/windows/pthread-w32 {
-      mingw_headers = mingw_headers2;
+      mingw_headers = mingw_headers3;
     };
 
     wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
@@ -7525,6 +7548,10 @@ let
 
   ogmtools = callPackage ../applications/video/ogmtools { };
 
+  omxplayer = callPackage ../applications/video/omxplayer {
+    stdenv = overrideGCC stdenv gcc47;
+  };
+
   oneteam = callPackage ../applications/networking/instant-messengers/oneteam {};
 
   openbox = callPackage ../applications/window-managers/openbox { };
@@ -7637,7 +7664,9 @@ let
 
   ratpoison = callPackage ../applications/window-managers/ratpoison { };
 
-  rawtherapee = callPackage ../applications/graphics/rawtherapee { };
+  rawtherapee = callPackage ../applications/graphics/rawtherapee {
+    fftw = fftw.override {float = true;}; 
+  };
 
   rcs = callPackage ../applications/version-management/rcs { };
 
@@ -7691,6 +7720,10 @@ let
 
   dropbox = callPackage ../applications/networking/dropbox { };
 
+  lightdm = callPackage ../applications/display-managers/lightdm { };
+
+  lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
+
   slim = callPackage ../applications/display-managers/slim { };
 
   sndBase = builderDefsPackage (import ../applications/audio/snd) {
@@ -7705,6 +7738,8 @@ let
     guile = guile_1_8;
   };
 
+  shntool = callPackage ../applications/audio/shntool { };
+
   sonic_visualiser = callPackage ../applications/audio/sonic-visualiser {
     inherit (pkgs.vamp) vampSDK;
     inherit (pkgs.xlibs) libX11;
@@ -8048,9 +8083,7 @@ let
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
-  xpra = callPackage ../tools/X11/xpra {
+  xpra = callPackage ../tools/X11/xpra { };
-    inherit (pythonPackages) notify;
-  };
 
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;
@@ -8281,7 +8314,7 @@ let
   # You still can override by passing more arguments.
   spaceOrbit = callPackage ../games/orbit { };
 
-  spring = callPackage ../games/spring { boost = boost149;};
+  spring = callPackage ../games/spring { };
 
   springLobby = callPackage ../games/spring/springlobby.nix { };
 
@@ -8858,6 +8891,8 @@ let
 
   mupen64plus = callPackage ../misc/emulators/mupen64plus { };
 
+  mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
+
   nix = nixStable;
 
   nixStable = callPackage ../tools/package-management/nix {
@@ -9045,6 +9080,8 @@ let
     inherit (gnome2) zenity;
   };
 
+  wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
+
   x2x = callPackage ../tools/X11/x2x { };
 
   xosd = callPackage ../misc/xosd { };

pkgs/top-level/haskell-defaults.nix

@@ -111,7 +111,6 @@
       monadPar = self.monadPar_0_1_0_3;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
       jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
     };
 
   # Abstraction for Haskell packages collections

pkgs/top-level/haskell-packages.nix

@@ -150,7 +150,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     regexBase    = self.regexBase_0_93_2;       # 7.6 ok
     regexCompat  = self.regexCompat_0_95_1;     # 7.6 ok
     regexPosix   = self.regexPosix_0_95_2;      # 7.6 ok
-    split        = self.split_0_2_1_2;          # 7.6 ok
+    split        = self.split_0_2_1_3;          # 7.6 ok
     stm          = self.stm_2_4_2;              # 7.6 ok
     syb          = self.syb_0_4_0;              # 7.6 ok
     text         = self.text_0_11_2_3;          # 7.6 ok
@@ -444,7 +444,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   accelerate = callPackage ../development/libraries/haskell/accelerate {};
 
-  accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {};
+  accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {
+    languageCQuote = self.languageCQuote_0_4_4;
+  };
 
   accelerateExamples = callPackage ../development/libraries/haskell/accelerate-examples {};
 
@@ -1189,7 +1191,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {};
   languageC = self.languageC_0_4_2;
 
-  languageCQuote = callPackage ../development/libraries/haskell/language-c-quote/default.nix {};
+  languageCQuote_0_4_4 = callPackage ../development/libraries/haskell/language-c-quote/0.4.4.nix {};
+  languageCQuote_0_7_1 = callPackage ../development/libraries/haskell/language-c-quote/0.7.1.nix {};
+  languageCQuote = self.languageCQuote_0_7_1;
 
   languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
 
@@ -1508,6 +1512,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   QuickCheck2 = self.QuickCheck_2_6;
   QuickCheck  = self.QuickCheck2;
 
+  quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
+
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
   random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};
@@ -1695,8 +1701,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
 
   split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {};
-  split_0_2_1_2 = callPackage ../development/libraries/haskell/split/0.2.1.2.nix {};
+  split_0_2_1_3 = callPackage ../development/libraries/haskell/split/0.2.1.3.nix {};
-  split = self.split_0_2_1_2;
+  split = self.split_0_2_1_3;
 
   stbImage = callPackage ../development/libraries/haskell/stb-image {};
 

pkgs/top-level/node-packages.nix

@@ -43,7 +43,7 @@ let self = {
   amdefine = "amdefine-0.0.4";
 
   "amdefine->=0.0.4" = self."amdefine-0.0.4";
-  
+
   "amdefine-0.0.4" = self.buildNodePackage rec {
     name = "amdefine-0.0.4";
     src = fetchurl {
@@ -94,6 +94,20 @@ let self = {
     ];
   };
 
+  "aws-sdk" = self."aws-sdk-*";
+
+  "aws-sdk-*" = self.buildNodePackage rec {
+    name = "aws-sdk-0.9.7-pre.8";
+    src = self.patchLatest {
+      url = "http://registry.npmjs.org/aws-sdk/-/${name}.tgz";
+      sha256 = "d3854275981fff76153f79c62745d8d6c59018861729766908c920fff95ea422";
+    };
+    deps = [
+      self."xml2js-0.2.4"
+      self."xmlbuilder"
+    ];
+  };
+
   "backbone" = self."backbone-0.9.2";
 
   "backbone-0.9.2" = self.buildNodePackage rec {
@@ -270,6 +284,17 @@ let self = {
 
   "commander" = self."commander-~0.6.1";
 
+  "commander-0.5.1" = self.buildNodePackage rec {
+    name = "commander-0.5.1";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/${name}.tgz";
+      sha256 = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924";
+    };
+    deps = [
+
+    ];
+  };
+
   "commander-~0.6.1" = self.buildNodePackage rec {
     name = "commander-0.6.1";
     src = fetchurl {
@@ -569,6 +594,47 @@ let self = {
     ];
   };
 
+  "htdigest" = self."htdigest-1.0.7";
+
+  "htdigest-1.0.7" = self.buildNodePackage rec {
+    name = "htdigest-1.0.7";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/htdigest/-/${name}.tgz";
+      sha256 = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58";
+    };
+    deps = [
+      self."commander-0.5.1"
+    ];
+  };
+
+  "htpasswd" = self."htpasswd-1.1.0";
+
+  "htpasswd-1.1.0" = self.buildNodePackage rec {
+    name = "htpasswd-1.1.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/htpasswd/-/${name}.tgz";
+      sha256 = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9";
+    };
+    deps = [
+      self."commander-0.5.1"
+    ];
+  };
+
+  "http-auth" = self."http-auth-*";
+
+  "http-auth-*" = self.buildNodePackage rec {
+    name = "http-auth-1.2.7";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-auth/-/${name}.tgz";
+      sha256 = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2";
+    };
+    deps = [
+      self."node-uuid-1.2.0"
+      self."htpasswd-1.1.0"
+      self."htdigest-1.0.7"
+    ];
+  };
+
   "http-signature" = self."http-signature-0.9.9";
 
   "http-signature-0.9.9" = self.buildNodePackage rec {
@@ -805,6 +871,17 @@ let self = {
 
   "node-uuid" = self."node-uuid-1.3.3";
 
+  "node-uuid-1.2.0" = self.buildNodePackage rec {
+    name = "node-uuid-1.2.0";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/${name}.tgz";
+      sha256 = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2";
+    };
+    deps = [
+
+    ];
+  };
+
   "node-uuid-1.3.3" = self.buildNodePackage rec {
     name = "node-uuid-1.3.3";
     src = fetchurl {
@@ -897,7 +974,7 @@ let self = {
   };
 
   "optparse" = self."optparse-1.0.3";
-  
+
   "optparse-1.0.3" = self.buildNodePackage rec {
     name = "optparse-1.0.3";
     src = fetchurl {
@@ -905,7 +982,7 @@ let self = {
       sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883";
     };
     deps = [
-    
+
     ];
   };
 
@@ -1115,6 +1192,19 @@ let self = {
     ];
   };
 
+  "sax" = self."sax->=0.4.2";
+
+  "sax->=0.4.2" = self.buildNodePackage rec {
+    name = "sax-0.5.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/${name}.tgz";
+      sha256 = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953";
+    };
+    deps = [
+
+    ];
+  };
+
   "semver" = self."semver-1";
 
   "semver-1" = self."semver-1.0.14";
@@ -1261,9 +1351,9 @@ let self = {
       self."requirejs-==0.26.0"
     ];
   };
-  
+
   "swig" = self."swig-0.13.2";
-  
+
   "swig-0.13.2" = self.buildNodePackage rec {
     name = "swig-0.13.2";
     src = fetchurl {
@@ -1448,6 +1538,32 @@ let self = {
     ];
   };
 
+  "xml2js" = self."xml2js-0.2.4";
+
+  "xml2js-0.2.4" = self.buildNodePackage rec {
+    name = "xml2js-0.2.4";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/${name}.tgz";
+      sha256 = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28";
+    };
+    deps = [
+      self."sax->=0.4.2"
+    ];
+  };
+
+  "xmlbuilder" = self."xmlbuilder-*";
+
+  "xmlbuilder-*" = self.buildNodePackage rec {
+    name = "xmlbuilder-0.4.2";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlbuilder/-/${name}.tgz";
+      sha256 = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe";
+    };
+    deps = [
+
+    ];
+  };
+
   "xmlhttprequest" = self."xmlhttprequest-1.2.2";
 
   "xmlhttprequest-1.2.2" = self.buildNodePackage rec {

pkgs/top-level/perl-packages.nix

@@ -5,12 +5,14 @@
    for each package in a separate file: the call to the function would
    be almost as must code as the function itself. */
 
-{pkgs}:
+{pkgs, __overrides}:
 
 rec {
 
   inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn;
 
+  inherit __overrides;
+
   # Helper functions for packages that use Module::Build to build.
   buildPerlModule = { buildInputs ? [], ... } @ args:
     buildPerlPackage (args // {

pkgs/top-level/platforms.nix

@@ -105,7 +105,7 @@ rec {
 
         FUSE_FS m
 
-        # nixos mounts some cgroup
+        # systemd uses cgroups
         CGROUPS y
 
         # Latencytop 
@@ -307,6 +307,12 @@ rec {
     kernelAutoModules = false;
     kernelExtraConfig =
       ''
+        MIGRATION n
+        COMPACTION n
+
+        # nixos mounts some cgroup
+        CGROUPS y
+
         BLK_DEV_RAM y
         BLK_DEV_INITRD y
         BLK_DEV_CRYPTOLOOP m
@@ -360,6 +366,9 @@ rec {
         EXT3_FS y
         REISERFS_FS y
         MAGIC_SYSRQ y
+
+        # The kernel doesn't boot at all, with FTRACE
+        FTRACE n
       '';
     kernelTarget = "vmlinux";
     uboot = null;

pkgs/top-level/python-packages.nix

@@ -58,6 +58,11 @@ pythonPackages = python.modules // rec {
     inherit python buildPythonPackage;
   };
 
+  pitz = import ../applications/misc/pitz {
+    inherit (pkgs) stdenv fetchurl;
+    inherit buildPythonPackage tempita jinja2 pyyaml clepy mock nose decorator docutils;
+  };
+
   pycairo = import ../development/python-modules/pycairo {
     inherit (pkgs) stdenv fetchurl pkgconfig cairo x11;
     inherit python;
@@ -589,6 +594,24 @@ pythonPackages = python.modules // rec {
     };
   });
 
+
+  clepy = buildPythonPackage rec {
+    name = "clepy-0.3.20";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/c/clepy/${name}.tar.gz";
+      sha256 = "16vibfxms5z4ld8gbkra6dkhqm2cc3jnn0fwp7mw70nlwxnmm51c";
+    };
+
+    buildInputs = [ mock nose decorator ];
+
+    meta = {
+      homepage = http://code.google.com/p/clepy/;
+      description = "Utilities created by the Cleveland Python users group";
+    };
+  };
+
+
   clientform = buildPythonPackage (rec {
     name = "clientform-0.2.10";
 
@@ -1685,6 +1708,23 @@ pythonPackages = python.modules // rec {
     };
   });
 
+  http_signature = buildPythonPackage (rec {
+    name = "http_signature-0.1.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz";
+      md5 = "015061846254bd5d8c5dbc2913985153";
+    };
+
+    propagatedBuildInputs = [pycrypto];
+
+    meta = {
+      homepage = https://github.com/atl/py-http-signature;
+      description = "";
+      license = stdenv.lib.licenses.mit;
+    };
+  });
+
   httplib2 = buildPythonPackage rec {
     name = "httplib2-0.8";
 
@@ -2753,11 +2793,11 @@ pythonPackages = python.modules // rec {
 
 
   prettytable = buildPythonPackage rec {
-    name = "prettytable-0.5";
+    name = "prettytable-0.7.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2";
-      md5 = "13a6930d775395f393afd86948afa4fa";
+      sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851";
     };
 
     meta = {
@@ -3867,6 +3907,23 @@ pythonPackages = python.modules // rec {
     };
   });
 
+  smartdc = buildPythonPackage rec {
+    name = "smartdc-0.1.12";
+
+    src = fetchurl {
+      url = https://pypi.python.org/packages/source/s/smartdc/smartdc-0.1.12.tar.gz;
+      md5 = "b960f61facafc879142b699050f6d8b4";
+    };
+
+    propagatedBuildInputs = [ requests http_signature ];
+
+    meta = {
+      description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests";
+      homepage = https://github.com/atl/py-smartdc;
+      license = pkgs.lib.licenses.mit;
+    };
+  };
+
   sphinx = buildPythonPackage (rec {
     name = "Sphinx-1.1.3";