From c5bc23a2596d1952623a56218ad991ec91823a0b Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 21 Nov 2013 22:21:39 +0000
Subject: [PATCH 001/562] vagrant: add expression

---
 pkgs/development/tools/vagrant/default.nix | 84 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 86 insertions(+)
 create mode 100644 pkgs/development/tools/vagrant/default.nix

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
new file mode 100644
index 000000000000..64822a08d073
--- /dev/null
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, rubyLibs, libiconv
+, libxml2, libxslt }:
+
+assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+
+stdenv.mkDerivation rec {
+  name = "vagrant-1.3.5";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url    = http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_x86_64.deb;
+        sha256 = "0wfdz1r6i6acdrqb22n21iijz57ywjh4wd3fggcj65c0dvs0czfv";
+      }
+    else
+      fetchurl {
+        url    = http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_i686.deb;
+        sha256 = "0dq1ha278mjca1kdhijs6wzs61npvv1knvahnbiihxmhjsx5d9ih";
+      };
+
+  meta = with stdenv.lib; {
+    description = "A tool for building complete development environments";
+    homepage    = http://vagrantup.com;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.linux;
+  };
+
+  unpackPhase = ''
+    ${dpkg}/bin/dpkg-deb -x ${src} .
+  '';
+
+  buildPhase = false;
+
+  installPhase = ''
+    sed -i "s|/opt|$out/opt|" usr/bin/vagrant
+
+    # overwrite embedded binaries
+
+    # curl: curl
+    rm opt/vagrant/embedded/bin/curl
+    ln -s ${curl}/bin/curl opt/vagrant/embedded/bin
+
+    # libarchive: bsdtar, bsdcpio
+    rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}
+    ln -s ${libarchive}/bin/bsdtar opt/vagrant/embedded/bin
+    ln -s ${libarchive}/bin/bsdcpio opt/vagrant/embedded/bin
+
+    # openssl: c_rehash, openssl
+    rm opt/vagrant/embedded/bin/{c_rehash,openssl}
+    ln -s ${openssl}/bin/c_rehash opt/vagrant/embedded/bin
+    ln -s ${openssl}/bin/openssl opt/vagrant/embedded/bin
+
+    # ruby: erb, gem, irb, rake, rdoc, ri, ruby, testrb
+    rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby,testrb}
+    ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/gem opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/irb opt/vagrant/embedded/bin
+    ln -s ${rubyLibs.rake}/bin/rake opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/rdoc opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
+    ln -s ${ruby}/bin/testrb opt/vagrant/embedded/bin
+
+    # libiconv: iconv
+    rm opt/vagrant/embedded/bin/iconv
+    ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin
+
+    # libxml: xml2-config, xmlcatalog, xmllint
+    rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint}
+    ln -s ${libxml2}/bin/xml2-config opt/vagrant/embedded/bin
+    ln -s ${libxml2}/bin/xmlcatalog opt/vagrant/embedded/bin
+    ln -s ${libxml2}/bin/xmllint opt/vagrant/embedded/bin
+
+    # libxslt: xslt-config, xsltproc
+    rm opt/vagrant/embedded/bin/{xslt-config,xsltproc}
+    ln -s ${libxslt}/bin/xslt-config opt/vagrant/embedded/bin
+    ln -s ${libxslt}/bin/xsltproc opt/vagrant/embedded/bin
+
+    mkdir -p "$out"
+    cp -r opt "$out"
+    cp -r usr/bin "$out"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bef1cff60ede..1a567d98cf55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3805,6 +3805,8 @@ let
 
   uncrustify = callPackage ../development/tools/misc/uncrustify { };
 
+  vagrant = callPackage ../development/tools/vagrant { };
+
   gdb = callPackage ../development/tools/misc/gdb {
     hurd = gnu.hurdCross;
     inherit (gnu) mig;

From f3536a0dcbff3ebf7020c46508926b2a4486e0ec Mon Sep 17 00:00:00 2001
From: Roelof Wobben <rwobben@hotmail.com>
Date: Mon, 2 Dec 2013 09:24:08 +0100
Subject: [PATCH 002/562] broken translation files

---
 .../cinnamon/cinnamon-translations.nix        | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-translations.nix

diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix
new file mode 100644
index 000000000000..09e656943ad4
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "cinnamon-translations";
+  version="2.0.3";
+
+  src = fetchurl {
+    url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz";
+    sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc";
+  };
+
+  
+  installPhase =
+    ''
+      mkdir -pv $out/usr/share/cinnamon/locale
+      cp -Rp mo-export/* $out/usr/share/cinnamon/locale/
+    '';
+
+  meta = {
+    homepage = "http://cinnamon.linuxmint.com";
+    description = "Translations files for the Cinnamon desktop" ;
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.roelof ];
+  };
+}
+
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac304ad462b2..31d4426ba668 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9575,6 +9575,10 @@ let
 
 
   ### DESKTOP ENVIRONMENTS
+  
+   cinnamon = recurseIntoAttrs {
+    cjs = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
+    }; 
 
   enlightenment = callPackage ../desktops/enlightenment { };
 

From 28d24ea4ebc68fe9d890ba41694549a5268fc234 Mon Sep 17 00:00:00 2001
From: Roelof Wobben <rwobben@hotmail.com>
Date: Mon, 2 Dec 2013 13:25:38 +0100
Subject: [PATCH 003/562] cinnamon-transalations working

---
 pkgs/desktops/cinnamon/cinnamon-translations.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix
index 09e656943ad4..2d396947b893 100644
--- a/pkgs/desktops/cinnamon/cinnamon-translations.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   installPhase =
     ''
       mkdir -pv $out/usr/share/cinnamon/locale
-      cp -Rp mo-export/* $out/usr/share/cinnamon/locale/
+      cp -av mo-export/* $out/usr/share/cinnamon/locale/
     '';
 
   meta = {

From a12367d991f7d04af743a92b216c281d9fafa383 Mon Sep 17 00:00:00 2001
From: Roelof Wobben <rwobben@hotmail.com>
Date: Mon, 2 Dec 2013 13:29:45 +0100
Subject: [PATCH 004/562] changed wrong name in all-packages

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31d4426ba668..9237f1736a82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9577,7 +9577,7 @@ let
   ### DESKTOP ENVIRONMENTS
   
    cinnamon = recurseIntoAttrs {
-    cjs = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
+    cinnamon-translations  = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
     }; 
 
   enlightenment = callPackage ../desktops/enlightenment { };

From de529d6b4ba6ce90d42dc95c4d59ef55ac7e685e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 21 Nov 2013 03:47:12 -0600
Subject: [PATCH 005/562] Upgrade opus from 1.0.2 -> 1.0.3

---
 pkgs/development/libraries/libopus/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index d08ae8ef72a9..11f7a370efa9 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fixedPoint ? false }:
 
 stdenv.mkDerivation rec {
-  name = "libopus-1.0.2";
+  name = "libopus-1.0.3";
   
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz";
-    sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs";
+    url = "http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz";
+    sha256 = "175l7hv7d03c4iz60g185nqvwrabc39ksil0d7g07i6vjaf0h6hr";
   };
 
   configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";

From 4118e632e84cffb0c3f994d5e512890650447c0f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 2 Dec 2013 19:48:20 -0600
Subject: [PATCH 006/562] Upgeade avahi to 0.6.31

Additionally, link compatability files for dns_sd.h and howl as these are
needed to build mumble and potentially other avahi using derivations.
---
 pkgs/development/libraries/avahi/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index f4795286e096..0adc7d56357e 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -7,11 +7,11 @@
 assert qt4Support -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "avahi-0.6.30";
+  name = "avahi-0.6.31";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r";
+    sha256 = "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3";
   };
 
   patches = [ ./no-mkdir-localstatedir.patch ];
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
     avahi-core/socket.c
   '';
 
+  postInstall = ''
+    # Maintain compat for mdnsresponder and howl
+    ${if withLibdnssdCompat then "ln -s avahi-compat-libdns_sd/dns_sd.h $out/include/dns_sd.h" else ""}
+    ln -s avahi-compat-howl $out/include/howl
+    ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc
+  '';
+
   meta = with stdenv.lib; {
     description = "mDNS/DNS-SD implementation";
     homepage    = http://avahi.org;

From 7aa292a069e52e23682477c990199c87d1ad303f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 21 Nov 2013 04:22:04 -0600
Subject: [PATCH 007/562] Properly configure mumble to build without the server
 and libopus

---
 pkgs/applications/networking/mumble/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 0981ab394496..a00837000541 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile,
- avahi, dbus, libcap, pkgconfig,
+{ stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
+ speex, libopus, avahi, pkgconfig
 jackSupport ? false, 
 jackaudio ? null }:
 
@@ -18,16 +18,18 @@ stdenv.mkDerivation rec {
   '';
 
   configurePhase = ''
-    qmake CONFIG+=no-g15 CONFIG+=no-update \
-      CONFIG+=no-embed-qt-translations CONFIG+=no-ice \
+    qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
+      CONFIG+=no-embed-qt-translations CONFIG+=packaged \
+      CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
+      CONFIG+=no-bundled-speex
   '' 
   + stdenv.lib.optionalString jackSupport ''
     CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio
   '';
 
 
-  buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus
-    libcap pkgconfig ]
+  buildInputs = [ qt4 boost speechd protobuf libsndfile speex
+    libopus avahi pkgconfig ]
     ++ (stdenv.lib.optional jackSupport jackaudio);
 
   installPhase = ''

From ff1d97f3a48bc66441e09602803676d6e170ed46 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 21 Nov 2013 04:22:35 -0600
Subject: [PATCH 008/562] Add Build Script for Murmur

---
 .../applications/networking/mumble/murmur.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/networking/mumble/murmur.nix

diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
new file mode 100644
index 000000000000..b40632384c2b
--- /dev/null
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "murmur-" + version;
+  version = "1.2.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
+    sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
+  };
+
+  configurePhase = ''
+    qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt
+  '';
+
+  buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r ./release $out/bin
+  '';
+
+  meta = { 
+    homepage = http://mumble.sourceforge.net/;
+    description = "Low-latency, high quality voice chat software";
+    license = "BSD";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe4f83ccb04f..4e85ea8d52f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8454,6 +8454,12 @@ let
     jackSupport = config.mumble.jackSupport or false;
   };
 
+  murmur = callPackage ../applications/networking/mumble/murmur.nix { 
+    avahi = avahi.override {
+      withLibdnssdCompat = true;
+    };
+  };
+
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
 
   ruby_gpgme = callPackage ../development/libraries/ruby_gpgme {

From 28722a265b30881de0501a04e2a79ea7318fbae4 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 2 Dec 2013 21:50:14 +0000
Subject: [PATCH 009/562] sup: use specific version of mime types

---
 pkgs/top-level/all-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89e9e7a53e88..6eb44d42a880 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8491,11 +8491,12 @@ let
       cursesSupport = true;
     };
 
-    inherit gettext highline iconv locale lockfile mime_types rmail_sup text
-      trollop unicode xapian_ruby which;
+    inherit gettext highline iconv locale lockfile rmail_sup
+      text trollop unicode xapian_ruby which;
 
     chronic      = chronic_0_9_1;
     gpgme        = ruby_gpgme;
+    mime_types   = mime_types_1_25;
     ncursesw_sup = ruby_ncursesw_sup;
     rake         = rake_10_1_0;
   };

From d937187808289d31e3a36f63e0242d59dd4df4dc Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 2 Dec 2013 21:53:53 +0000
Subject: [PATCH 010/562] sup: update to latest version, use better version
 number

---
 .../networking/mailreaders/sup/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index dd2837da40a6..af019e322087 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
+{ stdenv, fetchgit, ruby, rake, rubygems, makeWrapper, ncursesw_sup
 , xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile
 , gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }:
 
 stdenv.mkDerivation rec {
-  version = "f27661b1656ae1f0d28fd89595b5a16f268d8d3d";
+  version = "20131130";
   name    = "sup-${version}";
   
   meta = {
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  src = fetchurl {
-    url    = "https://github.com/sup-heliotrope/sup/archive/${version}.tar.gz";
-    sha256 = "08fxf1knji3260d0mrp86x6yayp43iq7kc5rfay3hga8i2sckdia";
+  src = fetchgit {
+    url = git://github.com/sup-heliotrope/sup.git;
+    rev = "a5a1e39034204ac4b05c9171a71164712690b010";
   };
 
   buildInputs =

From 04dd0bb5df018c6d296b16d730ea3c147d530914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 3 Dec 2013 17:26:19 +0100
Subject: [PATCH 011/562] sup: fix chroot build

By making fetchgit a fixed-output derivation.
---
 pkgs/applications/networking/mailreaders/sup/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index af019e322087..a8fb387e7296 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://github.com/sup-heliotrope/sup.git;
     rev = "a5a1e39034204ac4b05c9171a71164712690b010";
+    sha256 = "0w2w7dcif1ri1qq81csz7gj45rqd9z7hjd6x29awibybyyqyvj5s";
   };
 
   buildInputs =

From 7809134e29c621d621f28f79c19744377d41b20b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 3 Dec 2013 11:35:57 -0500
Subject: [PATCH 012/562] postgresql: Fix shutdown

Postgres was taking a long time to shutdown.  This is because we were
sending SIGINT to all processes, apparently confusing the autovacuum
launcher.  Instead it should only be sent to the main process (which
takes care of shutting down the others).

The downside is that systemd will also send the final SIGKILL only to
the main process, so other processes in the cgroup may be left behind.
There should be an option for this...
---
 nixos/modules/services/databases/postgresql.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index d99ad2c9c7c2..1563858887e6 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -211,6 +211,7 @@ in
             # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
             # http://www.postgresql.org/docs/current/static/server-shutdown.html
             KillSignal = "SIGINT";
+            KillMode = "process"; # FIXME: this may cause processes to be left behind in the cgroup even after the final SIGKILL
 
             # Give Postgres a decent amount of time to clean up after
             # receiving systemd's SIGINT.

From 3b1f887d58d4b9fce95b0c87ad0240f9c4f22032 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 3 Dec 2013 14:40:19 -0500
Subject: [PATCH 013/562] Update node packages

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/top-level/node-packages-generated.nix | 1019 +++++++++++++-------
 1 file changed, 671 insertions(+), 348 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 33827fed3c09..9baf51c2d3d8 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -15,7 +15,7 @@
       (self.nativeDeps."CSSselect" or []);
     deps = [
       self.by-version."CSSwhat"."0.4.1"
-      self.by-version."domutils"."1.2.1"
+      self.by-version."domutils"."1.2.2"
     ];
     peerDependencies = [
     ];
@@ -39,6 +39,24 @@
     ];
     passthru.names = [ "CSSwhat" ];
   };
+  by-spec."StringScanner"."~0.0.3" =
+    self.by-version."StringScanner"."0.0.3";
+  by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "StringScanner-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/StringScanner/-/StringScanner-0.0.3.tgz";
+        sha1 = "bf06ecfdc90046711f4e6175549243b78ceb38aa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."StringScanner" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "StringScanner" ];
+  };
   by-spec."abbrev"."1" =
     self.by-version."abbrev"."1.0.4";
   by-version."abbrev"."1.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -266,13 +284,13 @@
     passthru.names = [ "ansicolors" ];
   };
   by-spec."apparatus".">= 0.0.4" =
-    self.by-version."apparatus"."0.0.7";
-  by-version."apparatus"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "apparatus-0.0.7";
+    self.by-version."apparatus"."0.0.8";
+  by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "apparatus-0.0.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.7.tgz";
-        sha1 = "033f355507b6851ebeb1bd9475ede23c802327fe";
+        url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz";
+        sha1 = "14e8aeb84189208b7f8d77f09d9f0307778b079a";
       })
     ];
     buildInputs =
@@ -778,13 +796,13 @@
     passthru.names = [ "boom" ];
   };
   by-spec."bower"."*" =
-    self.by-version."bower"."1.2.7";
-  by-version."bower"."1.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.2.7";
+    self.by-version."bower"."1.2.8";
+  by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-1.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.2.7.tgz";
-        sha1 = "5b0505c8192bd61a752a7cf8b718d1b3054cd554";
+        url = "http://registry.npmjs.org/bower/-/bower-1.2.8.tgz";
+        sha1 = "f63c0804a267d5ffaf2fd3fd488367e73dce202f";
       })
     ];
     buildInputs =
@@ -800,6 +818,7 @@
       self.by-version."cardinal"."0.4.2"
       self.by-version."chalk"."0.2.1"
       self.by-version."chmodr"."0.1.0"
+      self.by-version."decompress-zip"."0.0.3"
       self.by-version."fstream"."0.1.25"
       self.by-version."fstream-ignore"."0.0.7"
       self.by-version."glob"."3.2.7"
@@ -818,25 +837,25 @@
       self.by-version."request"."2.27.0"
       self.by-version."request-progress"."0.3.1"
       self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."semver"."2.1.0"
       self.by-version."stringify-object"."0.1.7"
       self.by-version."sudo-block"."0.2.1"
       self.by-version."tar"."0.1.18"
-      self.by-version."tmp"."0.0.21"
-      self.by-version."unzip"."0.1.9"
+      self.by-version."tmp"."0.0.22"
       self.by-version."update-notifier"."0.1.7"
       self.by-version."which"."1.0.5"
+      self.by-version."p-throttler"."0.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "bower" ];
   };
-  "bower" = self.by-version."bower"."1.2.7";
+  "bower" = self.by-version."bower"."1.2.8";
   by-spec."bower".">=0.9.0" =
-    self.by-version."bower"."1.2.7";
+    self.by-version."bower"."1.2.8";
   by-spec."bower"."~1.2.0" =
-    self.by-version."bower"."1.2.7";
+    self.by-version."bower"."1.2.8";
   by-spec."bower-config"."~0.4.3" =
     self.by-version."bower-config"."0.4.5";
   by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -957,7 +976,7 @@
       self.by-version."lru-cache"."2.3.1"
       self.by-version."request"."2.27.0"
       self.by-version."request-replay"."0.2.0"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."mkdirp"."0.3.5"
     ];
     peerDependencies = [
@@ -987,8 +1006,31 @@
     ];
     passthru.names = [ "broadway" ];
   };
+  by-spec."broadway"."0.2.9" =
+    self.by-version."broadway"."0.2.9";
+  by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "broadway-0.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/broadway/-/broadway-0.2.9.tgz";
+        sha1 = "887008b2257f4171089de5cb9b656969b6c8c9e8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."broadway" or []);
+    deps = [
+      self.by-version."cliff"."0.1.8"
+      self.by-version."eventemitter2"."0.4.12"
+      self.by-version."nconf"."0.6.9"
+      self.by-version."winston"."0.7.2"
+      self.by-version."utile"."0.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "broadway" ];
+  };
   by-spec."broadway"."0.2.x" =
-    self.by-version."broadway"."0.2.7";
+    self.by-version."broadway"."0.2.9";
   by-spec."browserchannel"."*" =
     self.by-version."browserchannel"."1.0.8";
   by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -1003,7 +1045,7 @@
       (self.nativeDeps."browserchannel" or []);
     deps = [
       self.by-version."hat"."0.0.3"
-      self.by-version."connect"."2.11.0"
+      self.by-version."connect"."2.11.2"
       self.by-version."request"."2.27.0"
     ];
     peerDependencies = [
@@ -1217,6 +1259,8 @@
     ];
     passthru.names = [ "bytes" ];
   };
+  by-spec."bytes"."~0.2.1" =
+    self.by-version."bytes"."0.2.1";
   by-spec."cardinal"."~0.4.0" =
     self.by-version."cardinal"."0.4.2";
   by-version."cardinal"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -1675,6 +1719,27 @@
   };
   by-spec."coffee-script"."~1.6" =
     self.by-version."coffee-script"."1.6.3";
+  by-spec."coffee-script-redux"."git://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" =
+    self.by-version."coffee-script-redux"."2.0.0-beta4";
+  by-version."coffee-script-redux"."2.0.0-beta4" = lib.makeOverridable self.buildNodePackage {
+    name = "coffee-script-redux-2.0.0-beta4";
+    src = [
+      (fetchgit {
+        url = "git://github.com/michaelficarra/CoffeeScriptRedux.git";
+        rev = "9895cd1641fdf3a2424e662ab7583726bb0e35b3";
+        sha256 = "d70e659aa7cdb50a98959dec0e2a8c916200e31cb770f04faa2ae92a55d1e66d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."coffee-script-redux" or []);
+    deps = [
+      self.by-version."StringScanner"."0.0.3"
+      self.by-version."jedediah"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "coffee-script-redux" ];
+  };
   by-spec."color"."~0.4.4" =
     self.by-version."color"."0.4.4";
   by-version."color"."0.4.4" = lib.makeOverridable self.buildNodePackage {
@@ -1984,7 +2049,7 @@
     buildInputs =
       (self.nativeDeps."connect" or []);
     deps = [
-      self.by-version."qs"."0.6.5"
+      self.by-version."qs"."0.6.6"
       self.by-version."mime"."1.2.11"
       self.by-version."formidable"."1.0.14"
     ];
@@ -2024,6 +2089,38 @@
     ];
     passthru.names = [ "connect" ];
   };
+  by-spec."connect"."2.11.2" =
+    self.by-version."connect"."2.11.2";
+  by-version."connect"."2.11.2" = lib.makeOverridable self.buildNodePackage {
+    name = "connect-2.11.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.11.2.tgz";
+        sha1 = "cd05c661f686dfe9bcd2e1220c85fe82848db010";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect" or []);
+    deps = [
+      self.by-version."qs"."0.6.5"
+      self.by-version."cookie-signature"."1.0.1"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."cookie"."0.1.0"
+      self.by-version."send"."0.1.4"
+      self.by-version."bytes"."0.2.1"
+      self.by-version."fresh"."0.2.0"
+      self.by-version."pause"."0.0.1"
+      self.by-version."uid2"."0.0.3"
+      self.by-version."debug"."0.7.4"
+      self.by-version."methods"."0.1.0"
+      self.by-version."raw-body"."1.1.2"
+      self.by-version."negotiator"."0.3.0"
+      self.by-version."multiparty"."2.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
   by-spec."connect"."2.3.x" =
     self.by-version."connect"."2.3.9";
   by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage {
@@ -2107,7 +2204,7 @@
     passthru.names = [ "connect" ];
   };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.11.0";
+    self.by-version."connect"."2.11.2";
   by-spec."connect"."~2.8.4" =
     self.by-version."connect"."2.8.8";
   by-version."connect"."2.8.8" = lib.makeOverridable self.buildNodePackage {
@@ -2246,7 +2343,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.4"
+      self.by-version."uglify-js"."2.4.6"
     ];
     peerDependencies = [
     ];
@@ -2805,6 +2902,8 @@
     ];
     passthru.names = [ "debug" ];
   };
+  by-spec."debug".">= 0.7.3 < 1" =
+    self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.7.0" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.7.2" =
@@ -2829,6 +2928,30 @@
     ];
     passthru.names = [ "debuglog" ];
   };
+  by-spec."decompress-zip"."~0.0.3" =
+    self.by-version."decompress-zip"."0.0.3";
+  by-version."decompress-zip"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "decompress-zip-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.3.tgz";
+        sha1 = "14b174e5b6a528f0aa6c2e2157b7aa0152e7915a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."decompress-zip" or []);
+    deps = [
+      self.by-version."q"."0.9.7"
+      self.by-version."mkpath"."0.1.0"
+      self.by-version."binary"."0.3.0"
+      self.by-version."touch"."0.0.2"
+      self.by-version."readable-stream"."1.1.9"
+      self.by-version."nopt"."2.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "decompress-zip" ];
+  };
   by-spec."deep-eql"."0.1.3" =
     self.by-version."deep-eql"."0.1.3";
   by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -2982,6 +3105,26 @@
     ];
     passthru.names = [ "director" ];
   };
+  by-spec."dkim-signer"."~0.1.0" =
+    self.by-version."dkim-signer"."0.1.0";
+  by-version."dkim-signer"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "dkim-signer-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz";
+        sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dkim-signer" or []);
+    deps = [
+      self.by-version."punycode"."1.2.3"
+      self.by-version."mimelib"."0.2.14"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dkim-signer" ];
+  };
   by-spec."domelementtype"."1" =
     self.by-version."domelementtype"."1.1.1";
   by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -3058,13 +3201,13 @@
     passthru.names = [ "domutils" ];
   };
   by-spec."domutils"."1.2" =
-    self.by-version."domutils"."1.2.1";
-  by-version."domutils"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "domutils-1.2.1";
+    self.by-version."domutils"."1.2.2";
+  by-version."domutils"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "domutils-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.2.1.tgz";
-        sha1 = "6ced9837e63d2c3a06eb46d1150f0058a13178d1";
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.2.2.tgz";
+        sha1 = "bd59d149cf2c034fec81a1ce063bc20fb572a2ab";
       })
     ];
     buildInputs =
@@ -3185,24 +3328,6 @@
     ];
     passthru.names = [ "encoding" ];
   };
-  by-spec."ent"."~0.1.0" =
-    self.by-version."ent"."0.1.0";
-  by-version."ent"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ent-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ent/-/ent-0.1.0.tgz";
-        sha1 = "deb9cd7f3da25b1a94c248dbbdc91d0f0c094035";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ent" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ent" ];
-  };
   by-spec."entities"."0.x" =
     self.by-version."entities"."0.3.0";
   by-version."entities"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -3258,6 +3383,27 @@
     passthru.names = [ "escape-html" ];
   };
   "escape-html" = self.by-version."escape-html"."1.0.0";
+  by-spec."escodegen"."*" =
+    self.by-version."escodegen"."1.0.0";
+  by-version."escodegen"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.0.tgz";
+        sha1 = "8428e45aec9f8d15ccd57859a83c34a91688fd2d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."escodegen" or []);
+    deps = [
+      self.by-version."esprima"."1.0.4"
+      self.by-version."estraverse"."1.4.0"
+      self.by-version."source-map"."0.1.31"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "escodegen" ];
+  };
   by-spec."escodegen"."0.0.23" =
     self.by-version."escodegen"."0.0.23";
   by-version."escodegen"."0.0.23" = lib.makeOverridable self.buildNodePackage {
@@ -3303,6 +3449,24 @@
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.2" =
     self.by-version."esprima"."1.0.4";
+  by-spec."estraverse"."*" =
+    self.by-version."estraverse"."1.5.0";
+  by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "estraverse-1.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.0.tgz";
+        sha1 = "248ec3f0d4bf39a940109c92a05ceb56d59e53ee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."estraverse" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "estraverse" ];
+  };
   by-spec."estraverse"."~0.0.4" =
     self.by-version."estraverse"."0.0.4";
   by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -3321,6 +3485,24 @@
     ];
     passthru.names = [ "estraverse" ];
   };
+  by-spec."estraverse"."~1.4.0" =
+    self.by-version."estraverse"."1.4.0";
+  by-version."estraverse"."1.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "estraverse-1.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/estraverse/-/estraverse-1.4.0.tgz";
+        sha1 = "c6e1ad13b3f1b389da32214f2debe4788382bfc6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."estraverse" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "estraverse" ];
+  };
   by-spec."event-emitter"."~0.2.2" =
     self.by-version."event-emitter"."0.2.2";
   by-version."event-emitter"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -3377,6 +3559,24 @@
     ];
     passthru.names = [ "eventemitter2" ];
   };
+  by-spec."eventemitter2"."0.4.12" =
+    self.by-version."eventemitter2"."0.4.12";
+  by-version."eventemitter2"."0.4.12" = lib.makeOverridable self.buildNodePackage {
+    name = "eventemitter2-0.4.12";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz";
+        sha1 = "6cf14249fdc8799be7416e871e73fd2bb89e35e0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eventemitter2" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eventemitter2" ];
+  };
   by-spec."eventemitter2"."~0.4.11" =
     self.by-version."eventemitter2"."0.4.13";
   by-version."eventemitter2"."0.4.13" = lib.makeOverridable self.buildNodePackage {
@@ -3436,7 +3636,7 @@
       self.by-version."node-swt"."0.1.1"
       self.by-version."node-wsfederation"."0.1.1"
       self.by-version."debug"."0.5.0"
-      self.by-version."express"."3.4.4"
+      self.by-version."express"."3.4.6"
     ];
     peerDependencies = [
     ];
@@ -3461,19 +3661,19 @@
     passthru.names = [ "exit" ];
   };
   by-spec."express"."*" =
-    self.by-version."express"."3.4.4";
-  by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.4.4";
+    self.by-version."express"."3.4.6";
+  by-version."express"."3.4.6" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.4.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz";
-        sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86";
+        url = "http://registry.npmjs.org/express/-/express-3.4.6.tgz";
+        sha1 = "85b6004076f9004f806e9f49c90487d1f6f89c43";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
-      self.by-version."connect"."2.11.0"
+      self.by-version."connect"."2.11.2"
       self.by-version."commander"."1.3.2"
       self.by-version."range-parser"."0.0.4"
       self.by-version."mkdirp"."0.3.5"
@@ -3489,7 +3689,7 @@
     ];
     passthru.names = [ "express" ];
   };
-  "express" = self.by-version."express"."3.4.4";
+  "express" = self.by-version."express"."3.4.6";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -3543,8 +3743,35 @@
   };
   by-spec."express"."3.4.4" =
     self.by-version."express"."3.4.4";
+  by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.4.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz";
+        sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express" or []);
+    deps = [
+      self.by-version."connect"."2.11.0"
+      self.by-version."commander"."1.3.2"
+      self.by-version."range-parser"."0.0.4"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."cookie"."0.1.0"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."fresh"."0.2.0"
+      self.by-version."methods"."0.1.0"
+      self.by-version."send"."0.1.4"
+      self.by-version."cookie-signature"."1.0.1"
+      self.by-version."debug"."0.7.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.4.4";
+    self.by-version."express"."3.4.6";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -3575,9 +3802,9 @@
     passthru.names = [ "express" ];
   };
   by-spec."express"."~3.4" =
-    self.by-version."express"."3.4.4";
+    self.by-version."express"."3.4.6";
   by-spec."express"."~3.4.4" =
-    self.by-version."express"."3.4.4";
+    self.by-version."express"."3.4.6";
   by-spec."express-form"."*" =
     self.by-version."express-form"."0.10.1";
   by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage {
@@ -3596,7 +3823,7 @@
       self.by-version."async"."0.2.9"
     ];
     peerDependencies = [
-      self.by-version."express"."3.4.4"
+      self.by-version."express"."3.4.6"
     ];
     passthru.names = [ "express-form" ];
   };
@@ -3714,6 +3941,26 @@
   by-spec."eyes".">=0.1.6" =
     self.by-version."eyes"."0.1.8";
   by-spec."faye-websocket"."*" =
+    self.by-version."faye-websocket"."0.7.1";
+  by-version."faye-websocket"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "faye-websocket-0.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.1.tgz";
+        sha1 = "72fe630d122333e0f36ac453f593ed70e1cb6baa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."faye-websocket" or []);
+    deps = [
+      self.by-version."websocket-driver"."0.3.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "faye-websocket" ];
+  };
+  "faye-websocket" = self.by-version."faye-websocket"."0.7.1";
+  by-spec."faye-websocket"."0.7.0" =
     self.by-version."faye-websocket"."0.7.0";
   by-version."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage {
     name = "faye-websocket-0.7.0";
@@ -3726,15 +3973,12 @@
     buildInputs =
       (self.nativeDeps."faye-websocket" or []);
     deps = [
-      self.by-version."websocket-driver"."0.3.0"
+      self.by-version."websocket-driver"."0.3.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "faye-websocket" ];
   };
-  "faye-websocket" = self.by-version."faye-websocket"."0.7.0";
-  by-spec."faye-websocket"."0.7.0" =
-    self.by-version."faye-websocket"."0.7.0";
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
@@ -3796,29 +4040,28 @@
   by-spec."findup-sync"."~0.1.2" =
     self.by-version."findup-sync"."0.1.2";
   by-spec."flatiron"."*" =
-    self.by-version."flatiron"."0.3.8";
-  by-version."flatiron"."0.3.8" = lib.makeOverridable self.buildNodePackage {
-    name = "flatiron-0.3.8";
+    self.by-version."flatiron"."0.3.9";
+  by-version."flatiron"."0.3.9" = lib.makeOverridable self.buildNodePackage {
+    name = "flatiron-0.3.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.8.tgz";
-        sha1 = "235d691f19154eff033610c12bcd51f304ff09c6";
+        url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.9.tgz";
+        sha1 = "e18cc2490e6a0f771c77afe75a1644645ec4a406";
       })
     ];
     buildInputs =
       (self.nativeDeps."flatiron" or []);
     deps = [
-      self.by-version."broadway"."0.2.7"
-      self.by-version."optimist"."0.3.5"
+      self.by-version."broadway"."0.2.9"
+      self.by-version."optimist"."0.6.0"
       self.by-version."prompt"."0.2.11"
       self.by-version."director"."1.1.10"
-      self.by-version."pkginfo"."0.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "flatiron" ];
   };
-  "flatiron" = self.by-version."flatiron"."0.3.8";
+  "flatiron" = self.by-version."flatiron"."0.3.9";
   by-spec."flatiron"."0.3.5" =
     self.by-version."flatiron"."0.3.5";
   by-version."flatiron"."0.3.5" = lib.makeOverridable self.buildNodePackage {
@@ -3960,7 +4203,7 @@
     buildInputs =
       (self.nativeDeps."forever-monitor" or []);
     deps = [
-      self.by-version."broadway"."0.2.7"
+      self.by-version."broadway"."0.2.9"
       self.by-version."minimatch"."0.2.12"
       self.by-version."pkginfo"."0.3.0"
       self.by-version."ps-tree"."0.0.3"
@@ -3985,7 +4228,7 @@
     buildInputs =
       (self.nativeDeps."forever-monitor" or []);
     deps = [
-      self.by-version."broadway"."0.2.7"
+      self.by-version."broadway"."0.2.9"
       self.by-version."minimatch"."0.0.5"
       self.by-version."pkginfo"."0.3.0"
       self.by-version."ps-tree"."0.0.3"
@@ -4187,7 +4430,7 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."jsonfile"."1.0.1"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
     ];
     peerDependencies = [
     ];
@@ -4247,7 +4490,7 @@
     buildInputs =
       (self.nativeDeps."fstream" or []);
     deps = [
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."inherits"."2.0.1"
@@ -4258,8 +4501,6 @@
   };
   by-spec."fstream"."~0.1.17" =
     self.by-version."fstream"."0.1.25";
-  by-spec."fstream"."~0.1.21" =
-    self.by-version."fstream"."0.1.25";
   by-spec."fstream"."~0.1.22" =
     self.by-version."fstream"."0.1.25";
   by-spec."fstream"."~0.1.23" =
@@ -4696,7 +4937,7 @@
     buildInputs =
       (self.nativeDeps."grunt-bower-task" or []);
     deps = [
-      self.by-version."bower"."1.2.7"
+      self.by-version."bower"."1.2.8"
       self.by-version."lodash"."0.10.0"
       self.by-version."rimraf"."2.0.3"
       self.by-version."wrench"."1.4.4"
@@ -4831,7 +5072,7 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.4"
+      self.by-version."uglify-js"."2.4.6"
       self.by-version."grunt-lib-contrib"."0.6.1"
     ];
     peerDependencies = [
@@ -4857,7 +5098,7 @@
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.2"
-      self.by-version."karma"."0.10.6"
+      self.by-version."karma"."0.10.7"
     ];
     passthru.names = [ "grunt-karma" ];
   };
@@ -5093,6 +5334,24 @@
     ];
     passthru.names = [ "hawk" ];
   };
+  by-spec."he"."~0.3.6" =
+    self.by-version."he"."0.3.6";
+  by-version."he"."0.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "he-0.3.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz";
+        sha1 = "9d7bc446e77963933301dd602d5731cb861135e0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."he" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "he" ];
+  };
   by-spec."hipache"."*" =
     self.by-version."hipache"."0.2.4";
   by-version."hipache"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -5396,6 +5655,31 @@
     passthru.names = [ "i18next" ];
   };
   "i18next" = self.by-version."i18next"."1.7.1";
+  by-spec."ibrik"."~0.0.4" =
+    self.by-version."ibrik"."0.0.4";
+  by-version."ibrik"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "ibrik-0.0.4";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/ibrik/-/ibrik-0.0.4.tgz";
+        sha1 = "1ce60747afe56ecee03cd1f6f0db30ce579961e4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ibrik" or []);
+    deps = [
+      self.by-version."coffee-script-redux"."2.0.0-beta4"
+      self.by-version."istanbul"."0.1.46"
+      self.by-version."optimist"."0.6.0"
+      self.by-version."escodegen"."1.0.0"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."which"."1.0.5"
+      self.by-version."estraverse"."1.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ibrik" ];
+  };
   by-spec."iconv-lite"."~0.2.10" =
     self.by-version."iconv-lite"."0.2.11";
   by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage {
@@ -5606,10 +5890,10 @@
     deps = [
       self.by-version."underscore"."1.5.2"
       self.by-version."winston"."0.7.2"
-      self.by-version."nconf"."0.6.8"
+      self.by-version."nconf"."0.6.9"
       self.by-version."fs-walk"."0.0.1"
       self.by-version."async"."0.2.9"
-      self.by-version."express"."3.4.4"
+      self.by-version."express"."3.4.6"
       self.by-version."jade"."0.35.0"
       self.by-version."passport"."0.1.17"
       self.by-version."passport-http"."0.2.2"
@@ -5663,13 +5947,13 @@
     passthru.names = [ "isbinaryfile" ];
   };
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.1.45";
-  by-version."istanbul"."0.1.45" = lib.makeOverridable self.buildNodePackage {
-    name = "istanbul-0.1.45";
+    self.by-version."istanbul"."0.1.46";
+  by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.1.46";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.45.tgz";
-        sha1 = "905f360213d1aefbcb7bad6ef823015ce7d6f9fd";
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.46.tgz";
+        sha1 = "cefeb1c787d125a6db23bd0f63b0eb9390b0b40d";
       })
     ];
     buildInputs =
@@ -5691,9 +5975,9 @@
     ];
     passthru.names = [ "istanbul" ];
   };
-  "istanbul" = self.by-version."istanbul"."0.1.45";
-  by-spec."istanbul"."~0.1.41" =
-    self.by-version."istanbul"."0.1.45";
+  "istanbul" = self.by-version."istanbul"."0.1.46";
+  by-spec."istanbul"."~0.1.45" =
+    self.by-version."istanbul"."0.1.46";
   by-spec."jade"."*" =
     self.by-version."jade"."0.35.0";
   by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage {
@@ -5782,6 +6066,24 @@
     passthru.names = [ "jayschema" ];
   };
   "jayschema" = self.by-version."jayschema"."0.2.0";
+  by-spec."jedediah"."~0.1.0" =
+    self.by-version."jedediah"."0.1.1";
+  by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "jedediah-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/jedediah/-/jedediah-0.1.1.tgz";
+        sha1 = "51f33021ebec6847d844cb53bbc086ee38877f84";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."jedediah" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "jedediah" ];
+  };
   by-spec."js-yaml"."*" =
     self.by-version."js-yaml"."2.1.3";
   by-version."js-yaml"."2.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -6056,20 +6358,20 @@
     passthru.names = [ "junk" ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.11.5";
-  "karma" = self.by-version."karma"."0.11.5";
+    self.by-version."karma"."0.11.7";
+  "karma" = self.by-version."karma"."0.11.7";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.11.5";
+    self.by-version."karma"."0.11.7";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.11.5";
+    self.by-version."karma"."0.11.7";
   by-spec."karma"."~0.10.0" =
-    self.by-version."karma"."0.10.6";
-  by-version."karma"."0.10.6" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.10.6";
+    self.by-version."karma"."0.10.7";
+  by-version."karma"."0.10.7" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.10.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.10.6.tgz";
-        sha1 = "6a1bcaa3317ae240564606ba6b9b22077fb50135";
+        url = "http://registry.npmjs.org/karma/-/karma-0.10.7.tgz";
+        sha1 = "de49e2323a187ecb688470c2ad3be6a30bc7c270";
       })
     ];
     buildInputs =
@@ -6099,7 +6401,7 @@
       self.by-version."karma-coffee-preprocessor"."0.1.1"
       self.by-version."karma-html2js-preprocessor"."0.1.0"
       self.by-version."karma-chrome-launcher"."0.1.1"
-      self.by-version."karma-firefox-launcher"."0.1.1"
+      self.by-version."karma-firefox-launcher"."0.1.2"
       self.by-version."karma-phantomjs-launcher"."0.1.1"
       self.by-version."karma-script-launcher"."0.1.0"
     ];
@@ -6111,39 +6413,40 @@
   by-spec."karma-coffee-preprocessor"."*" =
     self.by-version."karma-coffee-preprocessor"."0.1.1";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.1.2";
-  by-version."karma-coverage"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-coverage-0.1.2";
+    self.by-version."karma-coverage"."0.1.3";
+  by-version."karma-coverage"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-coverage-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.2.tgz";
-        sha1 = "d4d11483a8242613c5949ad825d52d3e6f647041";
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.3.tgz";
+        sha1 = "4a936fa89a2c06c339ad953a10c6d25eb6794204";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-coverage" or []);
     deps = [
-      self.by-version."istanbul"."0.1.45"
+      self.by-version."istanbul"."0.1.46"
+      self.by-version."ibrik"."0.0.4"
       self.by-version."dateformat"."1.0.6-1.2.3"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.5"
+      self.by-version."karma"."0.11.7"
     ];
     passthru.names = [ "karma-coverage" ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.1.2";
+  "karma-coverage" = self.by-version."karma-coverage"."0.1.3";
   by-spec."karma-firefox-launcher"."*" =
-    self.by-version."karma-firefox-launcher"."0.1.1";
+    self.by-version."karma-firefox-launcher"."0.1.2";
   by-spec."karma-html2js-preprocessor"."*" =
     self.by-version."karma-html2js-preprocessor"."0.1.0";
   by-spec."karma-jasmine"."*" =
     self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma"."0.11.5" = self.by-version."karma-jasmine"."0.1.3";
+  by-version."karma"."0.11.7" = self.by-version."karma-jasmine"."0.1.3";
   by-version."karma-requirejs"."0.2.0" = self.by-version."karma-jasmine"."0.1.3";
   by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma-jasmine"."0.1.3";
   by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3";
   by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3";
-  by-version."karma-firefox-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3";
+  by-version."karma-firefox-launcher"."0.1.2" = self.by-version."karma-jasmine"."0.1.3";
   by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3";
   by-version."karma-script-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3";
   by-version."karma-jasmine"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -6154,8 +6457,8 @@
         sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be";
       })
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.11.5.tgz";
-        sha1 = "c0c0d3ea1f2f7fe3d399a902c2aa96a79d553c62";
+        url = "http://registry.npmjs.org/karma/-/karma-0.11.7.tgz";
+        sha1 = "86f44de1c44016e5af3492bceb6dea99799b18fb";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.0.tgz";
@@ -6174,8 +6477,8 @@
         sha1 = "9fc3410063cefc88e06043d233f839651a16a98c";
       })
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.1.tgz";
-        sha1 = "fa6a9a87279b85c7fe48cda3717cafefb7b9fb4d";
+        url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.2.tgz";
+        sha1 = "bf451d98a80a3f3368514db693dfddb70786fd5f";
       })
       (fetchurl {
         url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.1.tgz";
@@ -6237,7 +6540,7 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.5"
+      self.by-version."karma"."0.11.7"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
@@ -6257,8 +6560,8 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.5"
-      self.by-version."mocha"."1.14.0"
+      self.by-version."karma"."0.11.7"
+      self.by-version."mocha"."1.15.1"
     ];
     passthru.names = [ "karma-mocha" ];
   };
@@ -6269,13 +6572,13 @@
     self.by-version."karma-requirejs"."0.2.0";
   "karma-requirejs" = self.by-version."karma-requirejs"."0.2.0";
   by-spec."karma-sauce-launcher"."*" =
-    self.by-version."karma-sauce-launcher"."0.1.2";
-  by-version."karma-sauce-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-sauce-launcher-0.1.2";
+    self.by-version."karma-sauce-launcher"."0.1.5";
+  by-version."karma-sauce-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-sauce-launcher-0.1.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.2.tgz";
-        sha1 = "ee5949489ef42f4da60d3c1101d9b727465b8612";
+        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.5.tgz";
+        sha1 = "9e95e2b91556ff073105777c838e55d8b57db318";
       })
     ];
     buildInputs =
@@ -6284,13 +6587,14 @@
       self.by-version."wd"."0.1.5"
       self.by-version."sauce-connect-launcher"."0.1.11"
       self.by-version."q"."0.9.7"
+      self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.11.5"
+      self.by-version."karma"."0.11.7"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.2";
+  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.5";
   by-spec."karma-script-launcher"."*" =
     self.by-version."karma-script-launcher"."0.1.0";
   by-spec."keen.io"."0.0.3" =
@@ -6386,13 +6690,13 @@
     passthru.names = [ "keypress" ];
   };
   by-spec."knox"."*" =
-    self.by-version."knox"."0.8.7";
-  by-version."knox"."0.8.7" = lib.makeOverridable self.buildNodePackage {
-    name = "knox-0.8.7";
+    self.by-version."knox"."0.8.8";
+  by-version."knox"."0.8.8" = lib.makeOverridable self.buildNodePackage {
+    name = "knox-0.8.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/knox/-/knox-0.8.7.tgz";
-        sha1 = "a7d1360edb2eec129bfee95d49d302665760a448";
+        url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz";
+        sha1 = "aeeadd22b0a4b1e4d858a15174af2da060ab6774";
       })
     ];
     buildInputs =
@@ -6407,7 +6711,7 @@
     ];
     passthru.names = [ "knox" ];
   };
-  "knox" = self.by-version."knox"."0.8.7";
+  "knox" = self.by-version."knox"."0.8.8";
   by-spec."kue"."*" =
     self.by-version."kue"."0.6.2";
   by-version."kue"."0.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -6848,13 +7152,13 @@
   by-spec."lru-cache"."~2.3.1" =
     self.by-version."lru-cache"."2.3.1";
   by-spec."mailcomposer".">= 0.1.27" =
-    self.by-version."mailcomposer"."0.2.4";
-  by-version."mailcomposer"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "mailcomposer-0.2.4";
+    self.by-version."mailcomposer"."0.2.6";
+  by-version."mailcomposer"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "mailcomposer-0.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.4.tgz";
-        sha1 = "bdda60a5810a66305529ce002ff3f7f063692222";
+        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.6.tgz";
+        sha1 = "fa785ae7505daeb7a11f7cecf2b374d7801d1b87";
       })
     ];
     buildInputs =
@@ -6862,32 +7166,14 @@
     deps = [
       self.by-version."mimelib"."0.2.14"
       self.by-version."mime"."1.2.9"
-      self.by-version."ent"."0.1.0"
+      self.by-version."he"."0.3.6"
+      self.by-version."punycode"."1.2.3"
+      self.by-version."dkim-signer"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mailcomposer" ];
   };
-  by-spec."match-stream"."~0.0.2" =
-    self.by-version."match-stream"."0.0.2";
-  by-version."match-stream"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "match-stream-0.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz";
-        sha1 = "99eb050093b34dffade421b9ac0b410a9cfa17cf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."match-stream" or []);
-    deps = [
-      self.by-version."buffers"."0.1.1"
-      self.by-version."readable-stream"."1.0.17"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "match-stream" ];
-  };
   by-spec."meat"."*" =
     self.by-version."meat"."0.2.5";
   by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -7222,14 +7508,32 @@
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.5" =
     self.by-version."mkdirp"."0.3.5";
-  by-spec."mocha"."*" =
-    self.by-version."mocha"."1.14.0";
-  by-version."mocha"."1.14.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.14.0";
+  by-spec."mkpath"."~0.1.0" =
+    self.by-version."mkpath"."0.1.0";
+  by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mkpath-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.14.0.tgz";
-        sha1 = "713db6dc5000191a9d0358195d0908790ecb6157";
+        url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz";
+        sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mkpath" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkpath" ];
+  };
+  by-spec."mocha"."*" =
+    self.by-version."mocha"."1.15.1";
+  by-version."mocha"."1.15.1" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.15.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.15.1.tgz";
+        sha1 = "308c3268e16b0b1690d88335355c9d18d4664fc4";
       })
     ];
     buildInputs =
@@ -7247,15 +7551,15 @@
     ];
     passthru.names = [ "mocha" ];
   };
-  "mocha" = self.by-version."mocha"."1.14.0";
+  "mocha" = self.by-version."mocha"."1.15.1";
   by-spec."mocha-unfunk-reporter"."*" =
-    self.by-version."mocha-unfunk-reporter"."0.3.6";
-  by-version."mocha-unfunk-reporter"."0.3.6" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-unfunk-reporter-0.3.6";
+    self.by-version."mocha-unfunk-reporter"."0.3.7";
+  by-version."mocha-unfunk-reporter"."0.3.7" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-unfunk-reporter-0.3.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.6.tgz";
-        sha1 = "5dd07ee02a813c12eabaca8a062ae7a419cac718";
+        url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.7.tgz";
+        sha1 = "3d51ac1804dce71ecd471e4e7aa96ce2e9a6dfec";
       })
     ];
     buildInputs =
@@ -7268,7 +7572,7 @@
     ];
     passthru.names = [ "mocha-unfunk-reporter" ];
   };
-  "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.6";
+  "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.7";
   by-spec."moment"."2.1.0" =
     self.by-version."moment"."2.1.0";
   by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -7794,7 +8098,7 @@
       (self.nativeDeps."natural" or []);
     deps = [
       self.by-version."sylvester"."0.0.21"
-      self.by-version."apparatus"."0.0.7"
+      self.by-version."apparatus"."0.0.8"
       self.by-version."underscore"."1.5.2"
     ];
     peerDependencies = [
@@ -7802,28 +8106,27 @@
     passthru.names = [ "natural" ];
   };
   by-spec."nconf"."*" =
-    self.by-version."nconf"."0.6.8";
-  by-version."nconf"."0.6.8" = lib.makeOverridable self.buildNodePackage {
-    name = "nconf-0.6.8";
+    self.by-version."nconf"."0.6.9";
+  by-version."nconf"."0.6.9" = lib.makeOverridable self.buildNodePackage {
+    name = "nconf-0.6.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nconf/-/nconf-0.6.8.tgz";
-        sha1 = "bb54b5f660eb3f44d8b2cdccaa5d60453973ffb0";
+        url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
+        sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661";
       })
     ];
     buildInputs =
       (self.nativeDeps."nconf" or []);
     deps = [
-      self.by-version."async"."0.1.22"
+      self.by-version."async"."0.2.9"
       self.by-version."ini"."1.1.0"
-      self.by-version."optimist"."0.3.7"
-      self.by-version."pkginfo"."0.2.3"
+      self.by-version."optimist"."0.6.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "nconf" ];
   };
-  "nconf" = self.by-version."nconf"."0.6.8";
+  "nconf" = self.by-version."nconf"."0.6.9";
   by-spec."nconf"."0.6.7" =
     self.by-version."nconf"."0.6.7";
   by-version."nconf"."0.6.7" = lib.makeOverridable self.buildNodePackage {
@@ -7846,6 +8149,8 @@
     ];
     passthru.names = [ "nconf" ];
   };
+  by-spec."nconf"."0.6.9" =
+    self.by-version."nconf"."0.6.9";
   by-spec."ncp"."0.2.x" =
     self.by-version."ncp"."0.2.7";
   by-version."ncp"."0.2.7" = lib.makeOverridable self.buildNodePackage {
@@ -7882,6 +8187,8 @@
     ];
     passthru.names = [ "ncp" ];
   };
+  by-spec."ncp"."0.4.x" =
+    self.by-version."ncp"."0.4.2";
   by-spec."ncp"."~0.4.2" =
     self.by-version."ncp"."0.4.2";
   by-spec."negotiator"."0.2.5" =
@@ -8036,7 +8343,7 @@
       self.by-version."npmlog"."0.0.6"
       self.by-version."osenv"."0.0.3"
       self.by-version."request"."2.27.0"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."semver"."2.2.1"
       self.by-version."tar"."0.1.18"
       self.by-version."which"."1.0.5"
@@ -8062,7 +8369,7 @@
       (self.nativeDeps."node-inspector" or []);
     deps = [
       self.by-version."socket.io"."0.9.16"
-      self.by-version."express"."3.4.4"
+      self.by-version."express"."3.4.6"
       self.by-version."async"."0.2.9"
       self.by-version."glob"."3.2.7"
       self.by-version."rc"."0.3.2"
@@ -8252,8 +8559,8 @@
     buildInputs =
       (self.nativeDeps."nodemailer" or []);
     deps = [
-      self.by-version."mailcomposer"."0.2.4"
-      self.by-version."simplesmtp"."0.3.15"
+      self.by-version."mailcomposer"."0.2.6"
+      self.by-version."simplesmtp"."0.3.16"
       self.by-version."optimist"."0.6.0"
     ];
     peerDependencies = [
@@ -8261,13 +8568,13 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."0.9.7";
-  by-version."nodemon"."0.9.7" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-0.9.7";
+    self.by-version."nodemon"."0.9.10";
+  by-version."nodemon"."0.9.10" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-0.9.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.7.tgz";
-        sha1 = "bfce004cf399d6785809addaabd6821e20805bd6";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.10.tgz";
+        sha1 = "4faca02a4df262cda9334ef24bfadca14c5c3112";
       })
     ];
     buildInputs =
@@ -8279,7 +8586,7 @@
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."0.9.7";
+  "nodemon" = self.by-version."nodemon"."0.9.10";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -8404,7 +8711,7 @@
       self.by-version."graceful-fs"."2.0.1"
       self.by-version."minimatch"."0.2.12"
       self.by-version."nopt"."2.1.2"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."request"."2.27.0"
       self.by-version."which"."1.0.5"
       self.by-version."tar"."0.1.18"
@@ -8466,7 +8773,7 @@
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.19"
       self.by-version."npmlog"."0.0.6"
@@ -8494,7 +8801,7 @@
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.19"
       self.by-version."npmlog"."0.0.6"
@@ -9021,24 +9328,6 @@
   };
   by-spec."osenv"."0.0.3" =
     self.by-version."osenv"."0.0.3";
-  by-spec."over"."~0.0.5" =
-    self.by-version."over"."0.0.5";
-  by-version."over"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "over-0.0.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/over/-/over-0.0.5.tgz";
-        sha1 = "f29852e70fd7e25f360e013a8ec44c82aedb5708";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."over" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "over" ];
-  };
   by-spec."owl-deepcopy"."*" =
     self.by-version."owl-deepcopy"."0.0.2";
   by-version."owl-deepcopy"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -9060,6 +9349,25 @@
   "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.2";
   by-spec."owl-deepcopy"."~0.0.1" =
     self.by-version."owl-deepcopy"."0.0.2";
+  by-spec."p-throttler"."~0.0.1" =
+    self.by-version."p-throttler"."0.0.1";
+  by-version."p-throttler"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "p-throttler-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.0.1.tgz";
+        sha1 = "c341e3589ec843852a035e6f88e6c1e96150029b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."p-throttler" or []);
+    deps = [
+      self.by-version."q"."0.9.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "p-throttler" ];
+  };
   by-spec."passport"."*" =
     self.by-version."passport"."0.1.17";
   by-version."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -9167,7 +9475,7 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."npmconf"."0.0.24"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
@@ -9326,7 +9634,7 @@
       self.by-version."pkginfo"."0.3.0"
       self.by-version."read"."1.0.5"
       self.by-version."revalidator"."0.1.5"
-      self.by-version."utile"."0.2.0"
+      self.by-version."utile"."0.2.1"
       self.by-version."winston"."0.6.2"
     ];
     peerDependencies = [
@@ -9431,27 +9739,23 @@
     ];
     passthru.names = [ "ps-tree" ];
   };
-  by-spec."pullstream"."~0.4.0" =
-    self.by-version."pullstream"."0.4.0";
-  by-version."pullstream"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "pullstream-0.4.0";
+  by-spec."punycode"."~1.2.3" =
+    self.by-version."punycode"."1.2.3";
+  by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "punycode-1.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/pullstream/-/pullstream-0.4.0.tgz";
-        sha1 = "919f15ef376433b331351f116565dc17c6fcda77";
+        url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz";
+        sha1 = "b4e304471082d783c73b3bafabf2fd9b6a486266";
       })
     ];
     buildInputs =
-      (self.nativeDeps."pullstream" or []);
+      (self.nativeDeps."punycode" or []);
     deps = [
-      self.by-version."over"."0.0.5"
-      self.by-version."readable-stream"."1.0.17"
-      self.by-version."setimmediate"."1.0.1"
-      self.by-version."slice-stream"."0.0.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "pullstream" ];
+    passthru.names = [ "punycode" ];
   };
   by-spec."q"."0.9.x" =
     self.by-version."q"."0.9.7";
@@ -9572,7 +9876,23 @@
     passthru.names = [ "qs" ];
   };
   by-spec."qs".">= 0.4.0" =
-    self.by-version."qs"."0.6.5";
+    self.by-version."qs"."0.6.6";
+  by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
+    name = "qs-0.6.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
+        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."qs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "qs" ];
+  };
   by-spec."qs"."~0.5.0" =
     self.by-version."qs"."0.5.6";
   by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage {
@@ -9594,7 +9914,7 @@
   by-spec."qs"."~0.5.4" =
     self.by-version."qs"."0.5.6";
   by-spec."qs"."~0.6.0" =
-    self.by-version."qs"."0.6.5";
+    self.by-version."qs"."0.6.6";
   by-spec."rai"."~0.1" =
     self.by-version."rai"."0.1.8";
   by-version."rai"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -9669,6 +9989,25 @@
     ];
     passthru.names = [ "raw-body" ];
   };
+  by-spec."raw-body"."1.1.2" =
+    self.by-version."raw-body"."1.1.2";
+  by-version."raw-body"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "raw-body-1.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz";
+        sha1 = "c74b3004dea5defd1696171106ac740ec31d62be";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."raw-body" or []);
+    deps = [
+      self.by-version."bytes"."0.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "raw-body" ];
+  };
   by-spec."raw-socket"."*" =
     self.by-version."raw-socket"."1.2.2";
   by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -9860,8 +10199,6 @@
     ];
     passthru.names = [ "readable-stream" ];
   };
-  by-spec."readable-stream"."~1.0.0" =
-    self.by-version."readable-stream"."1.0.17";
   by-spec."readable-stream"."~1.0.2" =
     self.by-version."readable-stream"."1.0.17";
   by-spec."readable-stream"."~1.1.8" =
@@ -10090,7 +10427,7 @@
     buildInputs =
       (self.nativeDeps."request" or []);
     deps = [
-      self.by-version."qs"."0.6.5"
+      self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
       self.by-version."forever-agent"."0.5.0"
       self.by-version."tunnel-agent"."0.3.0"
@@ -10206,7 +10543,7 @@
     buildInputs =
       (self.nativeDeps."request" or []);
     deps = [
-      self.by-version."qs"."0.6.5"
+      self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."4.0.0"
       self.by-version."forever-agent"."0.5.0"
       self.by-version."tunnel-agent"."0.3.0"
@@ -10236,7 +10573,7 @@
     buildInputs =
       (self.nativeDeps."request" or []);
     deps = [
-      self.by-version."qs"."0.6.5"
+      self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
       self.by-version."forever-agent"."0.5.0"
       self.by-version."tunnel-agent"."0.3.0"
@@ -10441,13 +10778,13 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.2.2";
-  by-version."rimraf"."2.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.2.2";
+    self.by-version."rimraf"."2.2.4";
+  by-version."rimraf"."2.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz";
-        sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.4.tgz";
+        sha1 = "9f0b530f829f7b655a6e4d2fd8cf4c042336ef58";
       })
     ];
     buildInputs =
@@ -10460,9 +10797,9 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2.x.x" =
-    self.by-version."rimraf"."2.2.2";
+    self.by-version."rimraf"."2.2.4";
   by-spec."rimraf"."~2" =
-    self.by-version."rimraf"."2.2.2";
+    self.by-version."rimraf"."2.2.4";
   by-spec."rimraf"."~2.0.2" =
     self.by-version."rimraf"."2.0.3";
   by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -10506,9 +10843,9 @@
   by-spec."rimraf"."~2.1.4" =
     self.by-version."rimraf"."2.1.4";
   by-spec."rimraf"."~2.2.0" =
-    self.by-version."rimraf"."2.2.2";
+    self.by-version."rimraf"."2.2.4";
   by-spec."rimraf"."~2.2.2" =
-    self.by-version."rimraf"."2.2.2";
+    self.by-version."rimraf"."2.2.4";
   by-spec."s3http"."*" =
     self.by-version."s3http"."0.0.3";
   by-version."s3http"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -10557,6 +10894,24 @@
     ];
     passthru.names = [ "sauce-connect-launcher" ];
   };
+  by-spec."saucelabs"."~0.1.0" =
+    self.by-version."saucelabs"."0.1.1";
+  by-version."saucelabs"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "saucelabs-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz";
+        sha1 = "5e0ea1cf3d735d6ea15fde94b5bda6bc15d2c06d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."saucelabs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "saucelabs" ];
+  };
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.5";
   by-version."sax"."0.5.5" = lib.makeOverridable self.buildNodePackage {
@@ -10789,24 +11144,6 @@
   };
   by-spec."sequence".">= 2.2.1" =
     self.by-version."sequence"."2.2.1";
-  by-spec."setimmediate"."~1.0.1" =
-    self.by-version."setimmediate"."1.0.1";
-  by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "setimmediate-1.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
-        sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."setimmediate" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "setimmediate" ];
-  };
   by-spec."sha"."~1.2.1" =
     self.by-version."sha"."1.2.3";
   by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -10907,13 +11244,13 @@
   by-spec."signals"."~1.0.0" =
     self.by-version."signals"."1.0.0";
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.15";
-  by-version."simplesmtp"."0.3.15" = lib.makeOverridable self.buildNodePackage {
-    name = "simplesmtp-0.3.15";
+    self.by-version."simplesmtp"."0.3.16";
+  by-version."simplesmtp"."0.3.16" = lib.makeOverridable self.buildNodePackage {
+    name = "simplesmtp-0.3.16";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.15.tgz";
-        sha1 = "345da4c54a3c7f9a2cddfe9110672df2b432231d";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.16.tgz";
+        sha1 = "c82ab64b957a5f979b10b96787094e3612877814";
       })
     ];
     buildInputs =
@@ -10926,25 +11263,6 @@
     ];
     passthru.names = [ "simplesmtp" ];
   };
-  by-spec."slice-stream"."0.0.0" =
-    self.by-version."slice-stream"."0.0.0";
-  by-version."slice-stream"."0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "slice-stream-0.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz";
-        sha1 = "8183df87ad44ae0b48c0625134eac6e349747860";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."slice-stream" or []);
-    deps = [
-      self.by-version."readable-stream"."1.0.17"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "slice-stream" ];
-  };
   by-spec."sliced"."0.0.3" =
     self.by-version."sliced"."0.0.3";
   by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -11243,6 +11561,8 @@
     self.by-version."source-map"."0.1.31";
   by-spec."source-map".">= 0.1.2" =
     self.by-version."source-map"."0.1.31";
+  by-spec."source-map"."~0.1.30" =
+    self.by-version."source-map"."0.1.31";
   by-spec."source-map"."~0.1.7" =
     self.by-version."source-map"."0.1.31";
   by-spec."spdy"."1.7.1" =
@@ -11381,13 +11701,13 @@
     passthru.names = [ "stream-counter" ];
   };
   by-spec."stream-splitter-transform"."*" =
-    self.by-version."stream-splitter-transform"."0.0.3";
-  by-version."stream-splitter-transform"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "stream-splitter-transform-0.0.3";
+    self.by-version."stream-splitter-transform"."0.0.4";
+  by-version."stream-splitter-transform"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "stream-splitter-transform-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.3.tgz";
-        sha1 = "5ccd3bd497ffee4c2fc7c1cc9d7b697b54c42eef";
+        url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz";
+        sha1 = "0de54e94680633a8d703b252b20fa809ed99331c";
       })
     ];
     buildInputs =
@@ -11399,7 +11719,7 @@
     ];
     passthru.names = [ "stream-splitter-transform" ];
   };
-  "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.3";
+  "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4";
   by-spec."streamsearch"."0.1.2" =
     self.by-version."streamsearch"."0.1.2";
   by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -11474,13 +11794,13 @@
     passthru.names = [ "strong-data-uri" ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.40.3";
-  by-version."stylus"."0.40.3" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.40.3";
+    self.by-version."stylus"."0.41.0";
+  by-version."stylus"."0.41.0" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.41.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.40.3.tgz";
-        sha1 = "17e566274ebd6e56f23a8928fa38626c4260ded3";
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.41.0.tgz";
+        sha1 = "b9609d5663c9624d11b28952f3e6b23cde10ac28";
       })
     ];
     buildInputs =
@@ -11495,7 +11815,7 @@
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.40.3";
+  "stylus" = self.by-version."stylus"."0.41.0";
   by-spec."stylus"."0.27.2" =
     self.by-version."stylus"."0.27.2";
   by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage {
@@ -11813,13 +12133,13 @@
     passthru.names = [ "tinycolor" ];
   };
   by-spec."tmp"."~0.0.20" =
-    self.by-version."tmp"."0.0.21";
-  by-version."tmp"."0.0.21" = lib.makeOverridable self.buildNodePackage {
-    name = "tmp-0.0.21";
+    self.by-version."tmp"."0.0.22";
+  by-version."tmp"."0.0.22" = lib.makeOverridable self.buildNodePackage {
+    name = "tmp-0.0.22";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.21.tgz";
-        sha1 = "6d263fede6570dc4d4510ffcc2efc640223b1153";
+        url = "http://registry.npmjs.org/tmp/-/tmp-0.0.22.tgz";
+        sha1 = "92133c8a93785fbbd3971c9454561921d58283cd";
       })
     ];
     buildInputs =
@@ -11830,6 +12150,25 @@
     ];
     passthru.names = [ "tmp" ];
   };
+  by-spec."touch"."0.0.2" =
+    self.by-version."touch"."0.0.2";
+  by-version."touch"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "touch-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz";
+        sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."touch" or []);
+    deps = [
+      self.by-version."nopt"."1.0.10"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "touch" ];
+  };
   by-spec."traceback".">=0.3.0 && < 0.4" =
     self.by-version."traceback"."0.3.0";
   by-version."traceback"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -12059,13 +12398,13 @@
     passthru.names = [ "uglify-js" ];
   };
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.4";
-  by-version."uglify-js"."2.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.4";
+    self.by-version."uglify-js"."2.4.6";
+  by-version."uglify-js"."2.4.6" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.4.tgz";
-        sha1 = "f629e1e46bbe0bf4cf7232c7919e66b25a8fc529";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz";
+        sha1 = "31766a4d822babf5f32c14096251ed9259298ad3";
       })
     ];
     buildInputs =
@@ -12252,7 +12591,7 @@
     buildInputs =
       (self.nativeDeps."ungit" or []);
     deps = [
-      self.by-version."express"."3.4.4"
+      self.by-version."express"."3.4.6"
       self.by-version."superagent"."0.15.7"
       self.by-version."lodash"."2.3.0"
       self.by-version."temp"."0.6.0"
@@ -12285,30 +12624,6 @@
     passthru.names = [ "ungit" ];
   };
   "ungit" = self.by-version."ungit"."0.6.0";
-  by-spec."unzip"."~0.1.7" =
-    self.by-version."unzip"."0.1.9";
-  by-version."unzip"."0.1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "unzip-0.1.9";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz";
-        sha1 = "12ac4d05c0a19fc4546df4c50ae0a7f4706a9424";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."unzip" or []);
-    deps = [
-      self.by-version."fstream"."0.1.25"
-      self.by-version."pullstream"."0.4.0"
-      self.by-version."binary"."0.3.0"
-      self.by-version."readable-stream"."1.0.17"
-      self.by-version."setimmediate"."1.0.1"
-      self.by-version."match-stream"."0.0.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "unzip" ];
-  };
   by-spec."update-notifier"."~0.1.3" =
     self.by-version."update-notifier"."0.1.7";
   by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -12415,30 +12730,32 @@
   };
   by-spec."utile"."0.1.x" =
     self.by-version."utile"."0.1.7";
-  by-spec."utile"."0.2.x" =
-    self.by-version."utile"."0.2.0";
-  by-version."utile"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "utile-0.2.0";
+  by-spec."utile"."0.2.1" =
+    self.by-version."utile"."0.2.1";
+  by-version."utile"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "utile-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/utile/-/utile-0.2.0.tgz";
-        sha1 = "91a2423ca2eb3322390e211ee3d71cf4fa193aea";
+        url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
+        sha1 = "930c88e99098d6220834c356cbd9a770522d90d7";
       })
     ];
     buildInputs =
       (self.nativeDeps."utile" or []);
     deps = [
-      self.by-version."async"."0.1.22"
+      self.by-version."async"."0.2.9"
       self.by-version."deep-equal"."0.1.0"
       self.by-version."i"."0.3.2"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."ncp"."0.2.7"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."ncp"."0.4.2"
+      self.by-version."rimraf"."2.2.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "utile" ];
   };
+  by-spec."utile"."0.2.x" =
+    self.by-version."utile"."0.2.1";
   by-spec."utile"."~0.1.7" =
     self.by-version."utile"."0.1.7";
   by-spec."uuid"."1.4.1" =
@@ -12711,7 +13028,7 @@
       self.by-version."mkdirp"."0.3.5"
       self.by-version."npmconf"."0.1.6"
       self.by-version."phantomjs"."1.9.2-4"
-      self.by-version."tmp"."0.0.21"
+      self.by-version."tmp"."0.0.22"
       self.by-version."follow-redirects"."0.0.3"
     ];
     peerDependencies = [
@@ -12720,13 +13037,13 @@
   };
   "webdrvr" = self.by-version."webdrvr"."2.37.0-1";
   by-spec."websocket-driver".">=0.3.0" =
-    self.by-version."websocket-driver"."0.3.0";
-  by-version."websocket-driver"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "websocket-driver-0.3.0";
+    self.by-version."websocket-driver"."0.3.1";
+  by-version."websocket-driver"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "websocket-driver-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.0.tgz";
-        sha1 = "497b258c508b987249ab9b6f79f0c21dd3467c64";
+        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.1.tgz";
+        sha1 = "25f86b4e7ca9d8f8136cd225ffcee71a3d2869cf";
       })
     ];
     buildInputs =
@@ -12737,6 +13054,8 @@
     ];
     passthru.names = [ "websocket-driver" ];
   };
+  by-spec."websocket-driver".">=0.3.1" =
+    self.by-version."websocket-driver"."0.3.1";
   by-spec."when"."~2.2.1" =
     self.by-version."when"."2.2.1";
   by-version."when"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -12755,7 +13074,7 @@
     ];
     passthru.names = [ "when" ];
   };
-  by-spec."which"."1" =
+  by-spec."which"."*" =
     self.by-version."which"."1.0.5";
   by-version."which"."1.0.5" = lib.makeOverridable self.buildNodePackage {
     name = "which-1.0.5";
@@ -12773,6 +13092,8 @@
     ];
     passthru.names = [ "which" ];
   };
+  by-spec."which"."1" =
+    self.by-version."which"."1.0.5";
   by-spec."which"."1.0.x" =
     self.by-version."which"."1.0.5";
   by-spec."which"."~1.0.5" =
@@ -12875,6 +13196,8 @@
     ];
     passthru.names = [ "winston" ];
   };
+  by-spec."winston"."0.7.2" =
+    self.by-version."winston"."0.7.2";
   by-spec."winston"."~0.7.2" =
     self.by-version."winston"."0.7.2";
   by-spec."with"."~1.1.0" =
@@ -13197,7 +13520,7 @@
     deps = [
       self.by-version."cheerio"."0.12.4"
       self.by-version."request"."2.25.0"
-      self.by-version."rimraf"."2.2.2"
+      self.by-version."rimraf"."2.2.4"
       self.by-version."tar"."0.1.18"
       self.by-version."diff"."1.0.7"
       self.by-version."mime"."1.2.11"
@@ -13249,7 +13572,7 @@
     ];
     peerDependencies = [
       self.by-version."grunt-cli"."0.1.11"
-      self.by-version."bower"."1.2.7"
+      self.by-version."bower"."1.2.8"
     ];
     passthru.names = [ "yo" ];
   };

From 07ce265406801170aa949de6d5196f8468a7dda0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Dec 2013 20:41:51 +0100
Subject: [PATCH 014/562] alex: update to version 3.1.3

---
 .../tools/parsing/alex/{3.1.2.nix => 3.1.3.nix}           | 8 ++++----
 pkgs/top-level/haskell-packages.nix                       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/tools/parsing/alex/{3.1.2.nix => 3.1.3.nix} (73%)

diff --git a/pkgs/development/tools/parsing/alex/3.1.2.nix b/pkgs/development/tools/parsing/alex/3.1.3.nix
similarity index 73%
rename from pkgs/development/tools/parsing/alex/3.1.2.nix
rename to pkgs/development/tools/parsing/alex/3.1.3.nix
index f969f9b65912..8174d851a312 100644
--- a/pkgs/development/tools/parsing/alex/3.1.2.nix
+++ b/pkgs/development/tools/parsing/alex/3.1.3.nix
@@ -1,13 +1,13 @@
-{ cabal, perl, QuickCheck }:
+{ cabal, happy, perl, QuickCheck }:
 
 cabal.mkDerivation (self: {
   pname = "alex";
-  version = "3.1.2";
-  sha256 = "0v8y6s9gwfk3cda6cpdl0n6vljmjbpnrdi3n93q41x24bhjyn50x";
+  version = "3.1.3";
+  sha256 = "14hajxpqb6va5mclp2k682bgw9sbmd372vw41kq5aq815bkschcd";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ QuickCheck ];
-  buildTools = [ perl ];
+  buildTools = [ happy perl ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
     description = "Alex is a tool for generating lexical analysers in Haskell";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c7ddad8895d9..57614893ba95 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     xhtml        = self.xhtml_3000_2_1;
     zlib         = self.zlib_0_5_4_1;
     cabalInstall = self.cabalInstall_1_18_0_2;
-    alex         = self.alex_3_1_2;
+    alex         = self.alex_3_1_3;
     haddock      = self.haddock_2_13_2;
     happy        = self.happy_1_19_1;
     primitive    = self.primitive_0_5_1_0;      # semi-official, but specified
@@ -2462,8 +2462,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {};
   alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {};
   alex_3_0_5 = callPackage ../development/tools/parsing/alex/3.0.5.nix {};
-  alex_3_1_2 = callPackage ../development/tools/parsing/alex/3.1.2.nix {};
-  alex = self.alex_3_1_2;
+  alex_3_1_3 = callPackage ../development/tools/parsing/alex/3.1.3.nix {};
+  alex = self.alex_3_1_3;
 
   alexMeta = callPackage ../development/tools/haskell/alex-meta {};
 

From 64feb74f440aa33839f8483d3a45f8ea1ff5b71f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Dec 2013 20:43:21 +0100
Subject: [PATCH 015/562] happy: update to version 1.19.2

---
 .../tools/parsing/happy/{1.19.1.nix => 1.19.2.nix}          | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/tools/parsing/happy/{1.19.1.nix => 1.19.2.nix} (83%)

diff --git a/pkgs/development/tools/parsing/happy/1.19.1.nix b/pkgs/development/tools/parsing/happy/1.19.2.nix
similarity index 83%
rename from pkgs/development/tools/parsing/happy/1.19.1.nix
rename to pkgs/development/tools/parsing/happy/1.19.2.nix
index 3ca5add9e6b8..eaf027b591dc 100644
--- a/pkgs/development/tools/parsing/happy/1.19.1.nix
+++ b/pkgs/development/tools/parsing/happy/1.19.2.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happy";
-  version = "1.19.1";
-  sha256 = "0vhyv8pgj3cc31xx1vbdlhc01sfpl6xpzya79bvssnkian2n6yy2";
+  version = "1.19.2";
+  sha256 = "1m74dz83fs7gbcr040nhfx1xw3smjk24g5cp6a0wxvrmlh12yc66";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ mtl ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 57614893ba95..0a5a336fcce9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -177,7 +177,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     cabalInstall = self.cabalInstall_1_18_0_2;
     alex         = self.alex_3_1_3;
     haddock      = self.haddock_2_13_2;
-    happy        = self.happy_1_19_1;
+    happy        = self.happy_1_19_2;
     primitive    = self.primitive_0_5_1_0;      # semi-official, but specified
   };
 
@@ -2493,8 +2493,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {};
   happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {};
   happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {};
-  happy_1_19_1 = callPackage ../development/tools/parsing/happy/1.19.1.nix {};
-  happy = self.happy_1_19_1;
+  happy_1_19_2 = callPackage ../development/tools/parsing/happy/1.19.2.nix {};
+  happy = self.happy_1_19_2;
 
   happyMeta = callPackage ../development/tools/haskell/happy-meta {};
 

From 01f13be7ae1b1a68ed1b70f56fcb16a4ba79986c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Dec 2013 20:58:56 +0100
Subject: [PATCH 016/562] all-packages.nix: cosmetic, no functional change

---
 pkgs/top-level/all-packages.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6eb44d42a880..7461f093de44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2734,20 +2734,20 @@ let
   # Current Haskell Platform: 2013.2.0.0
   haskellPlatform = haskellPackages.haskellPlatform;
 
-  haskellPackages_ghc6104             =                   haskell.packages_ghc6104;
-  haskellPackages_ghc6121             =                   haskell.packages_ghc6121;
-  haskellPackages_ghc6122             =                   haskell.packages_ghc6122;
-  haskellPackages_ghc6123             =                   haskell.packages_ghc6123;
-  haskellPackages_ghc701              =                   haskell.packages_ghc701;
-  haskellPackages_ghc702              =                   haskell.packages_ghc702;
-  haskellPackages_ghc703              =                   haskell.packages_ghc703;
-  haskellPackages_ghc704              =                   haskell.packages_ghc704;
-  haskellPackages_ghc721              =                   haskell.packages_ghc721;
-  haskellPackages_ghc722              =                   haskell.packages_ghc722;
-  haskellPackages_ghc741              =                   haskell.packages_ghc741;
-  haskellPackages_ghc742              =                   haskell.packages_ghc742;
-  haskellPackages_ghc761              =                   haskell.packages_ghc761;
-  haskellPackages_ghc762              =                   haskell.packages_ghc762;
+  haskellPackages_ghc6104 = haskell.packages_ghc6104;
+  haskellPackages_ghc6121 = haskell.packages_ghc6121;
+  haskellPackages_ghc6122 = haskell.packages_ghc6122;
+  haskellPackages_ghc6123 = haskell.packages_ghc6123;
+  haskellPackages_ghc701  = haskell.packages_ghc701;
+  haskellPackages_ghc702  = haskell.packages_ghc702;
+  haskellPackages_ghc703  = haskell.packages_ghc703;
+  haskellPackages_ghc704  = haskell.packages_ghc704;
+  haskellPackages_ghc721  = haskell.packages_ghc721;
+  haskellPackages_ghc722  = haskell.packages_ghc722;
+  haskellPackages_ghc741  = haskell.packages_ghc741;
+  haskellPackages_ghc742  = haskell.packages_ghc742;
+  haskellPackages_ghc761  = haskell.packages_ghc761;
+  haskellPackages_ghc762  = haskell.packages_ghc762;
   # For the default version, we build profiling versions of the libraries, too.
   # The following three lines achieve that: the first two make Hydra build explicit
   # profiling and non-profiling versions; the final respects the user-configured
@@ -2756,7 +2756,7 @@ let
   haskellPackages_ghc763_profiling    = recurseIntoAttrs (haskell.packages_ghc763.profiling);
   haskellPackages_ghc763              = recurseIntoAttrs (haskell.packages_ghc763.highPrio);
   # Reasonably current HEAD snapshot.
-  haskellPackages_ghcHEAD             =                   haskell.packages_ghcHEAD;
+  haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
 
   haxe = callPackage ../development/compilers/haxe { };
 

From e5e129a4d0366f80ddd7cf081b2017bcc8b0bfcd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Dec 2013 21:24:11 +0100
Subject: [PATCH 017/562] Fix references to haskell-opengl 2.9.1.0.

---
 pkgs/top-level/haskell-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0a5a336fcce9..f23673097dba 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1125,7 +1125,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     OpenGL = self.OpenGL_2_8_0_0;
   };
   GLUT_2_5_0_1 = callPackage ../development/libraries/haskell/GLUT/2.5.0.1.nix {
-    OpenGL = self.OpenGL_2_9_0_1;
+    OpenGL = self.OpenGL_2_9_1_0;
   };
   GLUT = self.GLUT_2_5_0_1;
 
@@ -1650,7 +1650,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
   OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {};
   OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {};
-  OpenGL_2_9_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {};
+  OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {};
   OpenGL = self.OpenGL_2_9_1_0;
 
   OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {};

From dc662dcaa211361a0ab8db1ad729b16c96e777f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Dec 2013 21:33:21 +0100
Subject: [PATCH 018/562] ghc-head: update to today's git snapshot and
 arbitrarily dub it version 7.7.20131202

---
 pkgs/development/compilers/ghc/head.nix | 10 +++++-----
 pkgs/top-level/haskell-defaults.nix     |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index e7483700ab0b..f4f8be273679 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
 
 stdenv.mkDerivation rec {
-  version = "7.7.20130828";
+  version = "7.7.20131202";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2";
-    sha256 = "180nkd77kz3mv4g7yq8ipx34p5q8k714l0z2527y49lghy118jzv";
+    url = "http://cryp.to/${name}.tar.xz";
+    sha256 = "1gnp5c3x7dbaz7s2yvkw2fmvqh5by2gpp0zlcyj8p2gv13gxi2cb";
   };
 
-  buildInputs = [ ghc perl gmp ncurses ];
+  buildInputs = [ ghc perl gmp ncurses happy alex ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 16803155b656..3589be3c6822 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -156,6 +156,7 @@
     , extraPrefs ? (x : {})
     , profExplicit ? false, profDefault ? false
     , modifyPrio ? lowPrio
+    , extraArgs ? {}
     } :
       import ./haskell-packages.nix {
         inherit pkgs newScope modifyPrio;
@@ -164,7 +165,7 @@
         enableLibraryProfiling =
           if profExplicit then profDefault
                           else config.cabal.libraryProfiling or profDefault;
-        ghc = callPackage ghcPath { ghc = ghcBinary; };
+        ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs);
       });
 
   defaultVersionPrioFun =
@@ -331,6 +332,10 @@
     packages { ghcPath = ../development/compilers/ghc/head.nix;
                ghcBinary = ghc742Binary;
                prefFun = ghcHEADPrefs;
+               extraArgs = {
+                 happy = pkgs.haskellPackages.happy_1_19_2;
+                 alex = pkgs.haskellPackages.alex_3_1_3;
+               };
              };
 
 }

From 3dd9e512c285bb5c20dc04d4517d887b573bd3c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 21:57:39 +0100
Subject: [PATCH 019/562] haskell-packages.nix: cosmetic

---
 pkgs/top-level/haskell-packages.nix | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f23673097dba..492c1759f38b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -267,33 +267,33 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   haskellPlatformArgs_2012_2_0_0 = self : {
     inherit (self) cabal ghc;
-    cgi          = self.cgi_3001_1_7_4;         # 7.4.1 ok
-    fgl          = self.fgl_5_4_2_4;            # 7.4.1 ok
-    GLUT         = self.GLUT_2_1_2_1;           # 7.4.1 ok
-    haskellSrc   = self.haskellSrc_1_0_1_5;     # 7.4.1 ok
-    html         = self.html_1_0_1_2;           # 7.4.1 ok
-    HTTP         = self.HTTP_4000_2_3;          # 7.4.1 ok
-    HUnit        = self.HUnit_1_2_4_2;          # 7.4.1 ok
-    mtl          = self.mtl_2_1_1;              # 7.4.1 ok
-    network      = self.network_2_3_0_13;       # 7.4.1 ok
-    OpenGL       = self.OpenGL_2_2_3_1;         # 7.4.1 ok
-    parallel     = self.parallel_3_2_0_2;       # 7.4.1 ok
-    parsec       = self.parsec_3_1_2;           # 7.4.1 ok
-    QuickCheck   = self.QuickCheck_2_4_2;       # 7.4.1 ok
-    random       = self.random_1_0_1_1;         # 7.4.1 ok
-    regexBase    = self.regexBase_0_93_2;       # 7.4.1 ok
-    regexCompat  = self.regexCompat_0_95_1;     # 7.4.1 ok
-    regexPosix   = self.regexPosix_0_95_1;      # 7.4.1 ok
-    stm          = self.stm_2_3;                # 7.4.1 ok
-    syb          = self.syb_0_3_6_1;            # 7.4.1 ok
-    text         = self.text_0_11_2_0;          # 7.4.1 ok
-    transformers = self.transformers_0_3_0_0;   # 7.4.1 ok
-    xhtml        = self.xhtml_3000_2_1;         # 7.4.1 ok
-    zlib         = self.zlib_0_5_3_3;           # 7.4.1 ok
-    cabalInstall = self.cabalInstall_0_14_0;    # 7.4.1 ok
-    alex         = self.alex_3_0_1;             # 7.4.1 ok
-    haddock      = self.haddock_2_10_0;         # 7.4.1 ok
-    happy        = self.happy_1_18_9;           # 7.4.1 ok
+    cgi          = self.cgi_3001_1_7_4;
+    fgl          = self.fgl_5_4_2_4;
+    GLUT         = self.GLUT_2_1_2_1;
+    haskellSrc   = self.haskellSrc_1_0_1_5;
+    html         = self.html_1_0_1_2;
+    HTTP         = self.HTTP_4000_2_3;
+    HUnit        = self.HUnit_1_2_4_2;
+    mtl          = self.mtl_2_1_1;
+    network      = self.network_2_3_0_13;
+    OpenGL       = self.OpenGL_2_2_3_1;
+    parallel     = self.parallel_3_2_0_2;
+    parsec       = self.parsec_3_1_2;
+    QuickCheck   = self.QuickCheck_2_4_2;
+    random       = self.random_1_0_1_1;
+    regexBase    = self.regexBase_0_93_2;
+    regexCompat  = self.regexCompat_0_95_1;
+    regexPosix   = self.regexPosix_0_95_1;
+    stm          = self.stm_2_3;
+    syb          = self.syb_0_3_6_1;
+    text         = self.text_0_11_2_0;
+    transformers = self.transformers_0_3_0_0;
+    xhtml        = self.xhtml_3000_2_1;
+    zlib         = self.zlib_0_5_3_3;
+    cabalInstall = self.cabalInstall_0_14_0;
+    alex         = self.alex_3_0_1;
+    haddock      = self.haddock_2_10_0;
+    happy        = self.happy_1_18_9;
   };
 
   haskellPlatform_2012_2_0_0 =

From 7c6bc645bd7c230a4bcc75d9c9fa5e88faad64f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 21:59:54 +0100
Subject: [PATCH 020/562] haskell-GLUT: update to version 2.5.0.1

---
 .../libraries/haskell/GLUT/{2.5.0.1.nix => 2.5.0.2.nix}       | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/GLUT/{2.5.0.1.nix => 2.5.0.2.nix} (85%)

diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix b/pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix
rename to pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix
index f57cb34fb4a5..da2c7f2b863d 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GLUT";
-  version = "2.5.0.1";
-  sha256 = "0f0bz64j7fxa0np8w53n51ri5m0pkwyc1kv7pvdnx02h181gl6l0";
+  version = "2.5.0.2";
+  sha256 = "0v6lwxn9karmym4fzd0hramcj86sb4wgiyqn47hmcg1dd1fsnhb5";
   buildDepends = [ OpenGL OpenGLRaw ];
   extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 492c1759f38b..6c3788f08199 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -147,7 +147,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     caseInsensitive = self.caseInsensitive_1_1_0_1;
     cgi          = self.cgi_3001_1_7_5;
     fgl          = self.fgl_5_4_2_4;
-    GLUT         = self.GLUT_2_5_0_1;
+    GLUT         = self.GLUT_2_5_0_2;
     GLURaw       = self.GLURaw_1_4_0_0;
     haskellSrc   = self.haskellSrc_1_0_1_5;
     hashable     = self.hashable_1_2_1_0;
@@ -1124,7 +1124,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix {
     OpenGL = self.OpenGL_2_8_0_0;
   };
-  GLUT_2_5_0_1 = callPackage ../development/libraries/haskell/GLUT/2.5.0.1.nix {
+  GLUT_2_5_0_2 = callPackage ../development/libraries/haskell/GLUT/2.5.0.2.nix {
     OpenGL = self.OpenGL_2_9_1_0;
   };
   GLUT = self.GLUT_2_5_0_1;

From d0d8f88d9b385686b4ace869fddf821336d41c6c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:01:15 +0100
Subject: [PATCH 021/562] haskell-packages.nix: disable transformers 0.3.0.0
 when building with GHC 7.7 or later

It's a core package now.
---
 pkgs/top-level/haskell-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6c3788f08199..266ad4f55ace 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -169,7 +169,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     stm          = self.stm_2_4_2;
     syb          = self.syb_0_4_1;
     text         = self.text_0_11_3_1;
-    transformers = null;                        # this has become a core package in GHC 7.7
+    transformers = self.transformers_0_3_0_0;   # this has become a core package in GHC 7.7
     unorderedContainers = self.unorderedContainers_0_2_3_3;
     vector       = self.vector_0_10_9_1;
     xhtml        = self.xhtml_3000_2_1;
@@ -2179,7 +2179,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   tlsExtra = callPackage ../development/libraries/haskell/tls-extra {};
 
   transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
-  transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {};
+  transformers_0_3_0_0 = if (pkgs.stdenv.lib.versionOlder ghc.version "7.7") then
+     (callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}) else null;
   transformers = self.transformers_0_3_0_0;
 
   transformersBase = callPackage ../development/libraries/haskell/transformers-base {};

From f1633d5af90547f8927eecb61821eee640df9775 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:02:24 +0100
Subject: [PATCH 022/562] haskell-packages.nix: update 'cgi' to version
 3001.1.8.4 when building with GHC 7.7 or later

Not that it helps much ... the package depends on MonadCatchIO-mtl, which is
broken in the latest version of GHC.
---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 266ad4f55ace..8698392c6891 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -145,7 +145,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     async        = self.async_2_0_1_4;
     attoparsec   = self.attoparsec_0_10_4_0;
     caseInsensitive = self.caseInsensitive_1_1_0_1;
-    cgi          = self.cgi_3001_1_7_5;
+    cgi          = self.cgi_3001_1_8_4;
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_5_0_2;
     GLURaw       = self.GLURaw_1_4_0_0;

From cf2fbb3502264bcf19ac53939f7fc401d79327d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:03:51 +0100
Subject: [PATCH 023/562] haskell-packages.nix: enable dynamic linking in GHC
 7.7 or later

The current snapshot requires shared libraries to be built (otherwise
some packages won't build). I'm sure that's a mistake in the way it's
configured that should be fixed. Anyway, enabling shared library support
is an easy way out (and an interesting experiment).
---
 pkgs/top-level/haskell-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8698392c6891..6b7044d87296 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -60,8 +60,8 @@
 
 { pkgs, newScope, ghc, prefFun, modifyPrio ? (x : x)
 , enableLibraryProfiling ? false
-, enableSharedLibraries ? false
-, enableSharedExecutables ? false
+, enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version
+, enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version
 , enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version
 }:
 

From e3c34c6b984cd39b3ee604537feb3233a4162a56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:04:21 +0100
Subject: [PATCH 024/562] cabal-install: jailbreak version 1.18.0.2 to fix the
 build with GHC 7.7 or later

---
 pkgs/tools/package-management/cabal-install/1.18.0.2.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix b/pkgs/tools/package-management/cabal-install/1.18.0.2.nix
index 9b56f60546ce..3c1c6ddd133d 100644
--- a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix
+++ b/pkgs/tools/package-management/cabal-install/1.18.0.2.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     mkdir $out/etc
     mv bash-completion $out/etc/bash_completion.d
   '';
+  patchPhase = ''
+    sed -i -e 's|array .*,|array,|' cabal-install.cabal
+  '';
   meta = {
     homepage = "http://www.haskell.org/cabal/";
     description = "The command-line interface for Cabal and Hackage";

From eead1049e6d66c3dfedd8786bf426cc52b132323 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:04:37 +0100
Subject: [PATCH 025/562] async: jailbreak version 2.0.1.4 to fix the build
 with GHC 7.7 or later

---
 pkgs/development/libraries/haskell/async/2.0.1.4.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
index 5dd76b4d6e00..24fa64931a37 100644
--- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix
+++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1";
   buildDepends = [ stm ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/simonmar/async";
     description = "Run IO operations asynchronously and wait for their results";

From fcc9ea7d4ce3be60575d875081e676f8ba40ef8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:07:30 +0100
Subject: [PATCH 026/562] haskell-network: update to version 2.4.2.1

---
 .../libraries/haskell/network/{2.4.2.0.nix => 2.4.2.1.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/network/{2.4.2.0.nix => 2.4.2.1.nix} (85%)

diff --git a/pkgs/development/libraries/haskell/network/2.4.2.0.nix b/pkgs/development/libraries/haskell/network/2.4.2.1.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/network/2.4.2.0.nix
rename to pkgs/development/libraries/haskell/network/2.4.2.1.nix
index 2912138daf7c..33a79a7eccf0 100644
--- a/pkgs/development/libraries/haskell/network/2.4.2.0.nix
+++ b/pkgs/development/libraries/haskell/network/2.4.2.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network";
-  version = "2.4.2.0";
-  sha256 = "1v6iwww8xym0sr2593ri0aa6gcs6n2975fi9gaz9n7rizbqm88qs";
+  version = "2.4.2.1";
+  sha256 = "1rm8zlpy6738wxagk1xmlvawn807cd4xf2fn0hgjqj12scviz60p";
   buildDepends = [ parsec ];
   testDepends = [
     HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6b7044d87296..b29d487c634f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -155,7 +155,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     HTTP         = self.HTTP_4000_2_9;
     HUnit        = self.HUnit_1_2_5_2;
     mtl          = self.mtl_2_1_2;
-    network      = self.network_2_4_2_0;
+    network      = self.network_2_4_2_1;
     OpenGL       = self.OpenGL_2_9_1_0;
     OpenGLRaw    = self.OpenGLRaw_1_4_0_0;
     parallel     = self.parallel_3_2_0_4;
@@ -1600,8 +1600,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
   network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
   network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {};
-  network_2_4_2_0 = callPackage ../development/libraries/haskell/network/2.4.2.0.nix {};
-  network = self.network_2_4_2_0;
+  network_2_4_2_1 = callPackage ../development/libraries/haskell/network/2.4.2.1.nix {};
+  network = self.network_2_4_2_1;
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
   networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {};

From a7bd862f0b2034156ba4b8e85af5af21d96e3016 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:07:39 +0100
Subject: [PATCH 027/562] haskell-idris: update to version 0.9.10.1

---
 pkgs/development/compilers/idris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 51f5759c5fee..4609dd0b4422 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.10";
-  sha256 = "0sbadjc4kj59f5240036pryxr4b6k6y2zkmszv99wq660mm7a3d3";
+  version = "0.9.10.1";
+  sha256 = "194gbpk8fy64maj9lcwj9hkbndc3287bh9mz2jm09vd11i23iyg1";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 39ad23ba3593208a29c19cd1c8551f2b54b732c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:07:39 +0100
Subject: [PATCH 028/562] haskell-postgresql-libpq: update to version 0.8.2.5

---
 .../libraries/haskell/postgresql-libpq/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index 53e6066f968c..720f8e67629c 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-libpq";
-  version = "0.8.2.4";
-  sha256 = "1dqb4pnsvd6378rhmlhi151sin06wfm9sx12m3ir9x0j5ppb5sx6";
+  version = "0.8.2.5";
+  sha256 = "102sakvff53dald2s7pbf22m2rgv9761251hj7bwy125jssxcd15";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";

From 7c6d83c550d7db73b5487d9ba1c32217b2c62ddf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:07:39 +0100
Subject: [PATCH 029/562] haskell-tasty: update to version 0.4.1.1

---
 pkgs/development/libraries/haskell/tasty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 41fa16b916df..c2c05a68f075 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.4.0.1";
-  sha256 = "04nnjg04520lvjm8h2ma0ihm4bz6p0ppk445i8gmn82ixwan76h0";
+  version = "0.4.1.1";
+  sha256 = "09xha87ivkllczbf0vf2n8zjn1wa5g8v8j1h9ad3207r45ndzn0w";
   buildDepends = [
     ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
   ];

From faa56cc80101da6dbfdb99e197f5e45b67b7a3d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:07:39 +0100
Subject: [PATCH 030/562] haskell-zeromq3-haskell: update to version 0.5.1

---
 .../libraries/haskell/zeromq3-haskell/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index 1240d4390a6a..a60bc457f85b 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -4,13 +4,13 @@
 
 cabal.mkDerivation (self: {
   pname = "zeromq3-haskell";
-  version = "0.5";
-  sha256 = "16qh3q5rshaxzl79aiivrysl3dhilnd2mw2p45ifgbgv87m277gq";
+  version = "0.5.1";
+  sha256 = "0jmdhs2apmcr3wf5r739gq9qqad59qj82h7qpdk3m4cc2a7djil0";
   buildDepends = [
     async MonadCatchIOTransformers semigroups transformers
   ];
   testDepends = [
-    ansiTerminal checkers MonadCatchIOTransformers QuickCheck
+    ansiTerminal async checkers MonadCatchIOTransformers QuickCheck
     transformers
   ];
   extraLibraries = [ zeromq ];

From fd5f6e81f63ec6c32d3c26bf8d74990fdbd2090d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:07:39 +0100
Subject: [PATCH 031/562] haskell-cabal2nix: update to version 1.56

---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index cc44268f3a3c..fba8729ebbf1 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.55";
-  sha256 = "0rda8g595pr7vlhzyflw9kz6fw1iz76yimbl1zizgrnpnq3h11w3";
+  version = "1.56";
+  sha256 = "0sppg4ab62ql5hdd9cdhff4f5zy74si9h5rn3sqils0hwmxl86f8";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

From ad09a97845e869a8678446cc687359687cc49e4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Dec 2013 22:52:05 +0100
Subject: [PATCH 032/562] haskell-data-pprint: jailbreak to support GHC 7.7 or
 later

---
 pkgs/development/libraries/haskell/data-pprint/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix
index b78096a18357..08202a26b713 100644
--- a/pkgs/development/libraries/haskell/data-pprint/default.nix
+++ b/pkgs/development/libraries/haskell/data-pprint/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.3";
   sha256 = "1ygbhn399d4hlrdjmg7gxbr5akydb78p6qa80rv7m6j0fsqzbf6y";
   buildDepends = [ deepseq mtl parallel time ];
+  jailbreak = true;
   meta = {
     description = "Prettyprint and compare Data values";
     license = self.stdenv.lib.licenses.bsd3;

From 3c181313e6ecac2229a09a82a694a809260c02b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Dec 2013 00:07:40 +0100
Subject: [PATCH 033/562] haskell-src-exts: drop obsolete version 1.13.5

---
 .../{1.14.0.nix => default.nix}               |  0
 pkgs/top-level/haskell-packages.nix           | 20 +++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)
 rename pkgs/development/libraries/haskell/haskell-src-exts/{1.14.0.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix
rename to pkgs/development/libraries/haskell/haskell-src-exts/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b29d487c634f..747ce660b511 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -874,9 +874,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};
 
-  derive = callPackage ../development/libraries/haskell/derive {
-    haskellSrcExts = self.haskellSrcExts_1_14_0;
-  };
+  derive = callPackage ../development/libraries/haskell/derive {};
 
   dependentMap = callPackage ../development/libraries/haskell/dependent-map {};
 
@@ -1191,9 +1189,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
   haskellSrc = self.haskellSrc_1_0_1_5;
 
-  haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {};
-  haskellSrcExts_1_14_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.14.0.nix {};
-  haskellSrcExts = self.haskellSrcExts_1_14_0;
+  haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {};
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
 
@@ -1271,9 +1267,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hoauth = callPackage ../development/libraries/haskell/hoauth {};
 
-  hoogle = callPackage ../development/libraries/haskell/hoogle {
-    haskellSrcExts = self.haskellSrcExts_1_14_0;
-  };
+  hoogle = callPackage ../development/libraries/haskell/hoogle {};
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 
@@ -1992,9 +1986,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   strptime = callPackage ../development/libraries/haskell/strptime {};
 
-  stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {
-    haskellSrcExts = self.haskellSrcExts_1_14_0;
-  };
+  stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {};
 
   syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
   syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
@@ -2507,9 +2499,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hdevtools = callPackage ../development/tools/haskell/hdevtools {};
 
-  hlint = callPackage ../development/tools/haskell/hlint {
-    haskellSrcExts = self.haskellSrcExts_1_14_0;
-  };
+  hlint = callPackage ../development/tools/haskell/hlint {};
 
   hslogger = callPackage ../development/tools/haskell/hslogger {};
 

From 342e71ba921c6a2591f3d1d01e754959cc378b2a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Dec 2013 00:15:24 +0100
Subject: [PATCH 034/562] haskell-src-exts: clean out the obsolete happy parser
 that's included in the distribution tarball

---
 pkgs/development/libraries/haskell/haskell-src-exts/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
index 16595e331565..b044437e527a 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
   ];
   buildTools = [ happy ];
   doCheck = false;
+  preConfigure = "runhaskell Setup.hs clean";
   meta = {
     homepage = "https://github.com/haskell-suite/haskell-src-exts";
     description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";

From b0674055408d74292eddd241b3574b23e387cac2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 26 Nov 2013 11:41:58 +0200
Subject: [PATCH 035/562] kde4.krename: update from 4.0.4 to 4.0.9

---
 pkgs/applications/misc/krename/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index e5af706d41c9..75d8e5ecb89b 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }:
 
 stdenv.mkDerivation rec {
-  name = "krename-4.0.4";
+  name = "krename-4.0.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/krename/${name}.tar.bz2";
-    sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic";
+    sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds";
   };
 
   buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ];

From d5c1d33a23e58a3407e4e977af059c70ed015500 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 3 Dec 2013 09:43:29 +0200
Subject: [PATCH 036/562] clamav: update from 0.97.5 to 0.97.8, potentially
 fixes CVE-2013-2020, CVE-2013-2021

---
 pkgs/tools/security/clamav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index ec00137b36f7..858320004b84 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.97.5";
+  version = "0.97.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v";
+    sha256 = "04pwm8a84silnvgimn2wi2wgwdzwpskybx72mp10ni1dd7yvswnq";
   };
 
   buildInputs = [ zlib bzip2 libiconv ];

From 78f33605e5cd6507c04ff2c46966c386dea4469a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 03:22:35 +0200
Subject: [PATCH 037/562] kde4.quasselDaemon: update from 0.9.0 to 0.9.2,
 potentially fixes CVE-2013-4422

---
 pkgs/applications/networking/irc/quassel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 67ff1ca02c43..44792693b363 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -11,11 +11,11 @@ let
 
 in with stdenv; mkDerivation rec {
 
-  name = "quassel-0.9.0";
+  name = "quassel-0.9.2";
 
   src = fetchurl {
     url = "http://quassel-irc.org/pub/${name}.tar.bz2";
-    sha256 = "09v0igjkzan3hllk47w39hkav6v1419vpxn2lfd8473kwdmf0grf";
+    sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh";
   };
 
   buildInputs = [ cmake qt4 ]

From 9a67a50210aaf06b11862dfdfed1fb7acd16fbbe Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 03:33:33 +0200
Subject: [PATCH 038/562] libinfinity: update from 0.5.3 to 0.5.4

---
 pkgs/development/libraries/libinfinity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index b8a815e4a6f9..c305239e6e21 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -11,10 +11,10 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "libinfinity-0.5.3";
+  name = "libinfinity-0.5.4";
   src = fetchurl {
     url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
-    sha256 = "04qa3ky2skhc9b5f9i9sc8hci3ykklqznmgy616yzs3n22bmax9j";
+    sha256 = "1i7nj8qjay6amg455mwhhfqjvxnfyyql9y40a6a4a3ky170ly004";
   };
 
   buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ]

From 135920b2ebde78a85f724117b69e41967061d623 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 03:35:41 +0200
Subject: [PATCH 039/562] libtorrentRasterbar: update from 0.16.8 to 0.16.12

---
 pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 517fbf2bd430..7c3e7ed69a96 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
-  version = "0.16.8";
+  version = "0.16.12";
   
   src = fetchurl {
     url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";
-    sha256 = "01jxhyndqkc0qag22s5w0vs63hlp4rr4bca8k7fj37gky7w119c0";
+    sha256 = "0s2nxhz4d93xcl6hchmfgi8hq7aw8mrkgixh5an7fbk4shswpcg8";
   };
 
   buildInputs = [ boost pkgconfig openssl zlib python ];

From a0c425144ef9ee3c5e2dfa1b43de1ed1b516938a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 03:39:08 +0200
Subject: [PATCH 040/562] libxmlxx: update from 2.30.0 to 2.30.1

---
 pkgs/development/libraries/libxmlxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 36c8073348d8..37f03a1dfb69 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl
 , pkgconfig, libxml2, glibmm, perl }:
 stdenv.mkDerivation rec {
-  name = "libxml++-2.30.0";
+  name = "libxml++-2.30.1";
   src = fetchurl {
     url = "mirror://gnome/sources/libxml++/2.30/${name}.tar.bz2";
-    sha256 = "1hgpw9lld0k6z34kxrapz8dxf3cbgnnhkx6himnvw9ax3qf7p5gk";
+    sha256 = "02mrib11cjx5fshdr8p1biwvyl0xfkf86b6nh8ashwv590v0wgs3";
   };
 
   buildInputs = [ pkgconfig glibmm perl ];

From 1fba241e7d9048a70592e370a398d10112ea824f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 03:41:12 +0200
Subject: [PATCH 041/562] polipo: update from 1.0.4 to 1.0.4.1

---
 pkgs/servers/polipo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix
index 80865478746f..3e49715b94d1 100644
--- a/pkgs/servers/polipo/default.nix
+++ b/pkgs/servers/polipo/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
 
   name = "polipo-${version}";
-  version = "1.0.4";
+  version = "1.0.4.1";
 
   src = fetchurl {
     url = "http://freehaven.net/~chrisd/polipo/${name}.tar.gz";
-    sha256 = "0dh4kjj6vfb75nxv7q3y2kvxsq8cwrd8svsrypa810jln8x8lign";
+    sha256 = "1ykwkyvmdw6fsaj2hc40971pkwf60hvi9c43whijim00qvgbyvwd";
   };
 
   buildInputs = [ texinfo ];

From ef4c8776b7bd6713ddfe946ed21f143fb019706f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 03:42:47 +0200
Subject: [PATCH 042/562] vidalia: update from 0.2.21 to 0.3.1

---
 pkgs/tools/security/vidalia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
index 6f34d61908e1..845bbd816179 100644
--- a/pkgs/tools/security/vidalia/default.nix
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
 
   name = "vidalia-${version}";
-  version = "0.2.21";
+  version = "0.3.1";
 
   src = fetchurl {
     url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz";
-    sha256 = "1rqvvhdqgk6jqrd15invvc4r7p4nckd3b93hhr5dzpc1fxz8w064";
+    sha256 = "1mw3wnlh18rj20qjv7jxjk3a8mf75p5wzv358qfs3sm3lqgd68qm";
   };
 
   buildInputs = [ cmake qt4 ];

From 1c3da8882d5c6e85a3dba29cf6e2371c74c0338b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 03:46:57 +0200
Subject: [PATCH 043/562] vidalia: generate documentation

---
 pkgs/tools/security/vidalia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
index 845bbd816179..4d216bee0b60 100644
--- a/pkgs/tools/security/vidalia/default.nix
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4 }:
+{ stdenv, fetchurl, cmake, qt4, doxygen }:
 stdenv.mkDerivation rec {
 
   name = "vidalia-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mw3wnlh18rj20qjv7jxjk3a8mf75p5wzv358qfs3sm3lqgd68qm";
   };
 
-  buildInputs = [ cmake qt4 ];
+  buildInputs = [ cmake qt4 doxygen ];
 
   meta = with stdenv.lib; {
     homepage = https://www.torproject.org/projects/vidalia.html.en;

From f25d2c2fd4f6590d0999d31a70bb9a6d87b577a0 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 03:53:50 +0200
Subject: [PATCH 044/562] lshw: update to 2.17b

---
 pkgs/tools/system/lshw/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index 930cb7b7bff0..ccda9be9f03f 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
 
   name = "lshw-${version}";
-  version = "02.15b";
+  version = "02.17b";
 
   src = fetchurl {
-    url = http://ezix.org/software/files/lshw-B.02.15.tar.gz;
-    sha256 = "19im6yj1pmsbrwkvdmgshllhiw7jh6nzhr6dc777q1n99g3cw0gv";
+    url = http://ezix.org/software/files/lshw-B.02.17.tar.gz;
+    sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b";
   };
 
   buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk pkgconfig sqlite ];

From d2799c16336fe7b9c10ba364aedf2edf25eef18d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 03:54:34 +0200
Subject: [PATCH 045/562] spring: update from 94.1 to 95.0

---
 pkgs/games/spring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 109cb239d2be..99f80c1a5da9 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "94.1";
+  version = "95.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "19myqwpz4mi4zdlcv8318dps0ymmw7qpawhq1rgk73ycmaiyaaka";
+    sha256 = "0g0jfbbxl1g8nasibw13yjnsgalnfn4s2ii5z4s8k87vla9apg1v";
   };
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL

From 29c3424c133ab9e76afe81582fc1128e6fdde5ef Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 03:57:15 +0200
Subject: [PATCH 046/562] springLobby: update from 0.169 to 0.176

---
 pkgs/games/spring/springlobby.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index b78fd7d77888..546f9a429651 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.169";
+  version = "0.176";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "1wr8q2ha3wh718rr5rg7l6v404nf1rgkg4wkja77rfqy7r18zn7g";
+    sha256 = "0a5pnd15rlvbkvnz2s0axy3i7m2jlrk91kjpwflnrcqlf42c2rk9";
   };
 
   buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 ];

From 42a5c9d6373867cd89d390f2e044075f6c1e2abf Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 04:25:05 +0200
Subject: [PATCH 047/562] spring-lobby: add extra dependencies

---
 pkgs/games/spring/springlobby.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 546f9a429651..ac4869f78380 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar, libpng, libX11
-, gettext, bash, gawk, boost}:
+, gettext, bash, gawk, boost, libnotify, gtk, doxygen }:
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "0a5pnd15rlvbkvnz2s0axy3i7m2jlrk91kjpwflnrcqlf42c2rk9";
   };
 
-  buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 ];
+  buildInputs = [
+    cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11
+    libnotify gtk doxygen
+  ];
 
   prePatch = ''
     substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"

From 3837210feddf342c33f99de59dc4a95b36308af2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 04:25:26 +0200
Subject: [PATCH 048/562] privoxy: update from 3.0.12 to 3.0.21, potentially
 fixes CVE-2013-2503

---
 pkgs/tools/networking/privoxy/default.nix     |  8 +--
 .../privoxy/disable-user-error.patch          | 66 -------------------
 2 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/tools/networking/privoxy/disable-user-error.patch

diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 8af67aed1d40..6fff52c63bd4 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -1,17 +1,15 @@
 {stdenv, fetchurl, autoconf, automake, zlib, pcre, w3m}:
 
 stdenv.mkDerivation {
-  name = "privoxy-3.0.12";
+  name = "privoxy-3.0.21";
 
   src = fetchurl {
-    url = mirror://sourceforge/ijbswa/Sources/3.0.12%20%28stable%29/privoxy-3.0.12-stable-src.tar.gz;
-    sha256 = "16ngim1p4pb4zk8h7js4zjw280fxqxamasfngixikp2ivmzxl469";
+    url = mirror://sourceforge/ijbswa/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz;
+    sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy";
   };
 
   buildInputs = [automake autoconf zlib pcre w3m];
 
-  patches = [./disable-user-error.patch];
-
   preConfigure = ''
     autoheader
     autoconf
diff --git a/pkgs/tools/networking/privoxy/disable-user-error.patch b/pkgs/tools/networking/privoxy/disable-user-error.patch
deleted file mode 100644
index c2576409c6d0..000000000000
--- a/pkgs/tools/networking/privoxy/disable-user-error.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -rc privoxy-3.0.12-stable/configure.in privoxy-3.0.12-stable-new/configure.in
-*** privoxy-3.0.12-stable/configure.in	2009-03-21 11:45:06.000000000 +0100
---- privoxy-3.0.12-stable-new/configure.in	2009-10-05 15:39:53.683884809 +0200
-***************
-*** 652,659 ****
-  AC_PROG_AWK
-  
-  AC_CHECK_PROG(GDB,gdb,yes,no)
-! AC_PATH_PROG(BGROUPS,groups,no,/bin:/usr/bin:/usr/local/bin)
-! AC_PATH_PROG(ID,id,no,/bin:/usr/bin:/usr/local/bin)
-  AC_SUBST(ID)
-  AC_SUBST(BGROUPS)
-  
---- 652,659 ----
-  AC_PROG_AWK
-  
-  AC_CHECK_PROG(GDB,gdb,yes,no)
-! AC_PATH_PROG(BGROUPS,groups,no,$PATH)
-! AC_PATH_PROG(ID,id,no,$PATH)
-  AC_SUBST(ID)
-  AC_SUBST(BGROUPS)
-  
-***************
-*** 715,721 ****
-                      if test $? -eq 0 ; then
-                        USER=$with_user;
-                      else
-!                       AC_MSG_ERROR(There is no user '$with_user' on this system)
-                      fi
-                    fi
-                    else
---- 715,721 ----
-                      if test $? -eq 0 ; then
-                        USER=$with_user;
-                      else
-!                       AC_MSG_WARN(There is no user '$with_user' on this system)
-                      fi
-                    fi
-                    else
-***************
-*** 747,758 ****
-                      # FIXME: this fails if valid group, but not first group
-                      # listed.
-                        if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
-!                         AC_MSG_ERROR(The given value '$withval' does not match group entry)
-                        else
-                          GROUP=$with_group;
-                        fi
-                      else
-!                       AC_MSG_ERROR(There is no group entry for user '$USER')
-                      fi
-                    fi
-                  else
---- 747,758 ----
-                      # FIXME: this fails if valid group, but not first group
-                      # listed.
-                        if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
-!                         AC_MSG_WARN(The given value '$withval' does not match group entry)
-                        else
-                          GROUP=$with_group;
-                        fi
-                      else
-!                       AC_MSG_WARN(There is no group entry for user '$USER')
-                      fi
-                    fi
-                  else

From b0d281dd58851778adc507341eb3a367cb6b1395 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 04:41:25 +0200
Subject: [PATCH 049/562] privoxy: update the build script, add documentation
 dependency

---
 pkgs/tools/networking/privoxy/default.nix | 15 +++++++++------
 pkgs/top-level/all-packages.nix           |  4 +---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 6fff52c63bd4..c6a57c238a48 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, autoconf, automake, zlib, pcre, w3m}:
+{ stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }:
 
 stdenv.mkDerivation {
   name = "privoxy-3.0.21";
@@ -8,10 +8,13 @@ stdenv.mkDerivation {
     sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy";
   };
 
-  buildInputs = [automake autoconf zlib pcre w3m];
+  buildInputs = [ autoreconfHook zlib pcre w3m man ];
 
-  preConfigure = ''
-    autoheader
-    autoconf
-  '';
+  meta = with stdenv.lib; {
+    homepage = http://www.privoxy.org/;
+    description = "Non-caching web proxy with advanced filtering capabilities";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.phreedom ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7461f093de44..e107812ef9ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1868,9 +1868,7 @@ let
 
   sitecopy = callPackage ../tools/networking/sitecopy { };
 
-  privoxy = callPackage ../tools/networking/privoxy {
-    autoconf = autoconf213;
-  };
+  privoxy = callPackage ../tools/networking/privoxy { };
 
   tarsnap = callPackage ../tools/backup/tarsnap { };
 

From ae7be783a23befc2135e5e3896cca029a70ec779 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 04:49:13 +0200
Subject: [PATCH 050/562] torcs: update from 1.3.2 to 1.3.5, potentially fixes
 CVE-2012-1189

---
 pkgs/games/torcs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index 9f1fdedd5779..473161771158 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -3,11 +3,11 @@ libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
 libpng, zlib, bash }:
 
 stdenv.mkDerivation rec {
-  name = "torcs-1.3.2";
+  name = "torcs-1.3.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/torcs/${name}.tar.bz2";
-    sha256 = "0171ixhnd9cs8jkwa5awrxklfgyykcbc9m8270b8cw30lsx7qhp1";
+    sha256 = "170ff98smkkv1sk4nbz9w0alhmmbr32djmgbc08lcfhf0lj2ni38";
   };
 
   patchPhase = ''

From 22bd6c8efd9332305810f74dd46df7922d14d9fa Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 04:57:26 +0200
Subject: [PATCH 051/562] varnish: update from 3.0.4 to 3.0.5, potentially
 fixes CVE-2013-4484

---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 7c487961438d..8ff26a388088 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.4";
+  version = "3.0.5";
   name = "varnish-${version}";
 
   src = fetchurl {
     url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
-    sha256 = "0y8gml06h3wjiasfqnk7f9wrfrlgx89qz04wz3fjn8knbk5lq12f";
+    sha256 = "1dz2gazqczfzahh2n0aw71i5g9cpn5d98p9gj6ilqlkiqypxcbrh";
   };
 
   buildInputs = [ pcre libxslt groff ncurses pkgconfig readline ];

From 407c0be9355a8604f370dd682346a0f50b047188 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 04:58:50 +0200
Subject: [PATCH 052/562] unixODBC: update from 2.3.1 to 2.3.2, potentially
 fixes CVE-2012-2657, CVE-2012-2658

---
 pkgs/development/libraries/unixODBC/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 74c822e28853..ef8dcdc53290 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "unixODBC-2.3.1";
+  name = "unixODBC-2.3.2";
   src = fetchurl {
     url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
-    md5 = "86788d4006620fa1f171c13d07fdcaab";
+    sha256 = "16jw5fq7wgfky6ak1h2j2pqx99jivsdl4q8aq6immpr55xs5jd4w";
   };
   configureFlags = "--disable-gui --sysconfdir=/etc";
 }

From b296f02449c6e9298f00b2e9a32ce168a2e6ade4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:00:42 +0200
Subject: [PATCH 053/562] squid: update from 3.1.15 to 3.1.23, potentially
 fixes CVE-2012-5643, CVE-2013-0189

---
 pkgs/servers/squid/squids.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 22aba3e156ff..a94c05d5627e 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -22,10 +22,10 @@ rec {
   };
 
   squid31 = squid30.merge {
-    name = "squid-3.1.15";
+    name = "squid-3.1.23";
     src = args.fetchurl {
-      url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.bz2;
-      sha256 = "1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35";
+      url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.23.tar.bz2;
+      sha256 = "13g4y0gg48xnlzrvpymb08gh25xi50y383faapkxws7i7v94305s";
     };
   };
 

From 5677898e9de405f2e2903f361bae25b942d8d804 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:04:51 +0200
Subject: [PATCH 054/562] rsyslog: update from 7.2.6 to 7.2.7, potentially
 fixes CVE-2013-4758

---
 pkgs/tools/system/rsyslog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 3b5c06483845..c4e955056f4f 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}:
 
 stdenv.mkDerivation {
-  name = "rsyslog-7.2.6";
+  name = "rsyslog-7.2.7";
 
   src = fetchurl {
-    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.6.tar.gz;
-    sha256 = "19a5c60816ebce6c86468eb8c5fe1c4cc1febf23c9167ce59d2327fe5e047ed9";
+    url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz;
+    sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8";
   };
 
   buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls];

From 13f98c6e40d61cab2c3cbbe486083ea805631dbb Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:05:56 +0200
Subject: [PATCH 055/562] libestr: update from 0.1.4 to 0.1.9

---
 pkgs/development/libraries/libestr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix
index 74d86667b5b5..271311cf46ca 100644
--- a/pkgs/development/libraries/libestr/default.nix
+++ b/pkgs/development/libraries/libestr/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation {
-  name = "libestr-0.1.4";
+  name = "libestr-0.1.9";
   src = fetchurl {
-    url = http://libestr.adiscon.com/files/download/libestr-0.1.4.tar.gz;
-    sha256 = "1qw5vqryawdm434l9ql3r160ap2f5mmp7b6pciac7qli62y0a2z3";
+    url = http://libestr.adiscon.com/files/download/libestr-0.1.9.tar.gz;
+    sha256 = "06km9mlw5qq4aa7503l81d0qcghzl0n3lh0z41r1xjpa04nnwb42";
   };
 }

From e72352761c999e0b67c998213c1dcbaf3c345beb Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:07:47 +0200
Subject: [PATCH 056/562] tomcat6: update from 6.0.32 to 6.0.37, potentially
 fixes CVE-2012-0022, CVE-2012-2733, CVE-2012-3544, CVE-2012-3546,
 CVE-2012-4431, CVE-2012-4534, CVE-2012-5568, CVE-2012-5885, CVE-2012-5886,
 CVE-2012-5887, CVE-2013-2067

---
 pkgs/servers/http/tomcat/6.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index 79393a5d7cf9..d8304ba4dbee 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "6.0.32"; in
+let version = "6.0.37"; in
 
 stdenv.mkDerivation rec {
   name = "apache-tomcat-${version}";
 
   src = fetchurl {
     url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
-    sha256 = "505e649d1ffcf746e66be8295c8244a2949349dedf678e9f2a659c4736968c5e";
+    sha256 = "000v63amhbyp8nkw3a4pff1vm4nxri5n9j7rknhnqaxzab3sp49y";
   };
 
   installPhase =

From 56c9ae9b1d65ea4dd1594b4d8417f7c1d21cbfe1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:10:30 +0200
Subject: [PATCH 057/562] rubygems: update from 1.8.17 to 1.8.25, potentially
 fixes CVE-2012-2125, CVE-2012-2126, CVE-2013-4287, CVE-2013-4363

---
 pkgs/development/interpreters/ruby/rubygems.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index 40a43e274531..22076d5ed9e8 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -1,10 +1,10 @@
 args : with args; 
 rec {
 
-  version = "1.8.17";
+  version = "1.8.25";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
-    sha256 = "068sr55r8wiw55bpf93pp07871cbqhxk9cxma6arhd04j7n8ppph";
+    sha256 = "1j0wiy829nsfrpdzr9xzs39jf1lga3f5b7773vxqfs3lz3fli4v4";
   };
 
   buildInputs = [ruby makeWrapper];

From 7b68782e8f57e93968401dffe8599f2c90492a91 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 05:24:02 +0200
Subject: [PATCH 058/562] spring: add some of the missing dependencies

---
 pkgs/games/spring/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 99f80c1a5da9..70cffaa192e2 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
 , openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils
+, asciidoc, libxslt, docbook_xsl, curl
 , jdk ? null, python ? null
 , withAI ? true # support for AI Interfaces and Skirmish AIs
 }:
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
-    xlibs.libX11 xlibs.libXcursor mesa glew ]
+    xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl ]
     ++ stdenv.lib.optional withAI jdk
     ++ stdenv.lib.optional withAI python;
 

From e3f69c5dcceb1998d461e23ff4d35da235de636b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:25:38 +0200
Subject: [PATCH 059/562] python33Packages.pycrypto: update from 2.6 to 2.6.1,
 potentially fixes CVE-2013-1445

---
 pkgs/development/python-modules/pycrypto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 0ad1663da65a..ec741ba247e5 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python, buildPythonPackage, gmp }:
 
 buildPythonPackage rec {
-  name = "pycrypto-2.6";
+  name = "pycrypto-2.6.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz";
-    md5 = "88dad0a270d1fe83a39e0467a66a22bb";
+    sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
   };
 
   buildInputs = [ python gmp ];

From a830c0eb9d260ce158d0d404dd6de128d739919b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:26:34 +0200
Subject: [PATCH 060/562] pyopenssl: update from 0.13 to 0.13.1, potentially
 fixes CVE-2013-4314

---
 pkgs/development/python-modules/pyopenssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 1d4fe53117ce..5f92e2cf2025 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -2,7 +2,7 @@ a :
 let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.13" a;
+  version = a.lib.attrByPath ["version"] "0.13.1" a;
   propagatedBuildInputs = with a; [
     openssl python
   ];
@@ -10,7 +10,7 @@ in
 rec {
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
-    sha256 = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b";
+    sha256 = "1nrg2kas0wsv65j8sia8zkkc6ir5i20lrhkfavjxzxhl0iqyq1ms";
   };
 
   inherit propagatedBuildInputs;

From 03b15f94094322b3dd94a3c7ed96faff8010c932 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:30:48 +0200
Subject: [PATCH 061/562] mongodb: update from 2.4.5 to 2.4.8, potentially
 fixes CVE-2013-2132

---
 pkgs/servers/nosql/mongodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 11dff3244208..6956271e992c 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }:
 
-let version = "2.4.5"; in stdenv.mkDerivation rec {
+let version = "2.4.8"; in stdenv.mkDerivation rec {
   name = "mongodb-${version}";
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "01c7lb3jdr51gy7459vg5rg002xxg0mj79vlhy54n50kr31cnxmm";
+    sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x";
   };
 
   nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ];

From d1fc8ec8665b1ebfc81f39ef24ff8a99f40a0900 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:39:21 +0200
Subject: [PATCH 062/562] libnetfilter_conntrack: update from 1.0.2 to 1.0.4,
 potentially fixes CVE-2012-2671

---
 pkgs/development/libraries/libnetfilter_conntrack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 8e689ed25687..14b50bb51182 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "libnetfilter_conntrack-1.0.2";
+  name = "libnetfilter_conntrack-1.0.4";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
-    md5 = "447114b5d61bb9a9617ead3217c3d3ff";
+    sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r";
   };
 
   buildInputs = [ pkgconfig libnfnetlink libmnl ];

From 99bf1945d1f3e235bd349f72623be468699624d8 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:44:15 +0200
Subject: [PATCH 063/562] graphicsmagick: update from 1.3.13 to 1.3.18,
 potentially fixes CVE-2013-4589

---
 pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index c02bc6024df1..1f795a800ff6 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,14 +2,14 @@
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
 , libX11}:
 
-let version = "1.3.13"; in
+let version = "1.3.18"; in
 
 stdenv.mkDerivation {
   name = "graphicsmagick-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5";
+    sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
   };
 
   configureFlags = "--enable-shared";

From 92de25cb55468f489c152ef4ec46a91a0fa1f70e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:55:20 +0200
Subject: [PATCH 064/562] dropbear: update from 2013.58 to 2013.60, potentially
 fixes CVE-2013-4421, CVE-2013-4434

---
 pkgs/tools/networking/dropbear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 1d51c4864a18..933267eff23d 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -2,11 +2,11 @@
 sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2013.58";
+  name = "dropbear-2013.60";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "0m9fhabs78v35fhqmji5gkm66ahkyqbbdzmlmr9m7q8l3ndihrnq";
+    sha256 = "1fw1hrcavfqjmsn34dhkrzh8w06yfqvfss2rkvvnxnad7d2m432c";
   };
 
   dontDisableStatic = enableStatic;

From 1db5dd4ffb073ba3a38bb34318fd6f809f1a72d3 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 05:56:17 +0200
Subject: [PATCH 065/562] chrony: update from 1.27 to 1.29, potentially fixes
 CVE-2012-4502, CVE-2012-4503

---
 pkgs/tools/networking/chrony/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index d15559961f6b..41552b854182 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
-  name = "chrony-1.27";
+  name = "chrony-1.29";
   
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "17dfhcm5mrkg8ids0ajwscryr7fm7664kz10ygsa1ac047p3aj6l";
+    sha256 = "16ykdb8pnqcr30pdsaa6rabvsin2n858fmkzd81anqq6p9rg11f6";
   };
   
   buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap;

From 41333e134429f2833631c22e9e03f98c71bb0fa9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 06:11:41 +0200
Subject: [PATCH 066/562] chrony; fix installation

---
 pkgs/tools/networking/chrony/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 41552b854182..41eb1a8f77af 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap;
 
+  configureFlags = [ "--sysconfdir=\$(out)/etc" "--chronyvardir=\$(out)/var/lib/chrony" ];
+
   meta = with stdenv.lib; {
     description = "Sets your computer's clock from time servers on the Net";
     homepage = "http://chrony.tuxfamily.org/";

From 090d51cb3747889de0ff7b532c5255d8e136cb67 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:12:46 +0200
Subject: [PATCH 067/562] bogofilter: update from 1.1.6 to 1.1.7, potentially
 fixes CVE-2012-5468

---
 pkgs/tools/misc/bogofilter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index f23bd8993cff..3d9287a9b8c2 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -1,10 +1,10 @@
 {fetchurl, stdenv, flex, bdb}:
 
 stdenv.mkDerivation rec {
-  name = "bogofilter-1.1.6";
+  name = "bogofilter-1.1.7";
   src = fetchurl {
     url = "mirror://sourceforge/bogofilter/${name}.tar.bz2";
-    sha256 = "11pbhw6cc2yjdgl7nq771mrcv0z19al8jvassxnvbw4pvr5kzn9j";
+    sha256 = "0ahi3pxv9v6yjjpfyr0x7fch4c4jdikshrcx86q0j8s2rhv94snm";
   };
 
   # FIXME: We would need `pax' as a "propagated build input" (for use

From 3c51255820cdcf3fec37768fef61432bc5f25762 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:19:08 +0200
Subject: [PATCH 068/562] mpd: update from 0.18.3 to 0.18.5

---
 pkgs/servers/mpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 67a11e01651a..3b0069b8118a 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -27,10 +27,10 @@ let
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-0.18.3";
+  name = "mpd-0.18.5";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
-    sha256 = "177h23vqa59lm1fid883z9y5qn7kfb57yda6p44zva5hh85xczgh";
+    sha256 = "1jhkpbwjmzicnkjl8nsfjdgsvqvkcdjm497rl081sy8mq1jzr80c";
   };
 
   buildInputs = [ pkgconfig glib ]

From 03d64a90414957b121c28a2a918de5c0a9fa864a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:23:35 +0200
Subject: [PATCH 069/562] slock: update from 1.0 to 1.1

---
 pkgs/misc/screensavers/slock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index b33ca25fb107..c88be58abb22 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, xproto, libX11, libXext }:
 stdenv.mkDerivation rec {
-  name = "slock-1.0";
+  name = "slock-1.1";
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "b4e44ff1660f6f7eb270a0575d6ae1e0fbffcf0cdd96860a1695d57e89ae2df9";
+    sha256 = "1r70s3npmp0nyrfdsxz8cw1i1z8n9phqdlw02wjphv341h3yajp0";
   };
   buildInputs = [ xproto libX11 libXext	];
   installFlags = "DESTDIR=\${out} PREFIX=";

From 027003079bb7525f0361397ed21e45447a6a2524 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:25:05 +0200
Subject: [PATCH 070/562] libcue: update from 1.3.0 to 1.4.0

---
 pkgs/development/libraries/libcue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index 9f5127905c28..b4cea379bbae 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "libcue-1.3.0";
+  name = "libcue-1.4.0";
   src = fetchurl {
     url = "mirror://sourceforge/libcue/${name}.tar.bz2";
-    sha256 = "0gcd9maxh82fc0qah0q8xh74sch0px3n7c0qx0298n2qbk2mkn12";
+    sha256 = "17kjd7rjz1bvfn44n3n2bjb7a1ywd0yc0g4sqp5ihf9b5bn7cwlb";
   };
   meta = {
     description = "A library to parse a cue sheet";

From 5a131711fe96d6ba411ec22f520ba262f5b9b098 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:25:58 +0200
Subject: [PATCH 071/562] caps: update from 0.9.7 to 0.9.16

---
 pkgs/applications/audio/caps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index 81fb77c1c9a8..49880f6c0f31 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name = "caps-${version}";
-  version = "0.9.7";
+  version = "0.9.16";
   src = fetchurl {
     url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
-    sha256 = "0ks98r3j404s9h88x50lj5lj4l64ijj29fz5i08iyq8jrb7r0zm0";
+    sha256 = "117l04w2zwqak856lihmaxg6f22vlz71knpxy0axiyri0x82lbwv";
   };
   configurePhase = ''
     echo "PREFIX = $out" > defines.make

From 8a875f54a40fa35aa3b0798e9a978da84cd6bb9c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:27:36 +0200
Subject: [PATCH 072/562] cantarell_fonts: update from 0.0.7 to 0.0.15

---
 pkgs/data/fonts/cantarell-fonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 70a8b2bc9f47..5c9903c99717 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "cantarell-fonts-0.0.7";
+  name = "cantarell-fonts-0.0.15";
 
   src = fetchurl {
-    url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.xz;
-    sha256 = "1410ywvi951ngmx58g339phzsaf1rgjja6i0xvg49r4ds90zh8ba";
+    url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.15.tar.xz;
+    sha256 = "0zmwzzfjrlpkdjb475ann11m53a2idm76ydd2rw1hjmdr74dq72j";
   };
 
   meta = {

From ded642275fc8352dd71ab546a5169c450f5ae923 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:28:54 +0200
Subject: [PATCH 073/562] cln: update from 1.3.1 to 1.3.3

---
 pkgs/development/libraries/cln/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 66629b0561b3..f536e746d0e9 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "cln-1.3.1";
+  name = "cln-1.3.3";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.bz2";
-    sha256 = "1sd8jy5vnmww537zq6g6i586ffslm7fjliz04krv6scapgklq6ca";
+    sha256 = "04i6kdjwm4cr5pa70pilifnpvsh430rrlapkgw1x8c5vxkijxz2p";
   };
 
   buildInputs = [ gmp ];

From 1b20cadd1d594d89a5f96422fe8b8bf6bbc4a659 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:30:16 +0200
Subject: [PATCH 074/562] ebook_tools: update from 0.2.1 to 0.2.2

---
 pkgs/tools/text/ebook-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix
index abb766928d74..2fafec02d816 100644
--- a/pkgs/tools/text/ebook-tools/default.nix
+++ b/pkgs/tools/text/ebook-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }:
 
 stdenv.mkDerivation rec {
-  name = "ebook-tools-0.2.1";
+  name = "ebook-tools-0.2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/ebook-tools/${name}.tar.gz";
-    sha256 = "0wgwdsd3jwwfg36jyr5j0wayqjli3ia80lxzk10byd4cmkywnhy2";
+    sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb";
   };
 
   buildInputs = [ cmake pkgconfig libxml2 libzip ];

From 4566b55dae4987a436de34d541195f52c1312b15 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:31:25 +0200
Subject: [PATCH 075/562] lensfun: update from 0.2.5 to 0.2.7

---
 pkgs/development/libraries/lensfun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 6d54dc25e945..14e220005378 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "lensfun-0.2.5";
+  name = "lensfun-0.2.7";
 
   src = fetchurl {
     url = "http://download.berlios.de/lensfun/${name}.tar.bz2";
-    sha256 = "11zvi3lk60iljync3a495h9la7makx6lf22fbvr4lwc933mrh562";
+    sha256 = "0xv4h219zn0ldhhjnjc1q2bgpbfqzpd4b31gf9yyrwbapm3hgprx";
   };
 
   patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure";

From db20b093ea1347eb192688aadc45147ac98a0b85 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:32:32 +0200
Subject: [PATCH 076/562] libgpod: update from 0.8.2 to 0.8.3

---
 pkgs/development/libraries/libgpod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 0ad46e2ed5f4..6a1f28c96ff6 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -3,10 +3,10 @@
   libimobiledevice, python, pygobject, mutagen }:
 
 stdenv.mkDerivation rec {
-  name = "libgpod-0.8.2";
+  name = "libgpod-0.8.3";
   src = fetchurl {
     url = "mirror://sourceforge/gtkpod/${name}.tar.bz2";
-    sha256 = "14m0amy56q4riwvcjszv04a9zp7l2xk8nx0vvhy94yqd0sqfjm00";
+    sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3";
   };
 
   preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )";

From bec4483d275d3244432e27b46413d8950f0f9dcd Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:33:25 +0200
Subject: [PATCH 077/562] libofx: update from 0.9.4 to 0.9.9

---
 pkgs/development/libraries/libofx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index ba031cd927c4..2dce6db1bf26 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }:
         
 stdenv.mkDerivation rec {
-  name = "libofx-0.9.4";
+  name = "libofx-0.9.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/libofx/${name}.tar.gz";
-    sha256 = "1byvc1ar7s0nivi5cmycwlwh1y4xiad7ipfkgx57lbk7slgn8c4v";
+    sha256 = "08vvfj1rq0drcdfchrgb5zp05a2xl3a5aapsfgj0gqy3rp2qivwl";
   };
 
   configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];

From 3a1225f8a1479ee67245def91b8c222b92a54a5e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:34:34 +0200
Subject: [PATCH 078/562] libsecret: update from 0.15 to 0.16

---
 pkgs/development/libraries/libsecret/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 70c20caa88af..08ada463a548 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -2,12 +2,12 @@
   intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  version = "0.15";
+  version = "0.16";
   name = "libsecret-${version}";
 
   src = fetchurl {
     url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip";
-    sha256 = "088v1z7zbdi8b0779jads7q20x1gx6c4zmrj3q0vysc7a0k16i6k";
+    sha256 = "1yf4zvzfa45wr5bqlh54g3bmd0lgcsa8hnhppa99czca0zj7bkks";
   };
 
   propagatedBuildInputs = [ glib dbus_libs ];

From 7c5e25ab1a2ed8e6f7e561ea6ded09ef075bfbed Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:36:16 +0200
Subject: [PATCH 079/562] openbabel: update from 2.3.1 to 2.3.2

---
 pkgs/development/libraries/openbabel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index e6df13eed34e..03cfbc8fabdd 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "openbabel-2.3.1";
+  name = "openbabel-2.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/openbabel/${name}.tar.gz";
-    sha256 = "18yprqsk0fi1ri4fmvpx2ym6gx9fp3by681pl3jffpjqmz4qnbly";
+    sha256 = "122if0jkm71ngd1b0dic8k567b3j2hcikbwnpxgchv5ag5ka5b2f";
   };
 
   # TODO : perl & python bindings;

From 5378fd59488e0865173ac2794d8ab5e11718d354 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:39:34 +0200
Subject: [PATCH 080/562] uni2ascii: update from 4.15 to 4.18

---
 pkgs/tools/text/uni2ascii/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix
index b4573118a49f..0f54644eba56 100644
--- a/pkgs/tools/text/uni2ascii/default.nix
+++ b/pkgs/tools/text/uni2ascii/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "uni2ascii-4.15";
+  name = "uni2ascii-4.18";
   src = fetchurl {
     url = "http://billposer.org/Software/Downloads/${name}.tar.gz";
-    sha256 = "0vlwsqrzmdsb2mx0hbhmw1dvzy56jk8779hphnj6yxijryva6g2v";
+    sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y";
   };
 
   meta = {

From 465c863fb236200a0a4a7b55b24f1d2f61dd5846 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:40:44 +0200
Subject: [PATCH 081/562] jalv: update from 1.4.0 to 1.4.2

---
 pkgs/applications/audio/jalv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index 5655c7d832b9..fec9baa8695e 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation  rec {
   name = "jalv-${version}";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1hq968fhiz86428krqhjl3vlw71bigc9bsfcv97zgvsjh0fh6qa0";
+    sha256 = "132cq347xpa91d9m7nnmpla7gz4xg0njfw7kzwnp0gz172k0klp7";
   };
 
   buildInputs = [

From c80d5a9f113175e438ded9c865f8d6e4454464fc Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:42:55 +0200
Subject: [PATCH 082/562] lv2: update from 1.4.0 to 1.6.0

---
 pkgs/development/libraries/audio/lv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index ce8ad3f9d52c..bd6c64a9ee20 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lv2-${version}";
-  version = "1.4.0";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "http://lv2plug.in/spec/${name}.tar.bz2";
-    sha256 = "035hlfva2mij698nj3z1mz9g4mj4z5jx9axs6ww47jgyjcq38asz";
+    sha256 = "0nxrkmcpsm4v25wp2l7lcw4n0823kbplilpv51fszf710qsn7k9v";
   };
 
   buildInputs = [ gtk libsndfile pkgconfig python ];

From 67f41be3dd902a2814c0c400e1542b7c4ed441b4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:44:19 +0200
Subject: [PATCH 083/562] keymon: update from 1.13 to 1.16

---
 pkgs/applications/video/key-mon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index 7d0256ae455d..cb00ac813842 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   name = "key-mon-${version}";
-  version = "1.13";
+  version = "1.16";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://key-mon.googlecode.com/files/${name}.tar.gz";
-    sha256 = "02h7lcnyqwyqsycd1vlvl11ms81v0zmr9p0pfyl5gmzry9dj7imj";
+    sha256 = "1pfki1fyh3q29sj6kq1chhi1h2v9ki6sp09qyww59rjraypvzsis";
   };
 
   propagatedBuildInputs =

From 9a1643ff474573d127ba05c0f133d6e5a5d7f354 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:45:22 +0200
Subject: [PATCH 084/562] drumkv1: update from 0.3.2 to 0.3.5

---
 pkgs/applications/audio/drumkv1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 7fdd04ce96b8..6cad0e01a4e9 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.3.2";
+  version = "0.3.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "0bafg06iavri9dmg7hpz554kpqf1iv9crcdq46y4n4wyyxd7kajl";
+    sha256 = "125aa1lmmwjdbzyv13yaax4n6ni7h7v7c7clmjaz7bglzay7xq5w";
   };
 
   buildInputs = [ jackaudio libsndfile lv2 qt4 ];

From 3f5e010117a47ccad89aac305d8bcc7e11adea21 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:46:32 +0200
Subject: [PATCH 085/562] fluidsynth: update from 1.1.5 to 1.1.6

---
 pkgs/applications/audio/fluidsynth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index b0c5a88cb1a6..89e95f62cd5f 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation  rec {
   name = "fluidsynth-${version}";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2";
-    sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24";
+    sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj";
   };
 
   preBuild = stdenv.lib.optionalString stdenv.isDarwin ''

From cd16faa25738e1fd885279b0707e6a842e5479c8 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 06:48:29 +0200
Subject: [PATCH 086/562] fluidsynth: switch to cmake build system

---
 pkgs/applications/audio/fluidsynth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 89e95f62cd5f..d9998a9f814d 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig
-, pulseaudio }:
+, pulseaudio, cmake }:
 
 stdenv.mkDerivation  rec {
   name = "fluidsynth-${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation  rec {
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
     "-framework CoreAudio";
 
-  buildInputs = [ glib libsndfile pkgconfig ]
+  buildInputs = [ cmake glib libsndfile pkgconfig ]
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
 
   meta = with stdenv.lib; {

From 0a4855a337d70dd79a73b11ba579cdd64855c61f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:51:56 +0200
Subject: [PATCH 087/562] soprano: update from 2.9.3 to 2.9.4

---
 pkgs/development/libraries/soprano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 1447dd5346a3..7736eab511e9 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.9.3";
+  name = "soprano-2.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/soprano/${name}.tar.bz2";
-    sha256 = "08gb5d8bgy7vc6qd6r1kkmmc5rli67dlglpjqjlahpnvs26r1cwl";
+    sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4";
   };
 
   patches = [ ./find-virtuoso.patch ];

From 7c19a2213fe578a73994455bff650eaf7c0a4d3b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:52:22 +0200
Subject: [PATCH 088/562] virtuoso: update from 6.1.6 to 6.1.7

---
 pkgs/servers/sql/virtuoso/6.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix
index 9453b8d2cdb2..83ad717c0d3c 100644
--- a/pkgs/servers/sql/virtuoso/6.x.nix
+++ b/pkgs/servers/sql/virtuoso/6.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, openssl, readline, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "virtuoso-opensource-6.1.6";
+  name = "virtuoso-opensource-6.1.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
-    sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6";
+    sha256 = "0zxaf6i93jnh9lmgxxlb3jddp9ianil0szazfb6mrnqh13liwb68";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];

From 8298e450a79de04cd7c29be833042a4ac1794e39 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:53:44 +0200
Subject: [PATCH 089/562] shared_mime_info: update from 1.1 to 1.2

---
 pkgs/data/misc/shared-mime-info/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 1e424aca46b1..134a6f5307eb 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -2,11 +2,11 @@
 , libxml2, glib}:
 
 stdenv.mkDerivation rec {
-  name = "shared-mime-info-1.1";
+  name = "shared-mime-info-1.2";
 
   src = fetchurl {
     url = "http://freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "0v70z5b6340jsjvdhf7brczpzq766wc1lsnjg9hc57ks2m5hjk8q";
+    sha256 = "0y5vi0vr6rbhvfzcfg57cfskn362bpvcpca9cy598nmr87i6lld5";
   };
 
   buildInputs = [

From 56aa0d9e68a586cd86ecd53352c3f53b91006f3d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:56:04 +0200
Subject: [PATCH 090/562] giflib: update from 4.1.6 to 4.2.3

---
 pkgs/development/libraries/giflib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
index 35d66b3647b4..1dea43af676f 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "giflib-4.1.6";
+  name = "giflib-4.2.3";
   src = fetchurl {
-    url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2;
-    sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1";
+    url = mirror://sourceforge/giflib/giflib-4.2.3.tar.bz2;
+    sha256 = "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a";
   };
 }
 

From ad14c262f25de076d4b7d9d180af9e0a22edbb1f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:56:57 +0200
Subject: [PATCH 091/562] avahi: update from 0.6.30 to 0.6.31

---
 pkgs/development/libraries/avahi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index f4795286e096..a443da6c1f68 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -7,11 +7,11 @@
 assert qt4Support -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "avahi-0.6.30";
+  name = "avahi-0.6.31";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r";
+    sha256 = "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3";
   };
 
   patches = [ ./no-mkdir-localstatedir.patch ];

From 83496b02b43390ef636aa6f5ecaf23cff348c03a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 06:58:25 +0200
Subject: [PATCH 092/562] grantlee: update from 0.3.0 to 0.4.0

---
 pkgs/development/libraries/grantlee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 4fc7b681baa6..bb2461a98a15 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qt4, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "grantlee-0.3.0";
+  name = "grantlee-0.4.0";
 
 # Upstream download server has country code firewall, so I made a mirror.
   src = fetchurl {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
       "http://downloads.grantlee.org/${name}.tar.gz"
       "http://www.loegria.net/grantlee/${name}.tar.gz"
     ];
-    sha256 = "0c2zwaickp7han0zbxg78qrxv06jjfc4xyz2lmvl1xxmpv4vqzpv";
+    sha256 = "0gqdckxx45qmyixyz5d7ipcqq2dw26r71m2fpsrlnh4j2c9di8hk";
   };
 
   buildInputs = [ cmake qt4 ];

From 86f7aec95059d8d3efba285cd51471a8aec2cb09 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 08:26:13 +0200
Subject: [PATCH 093/562] phonon_backend_vlc: update from 0.5.0 to 0.7.0,
 potentially fixes CVE-2012-1775, CVE-2012-1776, CVE-2012-3377

---
 pkgs/development/libraries/phonon-backend-vlc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix
index 257c80f0b118..39f444dd58f8 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "phonon-backend-vlc";
-  v = "0.5.0";
+  v = "0.7.0";
   vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
-    sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2";
+    sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd";
   };
 
   nativeBuildInputs = [ cmake automoc4 xz ];

From 054516a0a761d0740dd08764fb96614aa7f1c886 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 08:26:24 +0200
Subject: [PATCH 094/562] phonon_backend_gstreamer: update from 4.6.3 to 4.7.0

---
 .../libraries/phonon-backend-gstreamer/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
index f297bd792c77..5644eb527c48 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
@@ -2,7 +2,7 @@
 , gst_plugins_base }:
 
 let
-  version = "4.6.3";
+  version = "4.7.0";
   pname = "phonon-backend-gstreamer";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "0n5ggap1xzspq8x1j9bvnf7wqqh5495sysri7zyg42g32gqp7qjm";
+    sha256 = "0zg7hnaywk9wpcvzgskx2334cgfz09ii77pvasrn00ikcqqnnxrs";
   };
 
   buildInputs = [ phonon qt4 gstreamer gst_plugins_base ];

From abc2a6950a7a843d23067f4204fb625ebd4ed6be Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 08:35:07 +0200
Subject: [PATCH 095/562] gpgme: update from 1.4.1 to 1.4.3

---
 pkgs/development/libraries/gpgme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 9b56344743da..ae3b53b4f44f 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,11 +11,11 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.4.1";
+  name = "gpgme-1.4.3";
   
   src = fetchurl {
     url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
-    sha1 = "d6110763e7459214fd72705e87ebc682e3b5815e";
+    sha256 = "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d";
   };
   
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];

From 883022f6256e6f4f7e5af6f865564cabdfdf5e11 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 08:39:22 +0200
Subject: [PATCH 096/562] libusb1: update from 1.0.16 to 1.0.17

---
 pkgs/development/libraries/libusb1/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 9a6a303fe32e..f06eacb67a92 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libusb-1.0.16";
+  name = "libusb-1.0.17";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libusbx/libusbx-1.0.16.tar.bz2";
-    sha256 = "105m9jvjr3vrriyg0mwmyf7qla4l71iwwnymrsk3sy9dazwmqcsv";
+    url = "mirror://sourceforge/libusbx/libusbx-1.0.17.tar.bz2";
+    sha256 = "1f25a773x9x5n48a0mcigyk77ay0hkiz6y6bi4588wzf7wn8svw7";
   };
 
   buildInputs = [ pkgconfig ];

From 3f1c26b8257201dde5fda0e7381bcf4ad7422d09 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 08:41:18 +0200
Subject: [PATCH 097/562] gpsd: update from 2.95 to 3.10

---
 pkgs/servers/gpsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index 25051167ca51..4536cb94de71 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -4,11 +4,11 @@
 , libxslt, xmlto, gpsdUser ? "gpsd" }:
 
 stdenv.mkDerivation rec {
-  name = "gpsd-2.95";
+  name = "gpsd-3.10";
 
   src = fetchurl {
     url = "http://download.berlios.de/gpsd/${name}.tar.gz";
-    sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3";
+    sha256 = "10sqhg4x7hb4vnpq5dnhg62vb5nb3dmqqnbhwjrj5kx7n63jw4h4";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl

From ecfb89101cd46aded0301b3f9983e90f2b758d34 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 08:42:34 +0200
Subject: [PATCH 098/562] eigen: update from 3.1.2 to 3.2.0

---
 pkgs/development/libraries/eigen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 5653eec6d41f..8a1cca4bdd45 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  v = "3.1.2";
+  v = "3.2.0";
 in
 stdenv.mkDerivation {
   name = "eigen-${v}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
     name = "eigen-${v}.tar.bz2";
-    sha256 = "1hywvbn4a8f96fjn3cvd6nxzh5jvh05s1r263d9vqlgn25dxrzay";
+    sha256 = "1dpshkcqjz3ckad56mkk1agbnlq0rk2d0wv14zwjg4lk1nb7h7q1";
   };
   
   nativeBuildInputs = [ cmake ];

From 3ac7543bc81e948428c0d84f92f9f204abf1b79a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 08:42:50 +0200
Subject: [PATCH 099/562] eigen2: update from 2.0.16 to 2.0.17

---
 pkgs/development/libraries/eigen/2.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix
index 9cf0a3c350cc..6317dfe5887d 100644
--- a/pkgs/development/libraries/eigen/2.0.nix
+++ b/pkgs/development/libraries/eigen/2.0.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  v = "2.0.16";
+  v = "2.0.17";
 in
 stdenv.mkDerivation {
   name = "eigen-${v}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
     name = "eigen-${v}.tar.bz2";
-    sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0";
+    sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj";
   };
 
   nativeBuildInputs = [ cmake ];

From ed616385cf8d1d12e65bd60b54a59671e67e15e9 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 4 Dec 2013 13:57:36 +0200
Subject: [PATCH 100/562] heimdal: update from 1.5.2 to 1.5.3

---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index b0a5ecedcc6c..d4728273d34c 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
 
 stdenv.mkDerivation rec {
-  name = "heimdal-1.5.2";
+  name = "heimdal-1.5.3";
 
   src = fetchurl {
     urls = [
       "http://www.h5l.org/dist/src/${name}.tar.gz"
       "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
     ];
-    sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec";
+    sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
   };
 
   ## ugly, X should be made an option

From 60ced497f68221595f5a49568affa9b63e1e1a93 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 4 Dec 2013 01:54:46 +0100
Subject: [PATCH 101/562] linux: Update to 3.2.53

---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index ae065499c658..cef3e899a3e6 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.2.52";
+  version = "3.2.53";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1wpr5xs6vg0xjlzrlbkv7bjvv34psw57crkdh4lybghi4rgrmkzl";
+    sha256 = "1fvg76g3ixyz8spzzmw5gdfr0ni9wzi2g745vphknnd9a9rgwjdm";
   };
 
   features.iwlwifi = true;

From 61adb5962cee47ae4b7a94aae12f0ef1df481cdc Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 4 Dec 2013 01:58:50 +0100
Subject: [PATCH 102/562] grsecurity: Update to 3.0-3.2.53-201312021727 and
 3.0-3.12.2-201312021733

---
 pkgs/os-specific/linux/kernel/patches.nix | 20 ++++++++++----------
 pkgs/top-level/all-packages.nix           |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 128c42533c63..b55312fe5609 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -124,25 +124,25 @@ rec {
   };
 
 
-  grsecurity_3_0_3_2_52 =
-    { name = "grsecurity-3.0-3.2.52";
+  grsecurity_3_0_3_2_53 =
+    { name = "grsecurity-3.0-3.2.53";
       patch = fetchurl {
-        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.52-201311261307.patch;
-        sha256 = "1zmzgjpbq90q2w3yl3dgdc79qan7qkh5w6g3y3nvzr6ww6jl8hqw";
+        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch;
+        sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.52
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.53
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_12_1 =
-    { name = "grsecurity-3.0-3.12.1";
+  grsecurity_3_0_3_12_2 =
+    { name = "grsecurity-3.0-3.12.2";
       patch = fetchurl {
-        url = https://grsecurity.net/test/grsecurity-3.0-3.12.1-201311261309.patch;
-        sha256 = "129q740m2iivc4i9a465lvzcph9gxlivxzg2p9dsi7c136p42mdz";
+        url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch;
+        sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.1
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.2
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e107812ef9ac..7d96fd225128 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6696,11 +6696,11 @@ let
   # config options you need (e.g. by overriding extraConfig). See list of options here:
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_52 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
   linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_1 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
   linux_3_2_apparmor = lowPrio (linux_3_2.override {

From 389bdaec0285930b12db3b96d8bf14ff63b06661 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 16:55:08 +0200
Subject: [PATCH 103/562] KDE411.Akonadi: update to 1.11.0

---
 pkgs/desktops/kde-4.11/support/akonadi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-4.11/support/akonadi/default.nix b/pkgs/desktops/kde-4.11/support/akonadi/default.nix
index af27b683f25a..d51996e3bc1e 100644
--- a/pkgs/desktops/kde-4.11/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.11/support/akonadi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "akonadi-1.10.2";
+  name = "akonadi-1.11.0";
   
   src = fetchurl {
     url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "1jij7vmrxg4kzqcq4ci73q3m3927bym5xb34kvmpq3h7p1d0vmgk";
+    sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
   };
 
   buildInputs = [ qt4 soprano libxslt boost sqlite ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "KDE PIM Storage Service";
     license = "LGPL";
     homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud ];
+    maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
     platforms = platforms.linux;
   };
 }

From 7d6fec63c6b3953fb8de2c6a18e9f8c2c8c6c02b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 16:56:05 +0200
Subject: [PATCH 104/562] giflib: fix documentation

---
 pkgs/development/libraries/giflib/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
index 1dea43af676f..cc782546a486 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
 
 stdenv.mkDerivation {
   name = "giflib-4.2.3";
@@ -6,5 +6,7 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/giflib/giflib-4.2.3.tar.bz2;
     sha256 = "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a";
   };
+
+  buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];
 }
 

From 92dc41142ab7a4fdc229803bcfeca813f5a936aa Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 16:56:39 +0200
Subject: [PATCH 105/562] phonon: update to 4.7.0

---
 pkgs/development/libraries/phonon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index bd74b9372764..ce5adc4b0a50 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }:
 
 let
-  v = "4.6.0";
+  v = "4.7.0";
 in
 
 stdenv.mkDerivation rec {
   name = "phonon-${v}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz";
-    sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4";
+    url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz";
+    sha256 = "1sxrnwm16dxy32xmrqf26762wmbqing1zx8i4vlvzgzvd9xy39ac";
   };
 
   buildInputs = [ qt4 pulseaudio ];

From 41f0e6ad9203a1859996e53323321a758c1fc7c4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 4 Dec 2013 16:57:36 +0200
Subject: [PATCH 106/562] KDE-4.11: update to 4.11.4

---
 pkgs/desktops/kde-4.11/default.nix            |   2 +-
 pkgs/desktops/kde-4.11/kde-package/4.11.4.nix | 444 ++++++++++++++++++
 .../kde-4.11/l10n/manifest-4.11.4.nix         | 272 +++++++++++
 3 files changed, 717 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.4.nix
 create mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix

diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix
index d3840120a657..ef0f871b5a8b 100644
--- a/pkgs/desktops/kde-4.11/default.nix
+++ b/pkgs/desktops/kde-4.11/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.2" }:
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.4" }:
 
 let
   # Need callPackageOrig to avoid infinite cycle
diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix
new file mode 100644
index 000000000000..17fe253dff4e
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix
@@ -0,0 +1,444 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="amor";value="1ljcsrvd2pdy0swvlc0rpjh39bvash5qwszx0lpc9v083jg9cwym";}
+  {name="analitza";value="1h2bcllpzlkbgxi72g8g143zk06kywgy00rcn5mypsy35b3ka70d";}
+  {name="ark";value="0q1g5kab6147pdw1mdwr2rkmggrg1x3plw9y0bny1xfvdlkmm1aq";}
+  {name="audiocd-kio";value="05a56m059awii6gk60dphb3hwi9zq5gd38i0gdx2fq9ns8a5k1qd";}
+  {name="blinken";value="0fhfy2yvpgcfjdjqq85ws2vddhbv0ljp5gda3x7i7lv730vmhvcq";}
+  {name="bomber";value="1bgpvd3kib6p7vwkkw9al1qd2mcxl8rv2lzw30d3a0mjka0a31x8";}
+  {name="bovo";value="0yb1fds74c803l932nmhs00gxqa80rcmnx5js43r60xjca8i97bf";}
+  {name="cantor";value="154dxff6yki487hy4xy301swm2j9wiv9ql6fhm399cr54yx595ix";}
+  {name="cervisia";value="1v2h0awmlnvjzyaaqkix4mzv3i63qf21y65nxxfvhzv29imqbx29";}
+  {name="dolphin-plugins";value="0jpmc93w8z1mg5cxxppqzkkr9mz5lsd1nsaflvmpyyrgvf81x2d7";}
+  {name="dragon";value="0q2b6f36yaqlbrpjq5h89d8igi270fxipbhj7dy8f31jbyiyrqk1";}
+  {name="ffmpegthumbs";value="175r16jk0sps6144a5d1yan3m6fyargcpa5pk05g3j6fm9z5il6n";}
+  {name="filelight";value="1wgzpcq11znw7gxqf6dv0zhiyyljax9cjglsg7hldrpmpcv36ry2";}
+  {name="granatier";value="1830bp4wb2dsqrh5wlw5si5k9aihv2sgv76flpksdywzgp35nsp6";}
+  {name="gwenview";value="02i8zkb93ribn2kb2f9yqr2ldgr5qzc9lsfw4iyzjbnsdssww0y5";}
+  {name="jovie";value="1qi602477f796wf27b9arhkl4lxcwl3zdr3d5ma38x1zqy422zcx";}
+  {name="juk";value="195wa7qzhadal8pqy98lsxivjkazms9bg5vig89q281p5gf675rj";}
+  {name="kaccessible";value="0mj1zfrkq14yi1sxg3xyq234rfq8ykjmalkbn4a1fb5prvr4x9zp";}
+  {name="kactivities";value="0xhmmam62pgw1f2sdgp7yhf8pxpblcaf1jrclfr0h3pjigghvixi";}
+  {name="kajongg";value="1ag5xs842923y347k92x2phbj6rjmzfpy8wxsqhkygw5bi12n7sd";}
+  {name="kalgebra";value="1c66ad47m94lb2qrn3cas8g194sri79xzx8dzprj7avc3659n3jh";}
+  {name="kalzium";value="0li8dip02hr22p0xrnhqlgjqrqmanyv48cpfd2q6q9hjhqjasf85";}
+  {name="kamera";value="0dcpypb1xzwn2qj2bfcz0dr2ck3falhqa5cgv0sa1lkizndsr9gw";}
+  {name="kanagram";value="1gmk1ncw8sappzz5hr5im4n23fiy628k9wjrf2fhdlrfin1qwhrn";}
+  {name="kapman";value="0pnxnql2vc88rjbgz2zmacwxv8nipfdqlaldllnnx0nzzv8y5fky";}
+  {name="kapptemplate";value="19n4dsdnsk0rm7xci43jmxxczf699nbslk5sqgx7ymrhqwjad647";}
+  {name="kate";value="137r2snggr4lckqdpck9m9lxa97ldhdqm5y1hs7gfnpnhkjhb1nm";}
+  {name="katomic";value="12096dnqyz41sf94w0ywpmwj1w5idrk7mbi0k18qjgbm9rqmapc7";}
+  {name="kblackbox";value="1qjp86lvbjy1chxik3v5m6c90wp86qa8vvpxiz87yryb3zzzrhmc";}
+  {name="kblocks";value="0vwmv5m2zhdagc5vhdvp8jkfnq3r6ls02a5r5k6m2vl5n5a9mi9k";}
+  {name="kbounce";value="1cy7lmx1viqwf62mpi137wsx2haqclgxccsdp5gk8xa3s9r9s08d";}
+  {name="kbreakout";value="1zf6bpdyq5qzzz2xgmprcfkx7jdg153skb24vr44x137sj8mhmb9";}
+  {name="kbruch";value="07w1isaddxs2vv5c92nskwfybh78naqgc84wzrfcand3h6bl1s6y";}
+  {name="kcachegrind";value="08c17i6mk50n7nw9b5n7hc6kgxr6k30lr79jxyh96q861ynlhsqm";}
+  {name="kcalc";value="0lj33rxcj4zb4bmdhz4gwmmakj8kz66bf97rdid4r82cdd1hyjj8";}
+  {name="kcharselect";value="1ghpnwv47yybviygrz3adjzrkmdwnl0qbljm41d0s6x5583p1dvd";}
+  {name="kcolorchooser";value="0951nnc3xlp45qh2im91xhnl7w241667bnpnr6xk4p9pn9h979ys";}
+  {name="kcron";value="1rlfyxqg15r7naqbcwgma7z2vwd6dn95fr4sr3pb460bk9pbpgvi";}
+  {name="kdeartwork";value="0rpipr6zvywr6fipz8m0bw7iik9vrxslbnnfjy7rf45ywkbz7rnz";}
+  {name="kde-baseapps";value="15j335pnswjmwcgcgsdxpkmdw6a6pskkk290j9h8pjrcf1fnwbfn";}
+  {name="kde-base-artwork";value="0ics2inh6vc5k06rfgx8nw3xr782s5r9fj9w2xvd4ynj87mswr0l";}
+  {name="kde-dev-scripts";value="0fkk70c1q7icsds4b99kk4bwxhldy8m7k829d2n659vi3mn0pw98";}
+  {name="kde-dev-utils";value="016899rkw5imqlr1n25jzyl7bm6pg7hfdc13i81ghglfwrzqcwsv";}
+  {name="kdegraphics-mobipocket";value="1x0h9hli509a7fqwy8zvccw8cnxfmaw1grnf6c8iy4fzjik1kimv";}
+  {name="kdegraphics-strigi-analyzer";value="1qpiydbqxs6xvwdad6w5k2kjx22ldy3lz3fl3afahgi038a246a1";}
+  {name="kdegraphics-thumbnailers";value="18pn0r7s334jy93ln42r0ny52nynlrbqxr65z1gqfxxh6bmf1z67";}
+  {name="kdelibs";value="1v9d0r5a07fsyrnrikwgwvh64p1gqx3ch2makl55qqqyzyg16lnx";}
+  {name="kdenetwork-filesharing";value="1y5n2bvx3p5zcr1615avzlcj2jwjw9g3ah6na99anyk14j1x8pnr";}
+  {name="kdenetwork-strigi-analyzers";value="1zymkbs4hd9lxck8fylbdkvlcfdm37g3a42gnfi7pcyqc7mv8az9";}
+  {name="kdepim";value="1rk35yzf0pm6bmnx4fjd2mw6wrn1fvllnqqrg5s2afz6v4shc9b4";}
+  {name="kdepimlibs";value="1lc5ly08drsaa198il44cbnbwrpzk9ci6nwks2gc8p93rrqd4siv";}
+  {name="kdepim-runtime";value="0bxjh2xcp46xnsk71zv22as7qyz393ri5mvshg2nam1jfs3fw38r";}
+  {name="kdeplasma-addons";value="1zdya555q7ljpabsggw23l008fy1q5sjpaphcr9jb4ycyhk879fc";}
+  {name="kde-runtime";value="05nd0ir5x6i2lkh4xhkmdvqs5rfy2bcj6ib6a9nd1v6j2v6h90dj";}
+  {name="kdesdk-kioslaves";value="0bdzm70gw64yab3wi35xri6nkkx4vf5b20r3056z6gys932wzfnp";}
+  {name="kdesdk-strigi-analyzers";value="026swm6mq4dzsq5a38kd6ijwm18gvwqq87k58z8yxc8xwj12cf4d";}
+  {name="kdesdk-thumbnailers";value="1zpakq07zgv1z6imfzpin180nyda1wdaiqjvd8wdl61c444byagp";}
+  {name="kde-wallpapers";value="0mrdgjqyw0l960f6gr6ggjgdw9fhnkv9xl5pf6sxla6jfz3w28lc";}
+  {name="kdewebdev";value="1zk4nnllan06l712scs5pxsy1awb962h1i5l4sf91d9plczdldli";}
+  {name="kde-workspace";value="0vzi0xy17n1r24gflcxfc8ld2qkg77k8isbz94zi9q56qpm0lhhk";}
+  {name="kdf";value="0sagjckmnlfh3mbfrvwxgcmngay6nc3wl3wf5jc5agyhpnac55wb";}
+  {name="kdiamond";value="17xkadf2ycsrd35j83gh2awmf9a5sm814cyz18pcgwjrp6k95dkg";}
+  {name="kdnssd";value="0vwqj5dzzjm4i780d3glnqkl5adn388y48nwazr4dz3kz1ay43hb";}
+  {name="kfloppy";value="0nybxrvki28j01bwdas9ys7m6a549190mai4s5sfnsz1sz3h0glh";}
+  {name="kfourinline";value="043xl0dby94b1v7hbnpsahd5ihgrzp3616zcf7af0icjmwxyqk8w";}
+  {name="kgamma";value="1l1j81zxl2v063wwbvalbvpsjbiq4zvpqfhpfrnp8gsp7s1sn0y9";}
+  {name="kgeography";value="1da95fq7437wiqy77v15k7b9y32d627ghfn16dbfpn1gl2srl6md";}
+  {name="kget";value="0g0yx6mkmz97j7kv9a5y8n4aqrrnr05k42d5jql74s0f1c32f8cr";}
+  {name="kgoldrunner";value="0dy0hx9ksfwyhsz160jlzks5m9y75nffgg53j4bcrzfakhbjiqfx";}
+  {name="kgpg";value="0qh8l99gpk71mag6zy86wjhm9mswy4sx7glxrwbbcqz67zag7ky3";}
+  {name="khangman";value="0452a4di9kbh36spvfaa66sgwfdrj6838h7h7k1g9bay9i7zw1vq";}
+  {name="kig";value="1yf8x2r1qmarqpsqzraf8xxamlgpynhdrl1afl74ay4npngc3dlp";}
+  {name="kigo";value="04jbhy55yb72nqsy9cblj813z33zddbmxv6fgxr8i2avr378d79c";}
+  {name="killbots";value="0sqislgqb8lkqq1gshx7m499nvwwcl5wfn5b6bpvg12azshzffs8";}
+  {name="kimono";value="0bjk8nq4avh0df1i5yz4y6ibgaas7503827dwf8klzns17if54mq";}
+  {name="kiriki";value="0209cjsiz8db4nlb9n77zdj25bi71xfl75b7l2wd64pgwlp4k0f6";}
+  {name="kiten";value="0hb0d5rcwl68vr0ca2vkqxmjx1iz6xjddyxd7fshggv1jbpybcy7";}
+  {name="kjumpingcube";value="0qxaagxg5cd12jjx4sm7mhh2x5xrgl5vsj0h7400x61j3wbr8npb";}
+  {name="klettres";value="04a5vy0qw70lm9wsh6qs3lvbadsa8d3blba9c7xxyxhy8l7zmp0h";}
+  {name="klickety";value="05csnzkb9c396b6gp3iij8m5cjgw68hw8bxqg6sv4gj66iyrymbr";}
+  {name="klines";value="09cl1cyc2mjqsf4p9ws749v2gpailj6kww2wph1iz4l3sgnavi1p";}
+  {name="kmag";value="0mna9a46140qa3y3p19gpif83qik4jgl3705mm8s06qh6ryan753";}
+  {name="kmahjongg";value="0k38vq5r4hr3pfqd37bvb08h7xm54l4kljgyfy3wrx565mq7n5xh";}
+  {name="kmines";value="04fwfsnj1a1cfr6c3h8cq9anvi4nh4kr5xbcc9l74zvmnnl8j1cw";}
+  {name="kmix";value="0wqiqgvf1hyinymwn5crqsa3bd7xv934qniyp8pwhlxk1k2ix6x0";}
+  {name="kmousetool";value="1g643dm8111jk4zq7smlp6hdz42qcmsar2v7y9c9i2a1169r5n1z";}
+  {name="kmouth";value="1ccibpnw09qm6r9nfb2jchrjwg8i5k3shq6g41i80sgpja6ir8h8";}
+  {name="kmplot";value="0kx3ccznqydqyc50sn27b6dswwyalhdhxrd789ac9xx6gpn1vcid";}
+  {name="knavalbattle";value="1lm4393jl45f90zbyvsznln4n7qccl3qw8a1d984ghmqvnx576jr";}
+  {name="knetwalk";value="0v91z2sd3pyrwsqwxhwz4rhm6lc3lr2y8kkpbyqmf8sf4pchfnkl";}
+  {name="kolf";value="00s9p9pxkd3insjs0fxnqcnhycy27wm5isyp4bnaa11i79i4zl3g";}
+  {name="kollision";value="0sf5pzrk10ad6x86wvbmf61jmnpb29hzc21z6l84cbq8iwqpms6x";}
+  {name="kolourpaint";value="1icagd88zvp138dr9l2g5cp7cisry0jmja5qh8mxpidk3ax94d7s";}
+  {name="kompare";value="02y3rlr4v5p6x9x2i0h39x0g1fql893hhyizb05ici2a61ddbs94";}
+  {name="konquest";value="0dg183wmz8b551g3j5rnd591y2sb8ksi0a3cnf8jm8wf3fwfa3zd";}
+  {name="konsole";value="15n68fihdi6fc0hgrk36q668x653y3z8zqfb5zzawpgd2pmnfkma";}
+  {name="kopete";value="1658mlfxaxl67zwd7gl0z83jnp8a8lwgvknxgpaa1nyyn2ygflkv";}
+  {name="korundum";value="1r0dk8hb54wwqk464rwaz3160mc32i7f06ar7k5cg4n9wkqrn9bk";}
+  {name="kpat";value="082kldxd0pnwdcayaww6dkal0imfnsnwdbcsdlcapzjp51i978q6";}
+  {name="kppp";value="1adsa7x8i8xc51a6k9fkqwkrv3rz0iwg1xkjfagslgm8s4iac8ki";}
+  {name="krdc";value="1ddvf4ls6mwmljg5szwqcwn3lsvvpx3pgrx7f0ml5hiymw87mhrr";}
+  {name="kremotecontrol";value="18imhmss3f5azcj4qnrx4jib2y0xx7rdjd4a6s4h8pqmigln6bin";}
+  {name="kreversi";value="0qhfpr7j7v8349kj0avk6qrsaiqj5q8bc4pf58abfsgv205gp3rj";}
+  {name="krfb";value="00z2hrbsfg461dky454xf8ipjp9phfxm8pb6kk0lzakkfzh59zzl";}
+  {name="kross-interpreters";value="1pz5isyb69cal9qyrhih7s5k6p2l2wwk5qiwczhc3h0ynmk2wssv";}
+  {name="kruler";value="03d48bv94l9ff7nli7k5q16xl92b38ih90v1bgxkq8pxl7gq493i";}
+  {name="ksaneplugin";value="0vwzkxqbha1qy6z965s8r1w183ipjz6vqfcxndjdrarzs7mw9ans";}
+  {name="kscd";value="1ari082m0bhn8ws8wl2kps94s7vhxkrmhlzpzggvl6fssa5fssya";}
+  {name="kshisen";value="18pliigc2wg1iypf9r8imqp5ih35vbdd4fac7fsac9mzmdvr8pib";}
+  {name="ksirk";value="1is01dzsd2x6m6vn71i552q0z3qshhgfmlqkvl9g3vsjlz9a811j";}
+  {name="ksnakeduel";value="0bnaxvzgf7bml483xdvpv1axfi39gxpbykcj8p4vcmkyaqlg9xc6";}
+  {name="ksnapshot";value="11s5ika5fbh9rhkfbpg9qiyrbd698z17aqqi44qmwn7w7hmd51si";}
+  {name="kspaceduel";value="058x1j3nv5g77zjkvkzwr0nwfy43gyaqc180mk8xidkzk6w8ncdf";}
+  {name="ksquares";value="1si68d370k69dd70dvc5s3ny0q3lm1qp0xkyrlzphvfr9ivyb6dj";}
+  {name="kstars";value="0dxdqgbayh2mdqdjx88prsm5bplsj73xy6zjz4lml99pqz5h24wa";}
+  {name="ksudoku";value="1b3csnl43i5xfwxnc10qb8aypx8ci5x6lia9qwppcv9w0gqqpmdn";}
+  {name="ksystemlog";value="1spkyqn0ywi0nbbrcmnkmh88z6525ppshw9wnrzm2ncs9ypsy45s";}
+  {name="kteatime";value="00nwbw5509g0iz80bg1jljj07kwl9z8zxkvq27qkzx1h0bm9593n";}
+  {name="ktimer";value="0v9pfbd2hbp7wa01y13845360p7r2bdzpf9h2vc4xb9nifzva9gj";}
+  {name="ktouch";value="11shkrmw1cbn19j4k167d4qjanh5b6jdqhp65dn24zxbs9prk1y9";}
+  {name="ktuberling";value="0axx1slrk7142gm9sc61amixzabphdfp2m6zkdw4zi67ly2w15vf";}
+  {name="kturtle";value="1cm6g8n2qy779cgmvfxvmg49fssrggd1hr87pz1xakd2xkz2qbid";}
+  {name="ktux";value="039ip37bw0bxc7haz3a9b5ks9hy4k0nyyrqq7n6wdhkg0m4ji5l1";}
+  {name="kubrick";value="1fmr7w7f8p54892icbvmhd439adg5b04ddfln9ky34akbw8jiap7";}
+  {name="kuser";value="14dszc4nxgmsm1q6cigh18b97ds4ixsfqp1l717lj39makz7r6jd";}
+  {name="kwallet";value="1s2w3zqbaml3i3p0s3znka7kwcwib76p0zpfbfzjaxzgxwmb4nwm";}
+  {name="kwordquiz";value="1a6chbc4hpybxa7w50jlasp5nzrz9z4qk766cxflpf532s6mv9yl";}
+  {name="libkcddb";value="0h7kg4wnjn2j1wjm758jyf0qiwllzm39zxwkvyd4r744ra88ym6a";}
+  {name="libkcompactdisc";value="18nwbjgviyqd6pvaq4l7hsihask54knfwsk6z4rpk25ln74ls7rs";}
+  {name="libkdcraw";value="1b7yzv25dp55mqkj8ap3qy97ddhdagbsfv8kanswln33k8phjvn7";}
+  {name="libkdeedu";value="1y2iwivgqsg1bb34bif99pa58cqlamfv727h8p69b5r3x0kj1mkk";}
+  {name="libkdegames";value="0k29wf6zcqvpf9xzrxbizn4pi8mijq8rbr01vck9wx8glj3306gj";}
+  {name="libkexiv2";value="048rx25n64fyyms9wjdsnlngh5j7650gzxpszf683jgf70x9paj5";}
+  {name="libkipi";value="0i8k2x68n88v0jwp0yqwbgx6n13vrspb66p3dckwkh4nfsrmnpwn";}
+  {name="libkmahjongg";value="0b5gfqqk0jjkbhdvh55njlci1k18icijq8a0m987x92dlhyn6hf2";}
+  {name="libksane";value="13ghwcssd6zp731lcqa3z8q974g5sv48nlp38crpni83jz7wqyl8";}
+  {name="lokalize";value="1i09brs8v71xhyn3fw69asfvz95gw5iblrnqzf1iybh858fz3sg8";}
+  {name="lskat";value="11754yxbabhps0w521rzcsqjpkxdk53ikqjchhr91syiymf556as";}
+  {name="marble";value="07d6hgb65r6aa9h4ikxnssfiq5a0qqbvlq68mp9qib7hhl38qrcx";}
+  {name="mplayerthumbs";value="1z7f4ibs8jms61kary73p0v4myxsxsag299zp1h3ldfbfshv73yv";}
+  {name="nepomuk-core";value="08cqvw42zzq981vs9gdix5jjsfgn2i4x0hi7q5ajd2rqyjxngh3s";}
+  {name="nepomuk-widgets";value="0ncvza1zlk203q57741rx1cj6gqy009ygqpcnlnfbd6xpqyphqq7";}
+  {name="okteta";value="0b1y8r6fa8dy3xjyiyzj4iy4shwgqff4lv9hrw2dvm3knfvjiyzz";}
+  {name="okular";value="0wlk1rwgif1qbk7f2v26bgg27vhbjfr4pgbdvncmms43839n9zqq";}
+  {name="oxygen-icons";value="1w5yn2xyp5kadg5rf2zxb88apgj13c055if3fj5w70mxir1z8nzq";}
+  {name="pairs";value="00ygnr0r064z33z19mirz79b9dj0wfk6yp38n2rmj1z2568pq9gq";}
+  {name="palapeli";value="0gbp50aph2ckjj6bw7f5p2xfxw6x8qnypk45c4ys2bfj3xs3kzp9";}
+  {name="parley";value="0s1iv864ijrlp9wcj13lvy68133dq7spvrmf2xnspn98ba7dydc0";}
+  {name="perlkde";value="131dipnns5rmncrxh7wmpqxnwxkvnh11rhb7dx76gc9mvgr6k3kg";}
+  {name="perlqt";value="1rkjv0xmn7v8mgmlfvzfa5ix18xl62hcbgrjg800hrvj43cj7ixj";}
+  {name="picmi";value="18im6q18zsahx4y75d21ihnmpn00ml8y99xgcwf061jknf3l9rfa";}
+  {name="poxml";value="0l9zarf51p10hqdnfzks4q7vhm1lkjh1cyi3bqn097jncsv3c0pi";}
+  {name="print-manager";value="1csnbl0q50g7b0yc681pgf88vvw7f4vzqpq493nn1n6gr8i46l6v";}
+  {name="pykde4";value="0mwvs209d75s3smsb9wbvcp5n94a9rxh8nvh8d1wyvlkn60kfpr5";}
+  {name="qtruby";value="1d89h83is86szy4bqa9rb9xcc3iwjgl3kxldcy64cls44cif9vkx";}
+  {name="qyoto";value="063m9a8b7qc1hxii2w3zyf69b84129zppbrxm83i4q4s0v5y63in";}
+  {name="rocs";value="02f9cnzkq18fiblih384v3ngaps9lhgqjmzqv2k8k09bxm6pyiz5";}
+  {name="smokegen";value="17bgshfmxa8iyp65fss3g74wdjdy4rnq7wsf223ls38jk6fjnkmi";}
+  {name="smokekde";value="0dl24czf5rspgqwm5i8f0a6y911alirnz2vdjywa2j2nimi690il";}
+  {name="smokeqt";value="1j0qpqr5zjffr8hfkyav50jpxj8xj8n9jk24gahvjnkk9wpyqbjc";}
+  {name="step";value="1xz074h5hwmacf4v4ca2m580h1sppvvgcwbym142vr55pd3yd2f3";}
+  {name="superkaramba";value="16xijicbqj771mdy9l91ml8ikm0qjs9ykj8nz6az2xzw6q8izz2g";}
+  {name="svgpart";value="1d6si3w4kpbxgzyi044cr1ch9b0jrl23fyzabdzxgb2qkcfxifng";}
+  {name="sweeper";value="1snjprdkzgf80z6waclhibzwcky6k4qam9bkgfd9lkaf9hba5x88";}
+  {name="umbrello";value="08h82pizkkgqqdgfs2jinwzjb6bc2nr4zyh50fkr0bk0xlspp87f";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdenetwork";
+  split=true;
+  pkgs=[
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+    { name="kdnssd";  }
+    { name="kget";  }
+    { name="kopete";  }
+    { name="kppp";  }
+    { name="krdc";  }
+    { name="krfb";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdetoys";
+  split=true;
+  pkgs=[
+    { name="amor";  }
+    { name="kteatime";  }
+    { name="ktux";  }
+  ];
+}
+{
+  module="kdesdk";
+  split=true;
+  pkgs=[
+    { name="cervisia";  }
+    { name="dolphin-plugins"; sane="dolphin_plugins"; }
+    { name="kapptemplate";  }
+    { name="kcachegrind";  }
+    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+    { name="kde-dev-utils"; sane="kde_dev_utils"; }
+    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+    { name="kompare";  }
+    { name="lokalize";  }
+    { name="okteta";  }
+    { name="poxml";  }
+    { name="umbrello";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdeadmin";
+  split=true;
+  pkgs=[
+    { name="kcron";  }
+    { name="ksystemlog";  }
+    { name="kuser";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix
new file mode 100644
index 000000000000..711ba9a7f3e2
--- /dev/null
+++ b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix
@@ -0,0 +1,272 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "11dzsk6kvqpvpi77414hyis5s0kp4l0xplyyhvkp28shnbzx3cab";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "0f4j7s31gw9g183wsxh27dvqkckhrlh1yr4dmd6cjiabpnk5avr5";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "09f8dayah2gb4j70pljih8rvk6fiprfvmagii72ymfjw5p609msh";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "08jlsy3ak9c5jbwan5wsq4y66sz6pam5mym1hmjfwp1dzknd8lxn";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "0lwk1qf6xnvxd6lmdif9126i4bna7cwk8dj0dd3s2qm4613gyjdz";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "16lm4k45rrxvc228bjzl57a39aybkh6kizm960znkfg8dslxvhnr";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1z0mkh7sqsblhar3fjind0m63mlx817fhw1r9f0jrijkwmv163cx";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "15611y569bk17ss62ic56ai6lwpqhg9apsqcnkdlh1iwk2wkzg8x";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1p75mfw2rs9qb0m2zybscrv2jhj7aq8w5a1rxs3hrddr2wc2k0g1";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "0zj9qn2k160184x9lypxyl6d5r8drxz585lagsvd7l0ckx3maqxn";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "0bc11cxjf8672mch30asn34pnn53a3xhz9wb4jly9bxy3bjs93m6";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "1l1h1q65qsmrzgcvralpdmmmnpricbiyc5bhrd1valvgvwys2rj2";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "1wsgvmacix0vd7qr029lsgnksw3hnx57aczigcf7m5dy1mi2jk1j";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "1j7f32wsbnpzdhfki9wnb18mq26la61f6ksmad33cikq3pwn1qvf";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "1l5cvnbkgv9kxn2b67ycmkyqkdpjzq3a8ggsmn4397bj9vlplcdy";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1lnayg8j76gzhxl21x5z92q3g8gc791c4hlgr3ifg54s8rknbbf6";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "0z8ncf32qpp9538kb5l41qhvk0c05j168x5q72cfliigs77m9jya";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "10pjjkp4nhlrjlv38w3srl5x3fi8713qsbp4i92bksas6p1n6pnw";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1d4094ql7nzw5gvhgvdw9j8pacpnlbq76j9670wj5z5mxaggm5n4";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "18s7h8bldkhl55akglmdaq1kx1z8171g96ysxvljy3aqnv400cpd";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "14insp30nb18dva5rpd1mgixhbm6rrkbbs7wl796jqzxlxin1bbg";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "02mwbsg8cvnrqizcggpsq6r9hp26z4r5sg62iksknl4fahzi9jwa";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0w3yncz364rd7jby39cqmmswh5p7i7hn08yfn038pj9k2wvg3nli";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "09ja8vnl8ykh9j0wdrmlwhjj71dsl0kl1mlsbi0c95dphbj58m0q";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "145r6lcf7mbnfv0kk0kxmd7aq80y5dlkxpp2fy31rigpkz8syiaz";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1s11lqac8j1qbp0fq67zq7jss7j60pwgprjki73s77icir5sijpv";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1y27ax3viixbhh6yrib9k4px0y4aj6fzpnyxd9j6yibh4gmkxa49";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "08nb4fv4hafxyhdxsdf29yh3nv5c0hb3ar0329xlw5kvkvfckgza";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1qzzbphcjl506wha4i9drzc0hrlrc4cicmw37vl1hylbkw7lfrdf";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1rqjv25y8s0g5mr47fasybcfvw36i9z41l8gpi3rdvv52b4s0n4c";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "1cfdvbq40fk9f6xqz27bzy4shrh0i7sqbaf3l54f0zpgnqmk6c8a";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "1jz355nz34f15gic4hl09qdd648gjl3ybinbf5kpy0nj5d052lwj";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1v1f42cipx39i9as0k2arb51a4qizh65vdld35dlkfxnkkwl5gb2";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1mwrwwclds1fkwgak1fl148qpxblkk5jxbnjfl7lgc2a28c4w4y8";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "0x9jqq4jbf6664m201pjf0bk5m7kziqpc59ai6n3amq7ihg5zbyj";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "1x8hr1sb36jnw9g897dww3c72hqrxhpjgnzm6x8xcqjb93rrjqnz";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1lvdz8hi5y6sia6il8x47k607dl11abmgpa07gvplv5g6gshm27q";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0pnzdz0ms85cqjd2aav2cm1w5rb3v0q96nz7b70dz9mnyxrnjiha";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "1jgadk819ws6zcvkqrvjyx7kn0sgsdvmg15hi03mn4nijf8mzzlb";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "06yyrv21g0fyvisj45r9iqiclydj0y5lb4bkykd28f0g6nrcjlzv";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "040fnm9rmj156mn033axx6isa9fvaskw5dqzh40mjchqz4bgw6vx";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "1p5glmm7a495b1avv9n9y1im04z8nxps13pf0crvzdwplkiin8id";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "19d10b807kg50jq03xgc84dksfcfmp1vimqjbfd53qgdxdfxa9c0";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "1lpgyar5hq39463dsgwlmym5rgivyqyipls8l0km6sy24kmh43g6";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0600x4vgflbyg0vr97vqpd405j311780d983xrf22awbyqg3hiqa";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1zi3s9g4nykxrrpqm2fq8didip1jzv8iyscrg7fc8mls7ikz51bp";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "15zm9p0g4qrb2wz761gvpd05yz2pz8lpcsmdqx8lclvlqr58xl8v";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "039jmlljc3fdynsa27whmx50jb8jx3x7k1l6xdrijdk4j43j047p";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "05krj1b7z1rirr7141pyaxssnbgf74v8bcxhb2m9yb944nx2z1wx";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "19bkp5hsxd5zfgdwyc6bx1425phd8d9kd43xin13cdcikdq5nh6z";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "1fy0v0zd8mq59f3wlpn855ff8q8x6yy8a17vjnwfw69qmar0x4g8";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "0h8kycdjg8cglb7sn5m4v8djwb4smhzmws2khr309nv4930vqf14";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0aaybsbbf19js8bxmj7kqqjnqp68fzkqdrbhjlh5c1jdxqvlr2w8";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "1xgndbjqhgw5pnws8qbb4xvrcnbr96m275hrhd3rb99q5xd4br20";
+}
+]

From 614544b4393f19a75d84ad04885b522f3a215858 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Dec 2013 18:26:48 +0100
Subject: [PATCH 107/562] haskell-src: clean out the obsolete happy parser
 that's included in the distribution tarball

---
 pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
index 1dbbbec550a4..cfaabe7f6b01 100644
--- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz";
   buildDepends = [ syb ];
   buildTools = [ happy ];
+  preConfigure = "runhaskell Setup.hs clean";
   meta = {
     description = "Support for manipulating Haskell source code";
     license = self.stdenv.lib.licenses.bsd3;

From ad90f2f0b88bbd7eaf624d9898489cd538cdb29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 4 Dec 2013 21:04:30 +0100
Subject: [PATCH 108/562] Adding ffmpeg 2.x

---
 pkgs/development/libraries/ffmpeg/2.x.nix | 104 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   5 ++
 2 files changed, 109 insertions(+)
 create mode 100644 pkgs/development/libraries/ffmpeg/2.x.nix

diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
new file mode 100644
index 000000000000..475da7c4c643
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -0,0 +1,104 @@
+{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
+, mp3Support ? true, lame ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, vorbisSupport ? true, libvorbis ? null
+, vpxSupport ? false, libvpx ? null
+, x264Support ? true, x264 ? null
+, xvidSupport ? true, xvidcore ? null
+, opusSupport ? true, libopus ? null
+, vdpauSupport ? true, libvdpau ? null
+, vaapiSupport ? true, libva ? null
+, faacSupport ? false, faac ? null
+, dc1394Support ? false, libdc1394 ? null
+, x11grabSupport ? false, libXext ? null, libXfixes ? null
+, playSupport ? true, SDL ? null
+, freetypeSupport ? true, freetype ? null, fontconfig ? null
+}:
+
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert vorbisSupport -> libvorbis != null;
+assert vpxSupport -> libvpx != null;
+assert x264Support -> x264 != null;
+assert xvidSupport -> xvidcore != null;
+assert opusSupport -> libopus != null;
+assert vdpauSupport -> libvdpau != null;
+assert vaapiSupport -> libva != null;
+assert faacSupport -> faac != null;
+assert x11grabSupport -> libXext != null && libXfixes != null;
+assert playSupport -> SDL != null;
+assert freetypeSupport -> freetype != null;
+
+stdenv.mkDerivation rec {
+  name = "ffmpeg-2.1.1";
+
+  src = fetchurl {
+    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+    sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy";
+  };
+
+  # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
+  # the resulting library is GPL'ed, so it can only be used in GPL'ed
+  # applications.
+  configureFlags = [
+    "--enable-gpl"
+    "--enable-postproc"
+    "--enable-swscale"
+    "--enable-shared"
+    "--enable-avresample"
+    "--enable-runtime-cpudetect"
+  ]
+    ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
+    ++ stdenv.lib.optional speexSupport "--enable-libspeex"
+    ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
+    ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
+    ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
+    ++ stdenv.lib.optional x264Support "--enable-libx264"
+    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional opusSupport "--enable-libopus"
+    ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
+    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
+    ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
+    ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
+    ++ stdenv.lib.optional playSupport "--enable-ffplay"
+    ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig";
+
+  buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
+    ++ stdenv.lib.optional mp3Support lame
+    ++ stdenv.lib.optional speexSupport speex
+    ++ stdenv.lib.optional theoraSupport libtheora
+    ++ stdenv.lib.optional vorbisSupport libvorbis
+    ++ stdenv.lib.optional vpxSupport libvpx
+    ++ stdenv.lib.optional x264Support x264
+    ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional opusSupport libopus
+    ++ stdenv.lib.optional vdpauSupport libvdpau
+    ++ stdenv.lib.optional vaapiSupport libva
+    ++ stdenv.lib.optional faacSupport faac
+    ++ stdenv.lib.optional dc1394Support libdc1394
+    ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
+    ++ stdenv.lib.optional playSupport SDL
+    ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ];
+
+  enableParallelBuilding = true;
+
+  crossAttrs = {
+    dontSetConfigureCross = true;
+    configureFlags = configureFlags ++ [
+      "--cross-prefix=${stdenv.cross.config}-"
+      "--enable-cross-compile"
+      "--target_os=linux"
+      "--arch=${stdenv.cross.arch}"
+      ];
+  };
+
+  passthru = {
+    inherit vdpauSupport;
+  };
+
+  meta = {
+    homepage = http://www.ffmpeg.org/;
+    description = "A complete, cross-platform solution to record, convert and stream audio and video";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e107812ef9ac..34f5bc58e43a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4114,6 +4114,11 @@ let
     texinfo = texinfo5;
   };
 
+  ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix {
+    vpxSupport = !stdenv.isMips;
+    texinfo = texinfo5;
+  };
+
   ffms = callPackage ../development/libraries/ffms { };
 
   fftw = callPackage ../development/libraries/fftw {

From 9c60834b23a5beb497167fd3b5075258031a5f4e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 5 Dec 2013 02:22:47 +0100
Subject: [PATCH 109/562] Adding support for Portuguese language for Aspell

---
 pkgs/development/libraries/aspell/dictionaries.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index 0f27705160fb..6500e602e854 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -140,6 +140,15 @@ in {
     };
   };
 
+  pt = buildDict {
+    shortName = "pt-0.50-1";
+    fullName = "Portuguese";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/pt/aspell-pt-0.50-1.tar.bz2;
+      sha256 = "07xzlnxxzadqsapng29p2gdwj0bijv10wpjnqlwzmkxnx6fxzkcy";
+    };
+  };
+
   ru = buildDict {
     shortName = "ru-0.99f7-1";
     fullName = "Russian";

From 1d7108d5f53aa276180c404d10d30b63770c0d75 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 5 Dec 2013 04:11:35 +0000
Subject: [PATCH 110/562] drush: add expression

---
 pkgs/development/tools/misc/drush/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/tools/misc/drush/default.nix

diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
new file mode 100644
index 000000000000..cb534d511eaf
--- /dev/null
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "drush-6.1.0";
+
+  meta = with stdenv.lib; {
+    description = "Command-line shell and Unix scripting interface for Drupal";
+    homepage    = http://github.com/drush-ops/drush;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
+  };
+
+  src = fetchurl {
+    url    = https://github.com/drush-ops/drush/archive/6.1.0.tar.gz;
+    sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp";
+  };
+
+  consoleTable = fetchurl {
+    url    = http://download.pear.php.net/package/Console_Table-1.1.3.tgz;
+    sha256 = "07gbjd7m1fj5dmavr0z20vkqwx1cz2522sj9022p257jifj1yl76";
+  };
+
+  buildInputs = [ php which makeWrapper ];
+
+  installPhase = ''
+    # install libraries
+    cd lib
+    tar -xf ${consoleTable}
+    cd ..
+
+    mkdir -p "$out"
+    cp -r . "$out/src"
+    mkdir "$out/bin"
+    wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses}/bin"
+    ln -s "$out/src/drush" "$out/bin/drush"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e107812ef9ac..9256df568dee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3597,6 +3597,8 @@ let
 
   doxygen_gui = callPackage ../development/tools/documentation/doxygen { };
 
+  drush = callPackage ../development/tools/misc/drush { };
+
   eggdbus = callPackage ../development/tools/misc/eggdbus { };
 
   elfutils = callPackage ../development/tools/misc/elfutils { };

From 610532ac6a9c652c54dcbe1ef558ddd726fc969b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 5 Dec 2013 07:42:48 +0200
Subject: [PATCH 111/562] Revert "fluidsynth: switch to cmake build system"
 which causes mpd and calf to fail to detect fluidsynth.

This reverts commit cd16faa25738e1fd885279b0707e6a842e5479c8.
---
 pkgs/applications/audio/fluidsynth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index d9998a9f814d..89e95f62cd5f 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig
-, pulseaudio, cmake }:
+, pulseaudio }:
 
 stdenv.mkDerivation  rec {
   name = "fluidsynth-${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation  rec {
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
     "-framework CoreAudio";
 
-  buildInputs = [ cmake glib libsndfile pkgconfig ]
+  buildInputs = [ glib libsndfile pkgconfig ]
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ];
 
   meta = with stdenv.lib; {

From 3c1fb8271843528e58843ee3aea2db6ce82f21b8 Mon Sep 17 00:00:00 2001
From: Roelof Wobben <rwobben@hotmail.com>
Date: Thu, 5 Dec 2013 09:14:25 +0100
Subject: [PATCH 112/562] added gnome-menus-3

---
 pkgs/desktops/cinnamon/gnome-menus.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  6 ++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/gnome-menus.nix

diff --git a/pkgs/desktops/cinnamon/gnome-menus.nix b/pkgs/desktops/cinnamon/gnome-menus.nix
new file mode 100644
index 000000000000..fe332355626b
--- /dev/null
+++ b/pkgs/desktops/cinnamon/gnome-menus.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib}: 
+let
+  version = "3.10.1";
+in
+stdenv.mkDerivation {
+  name = "gnome-menus-${version}";
+  
+    src = fetchurl {
+    url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz";
+    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
+  };
+  
+  
+  preBuild = "patchShebangs ./scripts";
+
+  buildInputs=[ intltool pkgconfig glib ];
+
+  meta = {
+    homepage = "http://www.gnome.org";
+    description = "Gnome menu specification " ;
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac304ad462b2..71bd2dc615c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9576,6 +9576,12 @@ let
 
   ### DESKTOP ENVIRONMENTS
 
+  cinnamon = recurseIntoAttrs rec{
+    callPackage=pkgs.newScope pkgs.cinnamon;
+    inherit (gnome3) gnome_common ; 
+    gnome_menus = callPackage ../desktops/cinnamon/gnome-menus.nix { } ;
+ };
+
   enlightenment = callPackage ../desktops/enlightenment { };
 
   e17 = recurseIntoAttrs (

From e5b0867492dad10e331ff622780f0e4d2fe5f7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 5 Dec 2013 10:40:27 +0100
Subject: [PATCH 113/562] Updating zathura to 0.2.6

---
 pkgs/applications/misc/zathura/core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index f3431f9480fd..00e1e6cd28a1 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.5";
+  version = "0.2.6";
   name = "zathura-core-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "1lw9q0x4b7x6z86hwgs93f8srimd0sj8fwg91185f63yz9g800fr";
+    sha1 = "d84878388969d523027a1661f49fd29638bd460b";
   };
 
   buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];

From 82fefa0de84c20a8c32ad7324174d44d9868aa0a Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Thu, 5 Dec 2013 14:39:25 +0400
Subject: [PATCH 114/562] yandex-disk: fix bash-completion, add long
 description

bashCompletion created 'have1' file in the current directory occasionally. this
patch fixes it.
---
 pkgs/tools/filesystems/yandex-disk/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 31b1471fb7fc..24dbae08fab3 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     cp -r -t $out/share usr/share/*
     cp -r -t $out/etc etc/*
 
-    sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \
+    sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \
       $out/etc/bash_completion.d/yandex-disk-completion.bash
 
     ${patchelf}/bin/patchelf \
@@ -49,6 +49,15 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [smironov];
     platforms = ["i686-linux" "x86_64-linux"];
     license = stdenv.lib.licenses.unfree;
+    longDescription = ''
+      Yandex.Disk console client for Linux lets you manage files on Disk without
+      using a window interface or programs that support WebDAV. The advantages
+      of the console client compared to a WebDAV connection:
+       * low system resource requirements;
+       * faster file reading and writing speeds;
+       * faster syncing with Disk's server;
+       * no need to be constantly connected to work with files.
+    '';
   };
 }
 

From a286f65a93b1e764608a61ddf41d6dfafb4e49f0 Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Thu, 5 Dec 2013 14:47:54 +0100
Subject: [PATCH 115/562] fix: syntax error in networking/mumble

---
 pkgs/applications/networking/mumble/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index a00837000541..8ed7c8d64d4d 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
- speex, libopus, avahi, pkgconfig
+ speex, libopus, avahi, pkgconfig,
 jackSupport ? false, 
 jackaudio ? null }:
 

From 9bda7275ceadb6aa436f6fa2db361b43cedad1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Cad=C3=A9?= <codename68@gmail.com>
Date: Thu, 5 Dec 2013 16:20:32 +0100
Subject: [PATCH 116/562] added OCaml package ocamlsdl

---
 .../ocaml-modules/ocamlsdl/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocamlsdl/default.nix

diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
new file mode 100644
index 000000000000..6361dbd9ae64
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: 
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "ocamlsdl";
+  version = "0.9.1";
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl { 
+    url = "http://downloads.sourceforge.net/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
+    sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
+  };
+
+  buildInputs = [ocaml pkgconfig findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl];
+
+  propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ];
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = http://ocamlsdl.sourceforge.net/;
+    description = "OCaml bindings for SDL 1.2";
+    license = "LGPL 2.1";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab734240924a..90b1b6435c1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2979,6 +2979,8 @@ let
 
     ocaml_react = callPackage ../development/ocaml-modules/react { };
 
+    ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { };
+
     ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { };
 
     ocaml_ssl = callPackage ../development/ocaml-modules/ssl { };

From bb9caf40ddaa68fb53ded80b493b6d145b492af1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 5 Dec 2013 10:21:06 -0500
Subject: [PATCH 117/562] Linux 3.12.3

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 4b1709b310c0..df5f596dc74e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.2";
+  version = "3.12.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "19kjhvg65z6l21srghjmlfyrwr0pswbkb02nd095v45lkyi3kwyk";
+    sha256 = "b649c759646a630893c98855fb7e9e87e954105e3acac7b81ca85b1161572713";
   };
 
   features.iwlwifi = true;

From fc9772a270f82cd3adf4ad88c90ca92b0b2de2a6 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 5 Dec 2013 16:20:31 +0000
Subject: [PATCH 118/562] openttd: update from 1.3.2 to 1.3.3

---
 pkgs/games/openttd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index bf9f6d1060e4..6b385bc2e564 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "02r7xfq9a5x1y2wpdhqyczaj48z0qan33hs4i2liahsg1k6w1vzn";
+    sha256 = "0pfagqw8i1c6zrzarlwivrcac8b8ai1inam9qc01hj3h04nfv4b9";
   };
 
   buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];

From b4c5a6f15f2e3744017ddeb6888d86522ae133f5 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Thu, 5 Dec 2013 23:29:23 +0100
Subject: [PATCH 119/562] Rename quassel packages

---
 pkgs/applications/networking/irc/quassel/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                      | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 44792693b363..9066bfb6c4cf 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -4,6 +4,7 @@
 , withKDE ? stdenv.isLinux # enable KDE integration
 , ssl ? true # enable SSL support
 , previews ? false # enable webpage previews on hovering over URLs
+, tag ? "" # tag added to the package name
 , stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
 
 let
@@ -11,13 +12,16 @@ let
 
 in with stdenv; mkDerivation rec {
 
-  name = "quassel-0.9.2";
+  version = "0.9.2";
+  name = "quassel${tag}-${version}";
 
   src = fetchurl {
-    url = "http://quassel-irc.org/pub/${name}.tar.bz2";
+    url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
     sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [ cmake qt4 ]
     ++ lib.optional withKDE kdelibs
     ++ lib.optional withKDE automoc4
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e107812ef9ac..5151ef5c160c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9709,14 +9709,16 @@ let
 
       quassel = callPackage ../applications/networking/irc/quassel { };
 
-      quasselDaemon = appendToName "daemon" (self.quassel.override {
+      quasselDaemon = (self.quassel.override {
         monolithic = false;
         daemon = true;
+        tag = "-daemon";
       });
 
-      quasselClient = appendToName "client" (self.quassel.override {
+      quasselClient = (self.quassel.override {
         monolithic = false;
         client = true;
+        tag = "-client";
       });
 
       rekonq = callPackage ../applications/networking/browsers/rekonq { };

From 46e1f71e2d17f02c1378ac42e49a60038ffc79d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Dec 2013 12:02:24 +0100
Subject: [PATCH 120/562] haskell-defaults.nix: ghc-head builds 'cabal-install'
 using its internal version of Cabal, which is newer or equal to the latest
 release

---
 pkgs/top-level/haskell-defaults.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 3589be3c6822..19fcb98c82d9 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -19,6 +19,8 @@
     self : self.haskellPlatformArgs_future self // {
       haskellPlatform = null;
       extensibleExceptions = self.extensibleExceptions_0_1_1_4;
+      cabalInstall_1_18_0_2 = self.cabalInstall_1_18_0_2.override { Cabal = null; };
+      cabalInstall = self.cabalInstall_1_18_0_2.override { Cabal = null; };
     };
 
   ghc763Prefs =

From 5588f25a15d07805b94bd003d6cc133cf77b9012 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 6 Dec 2013 08:34:44 -0500
Subject: [PATCH 121/562] hg 2.8.1

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 669aa5713a08..ce8433698046 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,7 +2,7 @@
 , guiSupport ? false, tk ? null, curses }:
 
 let
-  name = "mercurial-2.6.1";
+  name = "mercurial-2.8.1";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn";
+    sha256 = "0riksf6p07yxfq1xlraqhl8cacsgb1gg7si185mlbdknrh2a4ffj";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From ba2b36a1d77da26a74ef6be68f185a3019f5126a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Cad=C3=A9?= <codename68@gmail.com>
Date: Fri, 6 Dec 2013 15:16:58 +0100
Subject: [PATCH 122/562] Add ocaml packages for version 4.01.0

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90b1b6435c1b..b93096f91fd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3009,6 +3009,7 @@ let
   ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
   ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
   ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
+  ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0;
 
   ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
 

From d643418edddaa2dcebb3be9a9292e90d722bfe9e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 5 Dec 2013 13:27:06 +0200
Subject: [PATCH 123/562] wgetpaste: update from 2.20 to 2.23

---
 pkgs/tools/text/wgetpaste/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index a47eb2ddf9f9..7635e0424993 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, wget, bash, coreutils}:
   stdenv.mkDerivation rec {
-    version = "2.20";
+    version = "2.23";
     name = "wgetpaste-${version}";
       src = fetchurl {
         url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
-        sha256 = "7a53836d02e07cefc3c2978bb129a037fa1e1222ba0e275c4e818230a6d6fb9e";
+        sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n";
     };
     # currently zsh-autocompletion support is not installed
 

From ab98496d0b9afc38cfeed2ff3c6521cecd8bd6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 6 Dec 2013 19:03:43 +0100
Subject: [PATCH 124/562] Revert "gpsd: update from 2.95 to 3.10"

This update broke gpsd because the download url changed and trying to
get version 3.10 from the old url returns an error document with a
timestamp resulting in new hashes on every build.

And more importantly, gpsd 3.10 switched to the scons build system, so
even if the download url was correct it will fail to build until the
expression is updated.

This reverts commit 3f1c26b8257201dde5fda0e7381bcf4ad7422d09.
---
 pkgs/servers/gpsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index 4536cb94de71..25051167ca51 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -4,11 +4,11 @@
 , libxslt, xmlto, gpsdUser ? "gpsd" }:
 
 stdenv.mkDerivation rec {
-  name = "gpsd-3.10";
+  name = "gpsd-2.95";
 
   src = fetchurl {
     url = "http://download.berlios.de/gpsd/${name}.tar.gz";
-    sha256 = "10sqhg4x7hb4vnpq5dnhg62vb5nb3dmqqnbhwjrj5kx7n63jw4h4";
+    sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl

From 87e87bd56c5d11848ce3a771ed3b5e9d2976629b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Dec 2013 19:26:28 +0100
Subject: [PATCH 125/562] alsa: set meta.platform for ALSA-related packages to
 Linux

---
 pkgs/os-specific/linux/alsa-lib/default.nix   | 59 ++++++++++---------
 pkgs/os-specific/linux/alsa-oss/default.nix   |  3 +-
 pkgs/os-specific/linux/alsa-utils/default.nix |  3 +-
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index 239c70d515d5..8ad77c6b99e0 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -11,35 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9";
   };
 
-  configureFlags = "--disable-xmlto";
-
-  # Fix pcm.h file in order to prevent some compilation bugs
-  # 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently
-  postPatch = ''
-    sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h
-
-
-    sed -i -e '1i#include <stdint.h>' include/pcm.h
-    sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
-  '';
-
-  crossAttrs = {
-    patchPhase = ''
-      sed -i s/extern/static/g include/iatomic.h
-    '';
-  };
-
-  meta = {
-    description = "ALSA, the Advanced Linux Sound Architecture libraries";
-
-    longDescription = ''
-      The Advanced Linux Sound Architecture (ALSA) provides audio and
-      MIDI functionality to the Linux-based operating system.
-    '';
-
-    homepage = http://www.alsa-project.org/;
-  };
-
   patches = [
     /* allow specifying alternatives alsa plugin locations using
        export ALSA_PLUGIN_DIRS=$(nix-build -A alsaPlugins)/lib/alsa-lib
@@ -53,4 +24,34 @@ stdenv.mkDerivation rec {
        on mips, because lacks some symbols atomic_add/atomic_sub  */
     ./mips-atomic.patch
   ];
+
+  # Fix pcm.h file in order to prevent some compilation bugs
+  # 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently
+  postPatch = ''
+    sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h
+
+
+    sed -i -e '1i#include <stdint.h>' include/pcm.h
+    sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
+  '';
+
+  configureFlags = "--disable-xmlto";
+
+  crossAttrs = {
+    patchPhase = ''
+      sed -i s/extern/static/g include/iatomic.h
+    '';
+  };
+
+  meta = {
+    homepage = http://www.alsa-project.org/;
+    description = "ALSA, the Advanced Linux Sound Architecture libraries";
+
+    longDescription = ''
+      The Advanced Linux Sound Architecture (ALSA) provides audio and
+      MIDI functionality to the Linux-based operating system.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix
index 98bf4374b4fc..904c56665d15 100644
--- a/pkgs/os-specific/linux/alsa-oss/default.nix
+++ b/pkgs/os-specific/linux/alsa-oss/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
+    homepage = http://www.alsa-project.org/;
     description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation";
 
     longDescription = ''
@@ -28,6 +29,6 @@ stdenv.mkDerivation rec {
       MIDI functionality to the Linux-based operating system.
     '';
 
-    homepage = http://www.alsa-project.org/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 3eafe8bbfe5b..484ecd06bb0b 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
+    homepage = http://www.alsa-project.org/;
     description = "ALSA, the Advanced Linux Sound Architecture utils";
 
     longDescription = ''
@@ -30,6 +31,6 @@ stdenv.mkDerivation rec {
       MIDI functionality to the Linux-based operating system.
     '';
 
-    homepage = http://www.alsa-project.org/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 125bf9e488c29ec4843dce9b0ea71ab58d99bb78 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Dec 2013 19:29:22 +0100
Subject: [PATCH 126/562] aescrypt: limit meta.hydraPlatforms to Linux

Builds on other platforms such as FreeBSD fail.
---
 pkgs/tools/misc/aescrypt/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index bec0840490d5..f39e466c78f9 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, libiconvOrEmpty }:
- 
+
 stdenv.mkDerivation rec {
   version = "3.0.9";
   name = "aescrypt-${version}";
-  
+
   src = fetchurl {
     url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz";
     sha256 = "3f3590f9b7e50039611ba9c0cf1cae1b188a44bd39cfc41553db7ec5709c0882";
@@ -18,17 +18,17 @@ stdenv.mkDerivation rec {
     cp aescrypt $out/bin
     cp aescrypt_keygen $out/bin
   '';
- 
+
   buildInputs = [ libiconvOrEmpty ];
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
- 
+
   meta = with stdenv.lib; {
-    description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files";
+    description = "encrypt files with Advanced Encryption Standard (AES)";
     homepage    = http://www.aescrypt.com/;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 qknight ];
     platforms   = stdenv.lib.platforms.all;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
-

From 65d33fda9577491ce3b3e8d7db9953b5dd5a72d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Dec 2013 19:31:03 +0100
Subject: [PATCH 127/562] aterm: mark version 2.8 as broken

---
 pkgs/development/libraries/aterm/2.8.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix
index 6d4b13f165a6..a153443a54eb 100644
--- a/pkgs/development/libraries/aterm/2.8.nix
+++ b/pkgs/development/libraries/aterm/2.8.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
     description = "Library for manipulation of term data structures in C";
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = stdenv.lib.maintainers.eelco;
+    broken = true;
   };
 }

From f0d3e92b33b192549b685d21d45574a75db4ff65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Dec 2013 19:32:34 +0100
Subject: [PATCH 128/562] atool: have Hydra build this tool only on Linux

---
 pkgs/tools/archivers/atool/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix
index f041f2050ea0..1db7a7a42ebc 100644
--- a/pkgs/tools/archivers/atool/default.nix
+++ b/pkgs/tools/archivers/atool/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.nongnu.org/atool;
     description = "Archive command line helper";
-    platforms = stdenv.lib.platforms.all;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
-

From 3814415be4cf7e420cde4be8ba958ce0e3ba1b2a Mon Sep 17 00:00:00 2001
From: Andrew Morsillo <andrew@peeramid.org>
Date: Sun, 24 Nov 2013 21:29:37 -0500
Subject: [PATCH 129/562] Add robomongo, a GUI for exploring mongodb data and
 building queries.

---
 pkgs/applications/misc/robomongo/default.nix  | 24 ++++++++++
 .../misc/robomongo/robomongo.patch            | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 74 insertions(+)
 create mode 100644 pkgs/applications/misc/robomongo/default.nix
 create mode 100644 pkgs/applications/misc/robomongo/robomongo.patch

diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
new file mode 100644
index 000000000000..c36d9254670a
--- /dev/null
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }:
+
+stdenv.mkDerivation {
+  name = "robomongo-0.8.3";
+
+  src = fetchurl {
+    url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz;
+    sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank";
+  };
+
+  patches = [ ./robomongo.patch ];
+  
+  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
+
+  buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ];
+
+  meta = {
+    homepage = "http://robomongo.org/";
+    description = "Query GUI for mongodb";
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.amorsillo ];
+  };
+}
diff --git a/pkgs/applications/misc/robomongo/robomongo.patch b/pkgs/applications/misc/robomongo/robomongo.patch
new file mode 100644
index 000000000000..2305ca732eae
--- /dev/null
+++ b/pkgs/applications/misc/robomongo/robomongo.patch
@@ -0,0 +1,48 @@
+Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle
+Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment
+Fix typo in cmakelists
+diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt
+--- robomongo-0.8.3/CMakeLists.txt	2013-10-01 10:55:00.000000000 -0400
++++ robomongo-0.8.3-patched/CMakeLists.txt	2013-12-06 12:22:06.070659856 -0500
+@@ -133,7 +133,7 @@ ELSE()
+ ENDIF()
+ 
+ ##################################DEFAULT VALUES##########################################
+-IF(NOT CMAKE_INSTALL_PREFIX})
++IF(NOT CMAKE_INSTALL_PREFIX)
+     SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")
+ ENDIF()
+ 
+diff -rupN robomongo-0.8.3/src/robomongo/gui/AppStyle.h robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h
+--- robomongo-0.8.3/src/robomongo/gui/AppStyle.h	2013-10-01 10:55:00.000000000 -0400
++++ robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h	2013-12-06 12:20:57.417297186 -0500
+@@ -8,13 +8,8 @@
+     #include <QProxyStyle>
+     typedef QProxyStyle OsStyle;
+ #elif defined OS_LINUX
+-    #if !defined(QT_NO_STYLE_GTK)
+-        #include <QProxyStyle>
+-        typedef QProxyStyle OsStyle;
+-    #else
+-        #include <QCleanlooksStyle>
+-        typedef QCleanlooksStyle OsStyle;
+-    #endif
++    #include <QProxyStyle>
++    typedef QProxyStyle OsStyle;
+ #endif
+ 
+ namespace Robomongo
+
+diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct
+--- robomongo-0.8.3/src/third-party/mongodb/SConstruct	2013-10-01 10:55:00.000000000 -0400
++++ robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct	2013-12-06 12:21:45.705255731 -0500
+@@ -283,7 +283,8 @@ usePCH = has_option( "usePCH" )
+ 
+ justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient'])
+ 
+-env = Environment( BUILD_DIR=variantDir,
++env = Environment( ENV=os.environ,
++                   BUILD_DIR=variantDir,
+                    CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
+                    CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
+                    CLIENT_LICENSE='#distsrc/client/LICENSE.txt',
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3725b78270fc..9c3504ffd018 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10184,6 +10184,8 @@ let
     inherit (pythonPackages) pexpect paramiko;
   };
 
+  robomongo = callPackage ../applications/misc/robomongo { };
+
   opkg = callPackage ../tools/package-management/opkg { };
 
   pgadmin = callPackage ../applications/misc/pgadmin { };

From a520b9cfa022eae7014404c5401496c1fc13e030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 6 Dec 2013 20:49:43 +0100
Subject: [PATCH 130/562] Fix the ultrastardx makefile (the hard way).

---
 pkgs/games/ultrastardx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
index 710d14cb86c3..a77ee7049a2c 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
   # I even do a trick on lib/lib64 for libgcc, that I expect it will work.
   preBuild = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib"
+
+    sed -i 414,424d Makefile
   '';
 
   # dlopened libgcc requires the rpath not to be shrinked

From 142298495e4639ec9e193a8d6543bcc63526a2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 7 Dec 2013 00:07:04 +0100
Subject: [PATCH 131/562] Fixing the Ultrastardx build. Not tested if it works
 and how.

---
 pkgs/development/libraries/ffmpeg/0.6.nix | 77 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  5 ++
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/development/libraries/ffmpeg/0.6.nix

diff --git a/pkgs/development/libraries/ffmpeg/0.6.nix b/pkgs/development/libraries/ffmpeg/0.6.nix
new file mode 100644
index 000000000000..053843d53133
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/0.6.nix
@@ -0,0 +1,77 @@
+{ stdenv, fetchurl, pkgconfig, yasm
+, mp3Support ? true, lame ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, vorbisSupport ? true, libvorbis ? null
+, vpxSupport ? false, libvpx ? null
+, x264Support ? true, x264 ? null
+, xvidSupport ? true, xvidcore ? null
+, vdpauSupport ? true, libvdpau ? null
+, faacSupport ? false, faac ? null
+}:
+
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert vorbisSupport -> libvorbis != null;
+assert vpxSupport -> libvpx != null;
+assert x264Support -> x264 != null;
+assert xvidSupport -> xvidcore != null;
+assert vdpauSupport -> libvdpau != null;
+assert faacSupport -> faac != null;
+
+stdenv.mkDerivation rec {
+  name = "ffmpeg-0.6.7";
+
+  src = fetchurl {
+    url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+    sha256 = "13l78gv2qhyw05bl9s6wkmykzsn4p04bb69a849a5c4hiffwz837";
+  };
+
+  # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
+  # the resulting library is GPL'ed, so it can only be used in GPL'ed
+  # applications.
+  configureFlags = [
+    "--enable-gpl"
+    "--enable-postproc"
+    "--enable-swscale"
+    "--disable-ffserver"
+    "--disable-ffplay"
+    "--enable-shared"
+    "--enable-runtime-cpudetect"
+  ]
+    ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
+    ++ stdenv.lib.optional speexSupport "--enable-libspeex"
+    ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
+    ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
+    ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
+    ++ stdenv.lib.optional x264Support "--enable-libx264"
+    ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+    ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
+    ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree";
+
+  buildInputs = [ pkgconfig lame yasm ]
+    ++ stdenv.lib.optional mp3Support lame
+    ++ stdenv.lib.optional speexSupport speex
+    ++ stdenv.lib.optional theoraSupport libtheora
+    ++ stdenv.lib.optional vorbisSupport libvorbis
+    ++ stdenv.lib.optional vpxSupport libvpx
+    ++ stdenv.lib.optional x264Support x264
+    ++ stdenv.lib.optional xvidSupport xvidcore
+    ++ stdenv.lib.optional vdpauSupport libvdpau
+    ++ stdenv.lib.optional faacSupport faac;
+
+  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";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c3504ffd018..b545062494ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4109,6 +4109,10 @@ let
       else stdenv;
   };
 
+  ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
+    vpxSupport = !stdenv.isMips;
+  };
+
   ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {
     vpxSupport = !stdenv.isMips;
   };
@@ -9530,6 +9534,7 @@ let
   ultimatestunts = callPackage ../games/ultimatestunts { };
 
   ultrastardx = callPackage ../games/ultrastardx {
+    ffmpeg = ffmpeg_0_6;
     lua = lua5;
   };
 

From 2079bfdc58c50acccb02c0a491a31a452cd2e24d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 2 Dec 2013 10:40:22 -0600
Subject: [PATCH 132/562] Fix ntrack for latest libnl release

---
 pkgs/development/libraries/ntrack/default.nix     |  7 ++++++-
 pkgs/development/libraries/ntrack/libnl-fix.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ntrack/libnl-fix.patch

diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 13ab00e41be6..b74607784747 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -18,7 +18,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--without-gobject CFLAGS=--std=gnu99";
 
-  patchPhase = ''sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c'';
+  # Remove this patch after version 016
+  patches = [ ./libnl-fix.patch ];
+
+  postPatch = ''
+    sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
+  '';
 
   meta = {
     description = "Network Connectivity Tracking library for Desktop Applications";
diff --git a/pkgs/development/libraries/ntrack/libnl-fix.patch b/pkgs/development/libraries/ntrack/libnl-fix.patch
new file mode 100644
index 000000000000..806a0178ec8a
--- /dev/null
+++ b/pkgs/development/libraries/ntrack/libnl-fix.patch
@@ -0,0 +1,11 @@
+--- ./modules/ntrack-libnl.c.orig	2013-12-02 11:31:54.749215448 -0600
++++ ./modules/ntrack-libnl.c	2013-12-02 11:34:46.597684553 -0600
+@@ -530,7 +530,7 @@
+ 		op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info);
+ 	} else if (nl_info->topmost_route && topmost_route) {
+ 		int diff_bits;
+-		if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF
++		if ((diff_bits = (nl_object_get_id_attrs(OBJ_CAST(topmost_route)) | ROUTE_ATTR_OIF
+ 		                  | ROUTE_ATTR_GATEWAY) &
+ 		                  nl_object_diff (OBJ_CAST (nl_info->topmost_route),
+ 		                                  OBJ_CAST (topmost_route)))) {

From fa6e689dcb4c3da22cbbabaf916a5ab4535001e4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 7 Dec 2013 12:36:31 +0400
Subject: [PATCH 133/562] Use fresh libnl for ntrack

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f0ef099287f..a1950122904e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5341,9 +5341,7 @@ let
     includeTools = true;
   };
 
-  ntrack = callPackage ../development/libraries/ntrack {
-    libnl = libnl_3_2_19;
-  };
+  ntrack = callPackage ../development/libraries/ntrack { };
 
   ode = builderDefsPackage (import ../development/libraries/ode) { };
 

From 7f62dd42f3f44f2af8ff026c96ce91d15e1d594b Mon Sep 17 00:00:00 2001
From: Roelof Wobben <rwobben@hotmail.com>
Date: Sat, 7 Dec 2013 10:09:25 +0100
Subject: [PATCH 134/562] give gnome-menus a better place

---
 .../core/gnome-menus/default .nix}                          | 0
 pkgs/desktops/gnome-3/default.nix                           | 2 ++
 pkgs/top-level/all-packages.nix                             | 6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/desktops/{cinnamon/gnome-menus.nix => gnome-3/core/gnome-menus/default .nix} (100%)

diff --git a/pkgs/desktops/cinnamon/gnome-menus.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default .nix
similarity index 100%
rename from pkgs/desktops/cinnamon/gnome-menus.nix
rename to pkgs/desktops/gnome-3/core/gnome-menus/default .nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 8af6d65420a6..13fca9f0ab04 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -24,6 +24,8 @@ rec {
 
   gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
 
+  gnome-menus = callPackage ../core/gnome-menus{ } ; 
+
   gnome_keyring = callPackage ./core/gnome-keyring { };
   libgnome_keyring = callPackage ./core/libgnome-keyring { };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71bd2dc615c0..ac304ad462b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9576,12 +9576,6 @@ let
 
   ### DESKTOP ENVIRONMENTS
 
-  cinnamon = recurseIntoAttrs rec{
-    callPackage=pkgs.newScope pkgs.cinnamon;
-    inherit (gnome3) gnome_common ; 
-    gnome_menus = callPackage ../desktops/cinnamon/gnome-menus.nix { } ;
- };
-
   enlightenment = callPackage ../desktops/enlightenment { };
 
   e17 = recurseIntoAttrs (

From ca26e75a7350c5b1bb32419d4f4438e4bd477fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 7 Dec 2013 12:03:50 +0100
Subject: [PATCH 135/562] nixos/avahi-service: small documentation update

---
 nixos/modules/services/networking/avahi-daemon.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index effd1a62bd91..2256de89630d 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -51,7 +51,10 @@ in
 
       hostName = mkOption {
         type = types.str;
-        description = ''Host name advertised on the LAN.'';
+        description = ''
+          Host name advertised on the LAN. If not set, avahi will use the value
+          of config.networking.hostName.
+        '';
       };
 
       browseDomains = mkOption {

From 6b1a3bffd093b53ceff44ea029a8dd70b3ac0ea5 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 7 Dec 2013 12:57:15 +0200
Subject: [PATCH 136/562] xplanet: update from 1.2.2 to 1.3.0

---
 pkgs/applications/science/astronomy/xplanet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
index 816119a3b925..071942b5b0ec 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/pkgs/applications/science/astronomy/xplanet/default.nix
@@ -2,11 +2,11 @@
 , libjpeg, netpbm}:
 
 stdenv.mkDerivation rec {
-  name = "xplanet-1.2.2";
+  name = "xplanet-1.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/xplanet/${name}.tar.gz";
-    sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg";
+    sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4";
   };
 
   buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];

From 2ce67ca947aa8621c4839a469db31c25286ac38a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 7 Dec 2013 13:10:57 +0200
Subject: [PATCH 137/562] giflib: update from 4.2.3 to 5.0.5

---
 pkgs/development/libraries/giflib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
index cc782546a486..4dc8132805c4 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "giflib-4.2.3";
+  name = "giflib-5.0.5";
   src = fetchurl {
-    url = mirror://sourceforge/giflib/giflib-4.2.3.tar.bz2;
-    sha256 = "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a";
+    url = mirror://sourceforge/giflib/giflib-5.0.5.tar.bz2;
+    sha256 = "02c6pwll9pzw5fhg5gccx2ws56d70ylfryk21nv5lqhwdcv8lvb0";
   };
 
   buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ];

From 1f5d28001eca42c7d7f5705a57ddce99f4187b00 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 7 Dec 2013 13:12:31 +0200
Subject: [PATCH 138/562] xplanet: fix build against giflib 5.*

---
 .../science/astronomy/xplanet/default.nix     |   2 +
 .../science/astronomy/xplanet/giflib.patch    | 130 ++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 pkgs/applications/science/astronomy/xplanet/giflib.patch

diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
index 071942b5b0ec..bdb93c992262 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/pkgs/applications/science/astronomy/xplanet/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
 
+  patches = [ ./giflib.patch ];
+
   meta = {
     description = "Renders an image of the earth or other planets into the X root window";
     homepage = http://xplanet.sourceforge.net;
diff --git a/pkgs/applications/science/astronomy/xplanet/giflib.patch b/pkgs/applications/science/astronomy/xplanet/giflib.patch
new file mode 100644
index 000000000000..aaf024198fbc
--- /dev/null
+++ b/pkgs/applications/science/astronomy/xplanet/giflib.patch
@@ -0,0 +1,130 @@
+diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c
+--- xplanet-1.3.0/src/libimage/gif.c	2006-03-26 01:50:51.000000000 +0300
++++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c	2013-07-30 18:21:17.412474692 +0400
+@@ -20,7 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-
++#define FALSE 0
+ #include <gif_lib.h>
+ 
+ /*
+@@ -42,11 +42,11 @@
+     int color_index;
+     unsigned char *ptr = NULL;
+ 
+-    infile = DGifOpenFileName(filename);
++    infile = DGifOpenFileName(filename, NULL);
+ 
+     if (infile == NULL)
+     {
+-        PrintGifError();
++        printf("%s\n", GifErrorString(GIF_ERROR));
+         return(0);
+     }
+ 
+@@ -54,7 +54,7 @@
+     {
+         if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) 
+         {
+-            PrintGifError();
++            printf("%s\n", GifErrorString(GIF_ERROR));
+             return(0);
+         }
+ 
+@@ -63,7 +63,7 @@
+         case IMAGE_DESC_RECORD_TYPE:
+             if (DGifGetImageDesc(infile) == GIF_ERROR)
+             {
+-                PrintGifError();
++                printf("%s\n", GifErrorString(GIF_ERROR));
+                 return(0);
+             }
+ 
+@@ -107,14 +107,14 @@
+             GifByteType *ext;
+             if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) 
+             {
+-                PrintGifError();
++                printf("%s\n", GifErrorString(GIF_ERROR));
+                 return(0);
+             }
+             while (ext != NULL) 
+             {
+                 if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) 
+                 {
+-                    PrintGifError();
++                    printf("%s\n", GifErrorString(GIF_ERROR));
+                     return(0);
+                 }
+             }
+@@ -178,7 +178,7 @@
+         return(0);
+     }
+ 
+-    colormap = MakeMapObject(colormap_size, NULL);
++    colormap = GifMakeMapObject(colormap_size, NULL);
+ 
+     for (i = 0; i < width * height; i++)
+     {
+@@ -187,10 +187,10 @@
+         blue[i]  = (GifByteType) rgb[3*i+2];
+     }
+   
+-    if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,   
++    if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue,   
+                        buffer, colormap->Colors) == GIF_ERROR)
+     {
+-        PrintGifError();
++        printf("%s\n", GifErrorString(GIF_ERROR));
+         return(0);
+     }
+ 
+@@ -198,24 +198,24 @@
+     free(green);
+     free(blue);
+ 
+-    outfile = EGifOpenFileName((char *) filename, FALSE);
++    outfile = EGifOpenFileName((char *) filename, FALSE, NULL);
+     if (outfile == NULL)
+     {
+-        PrintGifError();
++        printf("%s\n", GifErrorString(GIF_ERROR));
+         return(0);
+     }
+ 
+     if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap)
+         == GIF_ERROR)
+     {
+-        PrintGifError();
++        printf("%s\n", GifErrorString(GIF_ERROR));
+         return(0);
+     }
+ 
+     if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
+         == GIF_ERROR)
+     {
+-        PrintGifError();
++        printf("%s\n", GifErrorString(GIF_ERROR));
+         return(0);
+     }
+ 
+@@ -224,7 +224,7 @@
+     {
+         if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
+         {
+-            PrintGifError();
++            printf("%s\n", GifErrorString(GIF_ERROR));
+             return(0);
+         }
+         ptr += width;
+@@ -233,7 +233,7 @@
+     EGifSpew(outfile);
+ 
+     if (EGifCloseFile(outfile) == GIF_ERROR) 
+-        PrintGifError();
++        printf("%s\n", GifErrorString(GIF_ERROR));
+ 
+     free(buffer);
+ 

From e12695ba8568f0893bd49ab194d8645676cd1603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 7 Dec 2013 12:24:18 +0100
Subject: [PATCH 139/562] Fixing ultrastardx linking with lua.

Now it fails to start to me, due to some alsa problems.
---
 pkgs/games/ultrastardx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
index a77ee7049a2c..dbae3e167247 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # The fpc is not properly wrapped to add -rpath. I add this manually.
   # I even do a trick on lib/lib64 for libgcc, that I expect it will work.
   preBuild = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib"
 
     sed -i 414,424d Makefile
   '';

From 8c5c4eab54b6b9054ec7cf619e2678e00ff47d08 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 7 Dec 2013 14:32:57 +0200
Subject: [PATCH 140/562] libgdiplus: fix build against giflib 5.*

---
 .../libraries/libgdiplus/default.nix          |   3 +
 .../libraries/libgdiplus/giflib.patch         | 117 ++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 pkgs/development/libraries/libgdiplus/giflib.patch

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 3b1e5ba0b770..56bc72acff02 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -10,11 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd";
   };
 
+  NIX_LDFLAGS = "-lgif";
+
   patches =
     [ (fetchurl {
         url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch";
         sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f";
       })
+      ./giflib.patch
     ];
 
   patchFlags = "-p0";
diff --git a/pkgs/development/libraries/libgdiplus/giflib.patch b/pkgs/development/libraries/libgdiplus/giflib.patch
new file mode 100644
index 000000000000..b1135f47f3ac
--- /dev/null
+++ b/pkgs/development/libraries/libgdiplus/giflib.patch
@@ -0,0 +1,117 @@
+diff --git a/src/gifcodec.c b/src/gifcodec.c
+index 8dee0eb..564beed 100644
+--- src/gifcodec.c
++++ src/gifcodec.c
+@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0
+ 
+ #include "gifcodec.h"
+ 
++#if GIFLIB_MAJOR < 5
+ /* giflib declares this incorrectly as EgifOpen */
+ extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
++#endif
+ 
+ /* Data structure used for callback */
+ typedef struct
+@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len)
+ */
+ 
+ static int
+-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
++AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[])
+ {
+ 	ExtensionBlock	*ep;
+ 
+@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[])
+ 
+ 	if (ExtData) {
+ 		memcpy(ep->Bytes, ExtData, Len);
+-		ep->Function = New->Function;
++		ep->Function = func;
+ 	}
+ 
+ 	return (GIF_OK);
+@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions)
+ 			}
+ 
+ 			case EXTENSION_RECORD_TYPE: {
+-				if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) {
++				int func;
++				if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) {
+ 					return (GIF_ERROR);
+ 				}
+ 
+ 				while (ExtData != NULL) {
+ 					/* Create an extension block with our data */
+-					if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) {
++					if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) {
+ 						return (GIF_ERROR);
+ 					}
+ 
+ 					if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) {
+ 						return (GIF_ERROR);
+ 					}
+-					temp_save.Function = 0;
+ 				}
+ 				break;
+ 			}
+@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file)
+ 	result = NULL;
+ 	loop_counter = FALSE;
+ 
++#if GIFLIB_MAJOR < 5
+ 	if (from_file) {
+ 		gif = DGifOpen(stream, &gdip_gif_fileinputfunc);
+ 	} else {
+ 		gif = DGifOpen (stream, &gdip_gif_inputfunc);
+ 	}
+-	
++#else
++	if (from_file)
++		gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL);
++	else
++		gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL);
++#endif
++
+ 	if (gif == NULL) {
+ 		goto error;
+ 	}
+@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
+ 		return InvalidParameter;
+ 	}
+ 
++#if GIFLIB_MAJOR < 5
+ 	if (from_file) {
+ 		fp = EGifOpenFileName (stream, 0);
+ 	} else {
+ 		fp = EGifOpen (stream, gdip_gif_outputfunc);
+ 	}
++#else
++	if (from_file)
++		fp = EGifOpenFileName (stream, 0, NULL);
++	else
++		fp = EGifOpen (stream, gdip_gif_outputfunc, NULL);
++#define MakeMapObject  GifMakeMapObject
++#define FreeMapObject  GifFreeMapObject
++#define QuantizeBuffer GifQuantizeBuffer
++#define BitSize        GifBitSize
++#endif
+ 		
+ 	if (!fp) {
+ 		return FileNotFound;
+@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
+ 						Buffer[0] = 1;
+ 						Buffer[1] = ptr[0];
+ 						Buffer[2] = ptr[1];
++#if GIFLIB_MAJOR < 5
+ 						EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
+ 						EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer);
++#else
++						EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE);
++						EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0");
++						EGifPutExtensionBlock(fp, 3, Buffer);
++						EGifPutExtensionTrailer(fp);
++#endif
+ 					}
+ 				}
+ 

From 1beca247079ac0c79a5b9ca49e0fc0731ae6ea45 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 7 Dec 2013 14:39:52 +0200
Subject: [PATCH 141/562] sxiv: update from 1.1 to 1.1.1

---
 pkgs/applications/graphics/sxiv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 26d910943efa..8500fa9faba2 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, libX11, imlib2, giflib }:
 
 stdenv.mkDerivation {
-  name = "sxiv-1.1";
+  name = "sxiv-1.1.1";
 
   src = fetchurl {
-    url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz";
+    url = "https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz";
     name = "sxiv-1.1.tar.gz";
-    sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx";
+    sha256 = "07r8125xa8d5q71ql71s4i1dx4swy8hypxh2s5h7z2jnn5y9nmih";
   };
 
   buildInputs = [ libX11 imlib2 giflib ];

From 50493458bd0b4f3051cf200e165c007efe7dbade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Dec 2013 14:04:50 +0100
Subject: [PATCH 142/562] gnome3.gnome-menus: fix file path, add maintainer

Also some whitespace nitpicks.
---
 lib/maintainers.nix                                      | 1 +
 .../core/gnome-menus/{default .nix => default.nix}       | 9 ++++-----
 pkgs/desktops/gnome-3/default.nix                        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/desktops/gnome-3/core/gnome-menus/{default .nix => default.nix} (81%)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0418337b217b..285197e381df 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -49,6 +49,7 @@
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
+  roelof = "Roelof Wobben <rwobben@hotmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default .nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
similarity index 81%
rename from pkgs/desktops/gnome-3/core/gnome-menus/default .nix
rename to pkgs/desktops/gnome-3/core/gnome-menus/default.nix
index fe332355626b..a8e77a32bdc0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-menus/default .nix	
+++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib}: 
+{ stdenv, fetchurl, intltool, pkgconfig, glib }:
 let
   version = "3.10.1";
 in
 stdenv.mkDerivation {
   name = "gnome-menus-${version}";
-  
+
     src = fetchurl {
     url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz";
     sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
   };
-  
-  
+
   preBuild = "patchShebangs ./scripts";
 
   buildInputs=[ intltool pkgconfig glib ];
 
   meta = {
     homepage = "http://www.gnome.org";
-    description = "Gnome menu specification " ;
+    description = "Gnome menu specification";
 
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 13fca9f0ab04..48f37f6ba9d3 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -24,7 +24,7 @@ rec {
 
   gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
 
-  gnome-menus = callPackage ../core/gnome-menus{ } ; 
+  gnome-menus = callPackage ./core/gnome-menus { };
 
   gnome_keyring = callPackage ./core/gnome-keyring { };
   libgnome_keyring = callPackage ./core/libgnome-keyring { };

From c46d5ed3d749db02dbc9080b7aecfc3736b12cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 7 Dec 2013 23:03:16 +0100
Subject: [PATCH 143/562] Noting faac unfree. I think it is unfree, not LGPL.

---
 pkgs/development/libraries/faac/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 8e79afb5f9ef..8bfaaf3ea497 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Open source MPEG-4 and MPEG-2 AAC encoder";
     homepage = http://www.audiocoding.com/faac.html;
-    license = "LGPL";
+    # Incompatible with GPL. Some changes to the base code, included in faac,
+    # are under LGPL though.
+    license = "unfree";
   };
 }

From 4d33a94faefc69812fc4d9915ffa380a3a955247 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 8 Dec 2013 13:13:19 +0400
Subject: [PATCH 144/562] Passing giflib 4.1.x to OpenSceneGraph for now

---
 pkgs/development/libraries/giflib/4.1.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix           |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/giflib/4.1.nix

diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix
new file mode 100644
index 000000000000..35d66b3647b4
--- /dev/null
+++ b/pkgs/development/libraries/giflib/4.1.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "giflib-4.1.6";
+  src = fetchurl {
+    url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2;
+    sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1950122904e..299029c95bd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5095,6 +5095,7 @@ let
   libupnp = callPackage ../development/libraries/pupnp { };
 
   giflib = callPackage ../development/libraries/giflib { };
+  giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
 
   libungif = callPackage ../development/libraries/giflib/libungif.nix { };
 
@@ -5399,7 +5400,9 @@ let
 
   openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; };
 
-  openscenegraph = callPackage ../development/libraries/openscenegraph {};
+  openscenegraph = callPackage ../development/libraries/openscenegraph {
+    giflib = giflib_4_1;
+  };
 
   openssl = callPackage ../development/libraries/openssl {
     fetchurl = fetchurlBoot;

From c5005bfe11c52f109848c1c9cc34ff47bc9a6006 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 8 Dec 2013 12:04:02 +0200
Subject: [PATCH 145/562] KDE-4.10: Kopete: fix build against giflib5

---
 .../kde-4.10/kdenetwork/kopete-giflib5.patch  | 70 +++++++++++++++++++
 pkgs/desktops/kde-4.10/kdenetwork/kopete.nix  |  1 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch

diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch
new file mode 100644
index 000000000000..1755bdbce76d
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch
@@ -0,0 +1,70 @@
+Index: b/kopete/protocols/wlm/wlmchatsession.cpp
+===================================================================
+--- a/kopete/protocols/wlm/wlmchatsession.cpp
++++ b/kopete/protocols/wlm/wlmchatsession.cpp
+@@ -63,10 +63,14 @@
+ #include "wlmprotocol.h"
+ #include "wlmaccount.h"
+ #include "wlmchatsessioninkaction.h"
+ #ifdef HAVE_GIFLIB
+ #include <gif_lib.h>
++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
++#ifndef GIFLIB_MAJOR
++#define GIFLIB_MAJOR 4
++#endif
+ #endif
+ 
+ WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
+                                 const Kopete::Contact * user,
+                                 Kopete::ContactPtrList others,
+@@ -465,15 +469,19 @@ WlmChatSession::slotInviteContact (Kopet
+ static void
+ printGifErrorMessage()
+ {
+ #ifdef HAVE_GIFLIB
+ #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
++#if GIFLIB_MAJOR >= 5
++        fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
++#else
+         const char * errorString = GifErrorString();
+         if (errorString)
+             fprintf(stderr, "GIF-LIB error: %s\n", errorString);
+         else
+             fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
++#endif
+ #else // older giflib versions, libungif
+         PrintGifError();
+ #endif // HAVE_GIF_ERROR_STRING
+ #endif // HAVE_GIFLIB
+ }
+@@ -481,10 +489,14 @@ printGifErrorMessage()
+ /* stolen from kpaint write_to_gif() */
+ void
+ WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
+ {
+ #ifdef HAVE_GIFLIB
++#if GIFLIB_MAJOR >= 5
++#define FreeMapObject  GifFreeMapObject
++#define MakeMapObject  GifMakeMapObject
++#endif
+     int i, status;
+     GifFileType *GifFile;
+     ColorMapObject *screenColourmap;
+     ColorMapObject *imageColourmap;
+     QImage img = ink.toImage().convertToFormat(QImage::Format_Indexed8);
+@@ -523,11 +535,15 @@ WlmChatSession::convertToGif( const QPix
+             screenColourmap->Colors[i].Green= 0;
+             screenColourmap->Colors[i].Blue= 0;
+         }
+     }
+ 
++#if GIFLIB_MAJOR >= 5
++    GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
++#else
+     GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
++#endif
+     if (!GifFile) {
+         FreeMapObject(imageColourmap);
+         FreeMapObject(screenColourmap);
+         return;
+     }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
index 7139c62981c6..b065ae610095 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
@@ -20,6 +20,7 @@ kde {
       cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
       patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch}
       patch -p1 < ${./kopete-4.10.4-kopete-stun.patch}
+      patch -p1 < ${./kopete-giflib5.patch}
     '';
 
   cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];

From a0d8196f609b861c10d548f61c138a70dd9ac7a7 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 8 Dec 2013 12:36:46 +0200
Subject: [PATCH 146/562] Use old giflib for packages which lack new
 versions/compatibility patches for giflib5

---
 pkgs/top-level/all-packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 299029c95bd4..db76a4e55065 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2923,6 +2923,7 @@ let
 
     camlimages = callPackage ../development/ocaml-modules/camlimages {
       libpng = libpng12;
+      giflib = giflib_4_1;
     };
 
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
@@ -4329,6 +4330,7 @@ let
   glsurf = callPackage ../applications/science/math/glsurf {
     inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp;
     libpng = libpng12;
+    giflib = giflib_4_1;
   };
 
   gmime = callPackage ../development/libraries/gmime { };
@@ -7458,7 +7460,9 @@ let
 
   arora = callPackage ../applications/networking/browsers/arora { };
 
-  aseprite = callPackage ../applications/editors/aseprite { };
+  aseprite = callPackage ../applications/editors/aseprite {
+    giflib = giflib_4_1;
+  };
 
   audacious = callPackage ../applications/audio/audacious { };
 
@@ -10338,6 +10342,7 @@ let
 
   vice = callPackage ../misc/emulators/vice {
     libX11 = xlibs.libX11;
+    giflib = giflib_4_1;
   };
 
   viewnior = callPackage ../applications/graphics/viewnior { };

From 32cd0be64c22b43e49b2aa87358a0c939abe75e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 8 Dec 2013 19:18:59 +0100
Subject: [PATCH 147/562] vlc: add mkv support

---
 pkgs/applications/video/vlc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index de6ad9021505..ea71fba4e8f3 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray
 , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
-, pkgconfig, dbus, fribidi, qt4, freefont_ttf
+, pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska
 , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
-      libdc1394 libraw1394 libopus
+      libdc1394 libraw1394 libopus libebml libmatroska
     ];
 
   nativeBuildInputs = [ pkgconfig ];

From c1df906704397c2712bb9d1edffda6f97ee1323c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 8 Dec 2013 19:19:11 +0100
Subject: [PATCH 148/562] vlc: specify meta.platforms

---
 pkgs/applications/video/vlc/default.nix | 3 ++-
 pkgs/top-level/release.nix              | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index ea71fba4e8f3..f6ebc241bac2 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -45,8 +45,9 @@ stdenv.mkDerivation rec {
       ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Cross-platform media player and streaming server";
     homepage = http://www.videolan.org/vlc/;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cc62eaec86d4..cccd1363864b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -309,7 +309,6 @@ let
       vim = linux;
       vimHugeX = linux;
       VisualBoyAdvance = linux;
-      vlc = linux;
       vncrec = linux;
       vorbisTools = linux;
       vpnc = linux;

From 799062bcb624e65c39ec6c876d1ea45d4c66bfce Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 8 Dec 2013 19:49:40 +0100
Subject: [PATCH 149/562] Fixed sbt options

---
 .../tools/build-managers/simple-build-tool/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix
index 13a216799a2d..8f01486cfe72 100644
--- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix
+++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     cat > $out/bin/sbt << EOF
     #!/bin/sh
     SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M"
-    ${jre}/bin/java $SBT_OPTS -jar ${src} "\$@"
+    ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
     EOF
     chmod +x $out/bin/sbt
   '';

From 0c5f72af587bad1b9b57b1b17e1f580cb1fea7c3 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Sun, 8 Dec 2013 21:52:24 +0000
Subject: [PATCH 150/562] spotify: fix finding libXdamage.so.1

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/audio/spotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 615ee6a93cc9..874cc321f8be 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
       ln -s $out/spotify-client/spotify $out/bin/spotify
       patchelf \
         --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \
+        --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite xlibs.libXdamage ]}:${stdenv.gcc.gcc}/lib64 \
         $out/spotify-client/spotify
 
       dpkg-deb -x ${qt4webkit} ./
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
       mkdir -p $out/libexec/spotify
       gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
 
-      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib"
+      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer xlibs.libXdamage ]}:$out/lib"
 
       # Desktop file
       mkdir -p "$out/share/applications/"

From b4f93af3c9d6288692ede341cfbf38debd80ee52 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 01:15:16 +0100
Subject: [PATCH 151/562] Update git and related tools to latest releases.

Git     -> 1.8.5.1
stgit   -> 0.16
svn2git -> 2.2.2

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 .../git-and-tools/default.nix                 |  2 +-
 .../git-and-tools/git/default.nix             |  6 ++--
 .../git-and-tools/stgit/default.nix           |  6 ++--
 .../git-and-tools/svn2git/default.nix         | 28 +++++++++++++------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 9f7f26041ca6..ee1de54a4fb0 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -83,7 +83,7 @@ rec {
   };
 
   svn2git = import ./svn2git {
-    inherit stdenv fetchgit ruby makeWrapper;
+    inherit stdenv fetchurl ruby makeWrapper;
     git = gitSVN;
   };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 050cfd1aabee..e364a8ea87bd 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.8.4.3";
+  version = "1.8.5.1";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a";
+    sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@@ -140,6 +140,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index a933ae84e603..6518f32ef7c6 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, git }:
 
 let
-  name = "stgit-0.15";
+  name = "stgit-0.16";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://download.gna.org/stgit/${name}.tar.gz";
-    sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9";
+    sha256 = "0hla6401g2kicaakz4awk67yf8fhqbw1shn1p9ma5x6ca29s3w82";
   };
 
   buildInputs = [ python git ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     description = "StGit is a patch manager implemented on top of Git";
     license = "GPL";
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index 6f5d36f6aa74..0053a1dfafbe 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, ruby, makeWrapper, git }:
+{ stdenv, fetchurl, ruby, makeWrapper, git }:
 
-stdenv.mkDerivation rec {
-  name = "svn2git-2.1.0-20111206";
+let
+  version = "2.2.2";
+in
+stdenv.mkDerivation {
+  name = "svn2git-${version}";
 
-  src = fetchgit {
-    url = https://github.com/nirvdrum/svn2git;
-    rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
-    sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
+  src = fetchurl {
+    url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
+    sha256 = "14zinkpgybz15jvbfw0sb432w6f5w4sa5pdqycjwva8v8lxqn9mh";
   };
 
   buildInputs = [ ruby makeWrapper ];
@@ -17,14 +19,22 @@ stdenv.mkDerivation rec {
     ''
       mkdir -p $out
       cp -r lib $out/
-      
+
       mkdir -p $out/bin
       substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
       cp bin/svn2git $out/bin/
       chmod +x $out/bin/svn2git
-      
+
       wrapProgram $out/bin/svn2git \
         --set RUBYLIB $out/lib \
         --prefix PATH : ${git}/bin
     '';
+
+  meta = {
+    homepage = https://github.com/nirvdrum/svn2git;
+    description = "Ruby tool for importing existing svn projects into git";
+    license = stdenv.lib.licenses.mit;
+
+    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+  };
 }

From 7bd64d6c1f153afa3307430213c7d03fe8993f36 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 00:16:42 +0000
Subject: [PATCH 152/562] anki: update from 2.0.12 to 2.0.18

---
 pkgs/games/anki/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 7437e2e2262c..d574f9c860f6 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -9,10 +9,10 @@ let
 in
 
 stdenv.mkDerivation rec {
-    name = "anki-2.0.12";
+    name = "anki-2.0.18";
     src = fetchurl {
       url = "http://ankisrs.net/download/mirror/${name}.tgz";
-      sha256 = "1pccws3rgfpyxdx5xph5x72c4a46is0alfz73icn9ppgjdizzipr";
+      sha256 = "1hpla3bgg7zh05f1dgycs5j4a01hnim66a8q2qzihf1r5zanr50j";
     };
 
     pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
         * even practicing guitar chords!
       '';
       license = "GPLv3";
+      maintainers = with stdenv.lib.maintainers; [ the-kenny ];
       platforms = stdenv.lib.platforms.mesaPlatforms;
     };
 }

From 5c59c84bcb2356d6f52f538383cbe51df81caf83 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 00:20:57 +0000
Subject: [PATCH 153/562] audacity: update from 2.0.4 to 2.0.5

---
 pkgs/applications/audio/audacity/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 4a6797f9010b..890497b0c992 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -4,12 +4,12 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.4";
+  version = "2.0.5";
   name = "audacity-${version}";
 
   src = fetchurl {
     url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz";
-    sha256 = "0pl92filykzs4g2pn7i02kdqgja326wjgafzw2vcgwn3dwrs4avp";
+    sha256 = "0y9bvc3a3zxsk31yg7bha029mzkjiw5i9m86kbyj7x8ps0fm91z2";
   };
 
   preConfigure = /* we prefer system-wide libs */ ''
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     homepage = http://audacity.sourceforge.net;
     license = "GPLv2+";
     platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }

From 2d6c240913a6dcf25605d286a4525902420df1f8 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 00:34:35 +0000
Subject: [PATCH 154/562] winetricks: Update to rev 1078

And add some missing dependencies to the PATH of the script.
---
 pkgs/misc/emulators/wine/winetricks.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index 71cc2767f698..e3fe48ec8a3c 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl, cabextract, unzip, p7zip } :
+{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl
+, cabextract, unzip, p7zip, gnused, gnugrep, bash } :
 
 stdenv.mkDerivation rec {
-  rev = "939";
+  rev = "1078";
   name = "winetricks-${rev}";
 
   src = fetchsvn {
     url = "http://winetricks.googlecode.com/svn/trunk";
     inherit rev;
-    sha256 = "01v13qw4sxmfm09g9amqycnzy743gdrhvv23rjr9255dzlrj1s8f";
+    sha256 = "0ipvld0r5h6x2pgqkqa82q0w9flx6fn9aha8fd7axf5ji2gzmidm";
   };
 
   buildInputs = [ perl which ];
 
   pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum
-    [ wine perl which coreutils zenity curl cabextract unzip p7zip ]
+    [ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]
     + "/bin";
 
   patch = ./winetricks.patch;
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
     description = "A script to install DLLs needed to work around problems in Wine";
     license = "LGPLv2.1";
     homepage = http://code.google.com/p/winetricks/;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
 

From c727c38b266df1c2748e58b84c41ec5dd27e84de Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 9 Dec 2013 00:34:00 +0000
Subject: [PATCH 155/562] rdiff_backup: update from 1.2.8 to 1.3.3

---
 pkgs/tools/backup/rdiff-backup/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index d52cbdebb677..d58815f6d6dd 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, librsync, gnused }:
 
 stdenv.mkDerivation {
-  name = "rdiff-backup-1.2.8";
+  name = "rdiff-backup-1.3.3";
 
   src = fetchurl {
-    url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz;
-    sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d";
+    url = mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz;
+    sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf";
   };
 
   phases = "unpackPhase installPhase";
@@ -15,11 +15,12 @@ stdenv.mkDerivation {
       "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]"
   '';
 
-  buildInputs = [python librsync gnused ];
+  buildInputs = [ python librsync gnused ];
 
   meta = {
     description = "backup system trying to combine best a mirror and an incremental backup system";
     homepage = http://rdiff-backup.nongnu.org/;
     license = "GPL-2";
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }

From d79177cc20ac21ace619f71f72b3269291202647 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:41:31 +0200
Subject: [PATCH 156/562] youtubeDL: update from 2013.10.23.2 to 2013.12.08.1

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 86ef76178081..bf9dc76bbc13 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2013.10.23.2";
+  version = "2013.12.08.1";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "d3f4c9e0da165395856e690314caa5eef4382bd994dd46f041a520bf9747c35d";
+    sha256 = "0sqdc0fbk6xlfd5d2iy4r9kr5inl0122zzri08zndpl4cbzawhaq";
   };
 
   buildInputs = [ python ];

From e523fdfc4750c519f2149bacc8690091cd5089d6 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:47:10 +0200
Subject: [PATCH 157/562] apacheHttpd: update from 2.2.25 to 2.2.26

---
 pkgs/servers/http/apache-httpd/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index c91d6bbf761a..f6b31177157c 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.25";
+  version = "2.2.26";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236";
+    sha256 = "1dj29cl2bsk8ir8hxw0ajhbpbrrmsh8mwqfc1ipiqgv7slyqx45g";
   };
 
   buildInputs = [perl apr aprutil pcre] ++

From 7375a3f7dd1e40df2eb95c2a301094ff7de4609c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:48:41 +0200
Subject: [PATCH 158/562] aprutil: update from 1.5.2 to 1.5.3

---
 pkgs/development/libraries/apr-util/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 8e49d3984606..89c2c31ef7a9 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null;
 assert ldapSupport -> openldap != null;
 
 stdenv.mkDerivation rec {
-  name = "apr-util-1.5.2";
+  name = "apr-util-1.5.3";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "89c1348aa79e898d7c34a6206311c9c2";
+    sha256 = "0s1rpqjy5xr03k9s4xrsm5wvhj5286vlkf6jvqayw99yy5sb3vbq";
   };
 
   configureFlags = ''

From 6996067dcf88fb83d097b44d02ed26f957f07a81 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:49:00 +0200
Subject: [PATCH 159/562] apacheHttpd_2_4: update from 2.4.6 to 2.4.7

---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 9e687e9c843a..2bbe9798de46 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.6";
+  version = "2.4.7";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "16d8ec72535ded65d035122b0d944b0e64eaa2a2";
+    sha256 = "06z7ij0avr8f3rvp6ifk3dn8j73i17cn4avz4fp1as43061qsdk4";
   };
 
   buildInputs = [perl] ++

From a9ce83467e0b49d7c6c9d9e33b8195a0574a8cb4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:58:16 +0200
Subject: [PATCH 160/562] springLobby: update from 0.176 to 0.180

---
 pkgs/games/spring/springlobby.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index ac4869f78380..f522eef8eb91 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.176";
+  version = "0.180";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0a5pnd15rlvbkvnz2s0axy3i7m2jlrk91kjpwflnrcqlf42c2rk9";
+    sha256 = "0v2pwrwiwiggyl95rcyfj3pdlwsss5vcmnyzd40r9swb9gyi55na";
   };
 
   buildInputs = [

From d8f1146fdecfddcdbbb9f5ba3c2abf670933ac85 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 10:59:48 +0200
Subject: [PATCH 161/562] clamav: update from 0.97.8 to 0.98

---
 pkgs/tools/security/clamav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 858320004b84..8315078c80f9 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.97.8";
+  version = "0.98";
 
   src = fetchurl {
     url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "04pwm8a84silnvgimn2wi2wgwdzwpskybx72mp10ni1dd7yvswnq";
+    sha256 = "1dmkaa6sqynv4v74s9izq7m7kk8d78rvwyd123q4gva6gx9m0d0i";
   };
 
   buildInputs = [ zlib bzip2 libiconv ];

From 741b202d72d1928a090af909eba77504fba9574c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 11:04:25 +0200
Subject: [PATCH 162/562] apparmor: update from 2.8.1 to 2.8.2

---
 pkgs/os-specific/linux/apparmor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 858be431a91d..51fe768df834 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
 
   name = "apparmor-${version}";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchurl {
     url = "http://launchpad.net/apparmor/2.8/${version}/+download/${name}.tar.gz";
-    sha256 = "1r0a5k14jbiik28m5gql0f3dbxl252jya7i120rrsbzqqnvw6nw7";
+    sha256 = "1fyjvfkvl0fc7agmz64ck8c965940xvcljrczq1z66sydivkybvl";
   };
 
   buildInputs = [

From 3da956c7ca89d68c39345c469772a001858d8f4f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 11:13:26 +0200
Subject: [PATCH 163/562] amuleGui: update from 2.2.6 to 2.3.1

---
 pkgs/tools/networking/p2p/amule/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index 44384507a79d..039fca35ab3a 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -12,11 +12,11 @@ let
   edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
 in 
 mkDerivation rec {
-  name = "aMule-2.2.6";
+  name = "aMule-2.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/amule/${name}.tar.bz2";
-    sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc";
+    sha256 = "17g6xh6k7rqy2sjp9l4m7h4in96cqwk5gfgg4fhlymzc6jfa3vfj";
   };
 
   buildInputs =

From d4a1ab3bc3f68cccaf73f6494829f6198c7a6f7d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 11:18:17 +0200
Subject: [PATCH 164/562] libtorrent: update from 0.13.2 to 0.13.3

---
 pkgs/tools/networking/p2p/libtorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index fb0a889d3eeb..ea376fd2a7bd 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, openssl, libsigcxx }:
 
 let
-  version = "0.13.2";
+  version = "0.13.3";
 in
 stdenv.mkDerivation {
   name = "libtorrent-${version}";
 
   src = fetchurl {
     url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz";
-    sha256 = "ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f";
+    sha256 = "0xsnyd1hnfvfq67y5s0ddhj2lhxmfms4djblaa0d1y5phdkpsc9l";
   };
 
   buildInputs = [ pkgconfig openssl libsigcxx ];

From a08f5c43148b372d2864b89d8210be5c4de7864f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 11:30:43 +0200
Subject: [PATCH 165/562] verilog: update from 0.9.3 to 0.9.7

---
 pkgs/applications/science/electronics/verilog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index a4c803e2952c..883e332a2671 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, gperf, flex, bison}:
 
 stdenv.mkDerivation rec {
-  name = "verilog-0.9.3";
+  name = "verilog-0.9.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/iverilog/${name}.tar.gz";
-    sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba";
+    sha256 = "0m3liqw7kq24vn7k8wvi630ljz0awz23r3sd4rcklk7vgghp4pks";
   };
 
   buildInputs = [ gperf flex bison ];

From 8f4b7e21330e2b0a18c2aeaeb809d5fc4a5274c3 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 12:13:11 +0200
Subject: [PATCH 166/562] dosfstools: update from 3.0.21 to 3.0.24

---
 pkgs/tools/filesystems/dosfstools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index a98def328352..7511d75dd1a5 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-3.0.21";
+  name = "dosfstools-3.0.24";
 
   src = fetchurl {
     url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
-    sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960";
+    sha256 = "1hblhb98wm9gm60y32psdqm5jprs4a6dqzrapzgb6bw7r3kvf88y";
   };
 
   makeFlags = "PREFIX=$(out)";

From 916af0f39c0495c3f651d1c43e543462d32bc89a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 12:41:49 +0100
Subject: [PATCH 167/562] stellarium: update to version 0.12.4

---
 .../science/astronomy/stellarium/default.nix          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 04c82b21e859..6b84143d0138 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,14 +1,11 @@
-{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv }:
 
-let
-  name = "stellarium-0.12.1";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "stellarium-0.12.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "02qfp56mkg3bqggv3ndx8v6zfswg51gkczwiqy5c9y4rw28hazla";
+    sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg";
   };
 
   buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];

From aa58b5f571cd4e501f90181b9cf624fb96dd270c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 16:09:33 +0100
Subject: [PATCH 168/562] gnumake: clean up directory structure; no functional
 change

---
 .../3.80}/default.nix                         |  0
 .../{gnumake-3.80 => gnumake/3.80}/log.patch  |  0
 .../gnumake/{3.81.nix => 3.81/default.nix}    |  0
 .../gnumake/{ => 3.81}/impure-dirs.patch      |  0
 .../gnumake/{ => 3.81}/log-3.81.patch         |  0
 .../gnumake/{ => 3.82}/MAKEFLAGS-reexec.patch |  0
 .../{ => 3.82}/archives-many-objs.patch       |  0
 .../{ => 3.82}/construct-command-line.patch   |  0
 .../gnumake/{ => 3.82}/copy-on-expand.patch   |  0
 .../darwin-library_search-dylib.patch         |  0
 .../gnumake/{ => 3.82}/default.nix            |  0
 .../gnumake/{ => 3.82}/glob-speedup.patch     |  0
 .../gnumake/3.82/impure-dirs.patch            | 34 +++++++++++++++++++
 .../{ => 3.82}/intermediate-parallel.patch    |  0
 .../gnumake/{ => 3.82}/log.patch              |  0
 .../{ => 3.82}/long-command-line.patch        |  0
 .../{ => 3.82}/memory-corruption.patch        |  0
 .../gnumake/{ => 3.82}/oneshell.patch         |  0
 .../gnumake/{ => 3.82}/parallel-remake.patch  |  0
 pkgs/top-level/all-packages.nix               |  8 ++---
 20 files changed, 38 insertions(+), 4 deletions(-)
 rename pkgs/development/tools/build-managers/{gnumake-3.80 => gnumake/3.80}/default.nix (100%)
 rename pkgs/development/tools/build-managers/{gnumake-3.80 => gnumake/3.80}/log.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{3.81.nix => 3.81/default.nix} (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.81}/impure-dirs.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.81}/log-3.81.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/MAKEFLAGS-reexec.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/archives-many-objs.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/construct-command-line.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/copy-on-expand.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/darwin-library_search-dylib.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/default.nix (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/glob-speedup.patch (100%)
 create mode 100644 pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/intermediate-parallel.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/log.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/long-command-line.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/memory-corruption.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/oneshell.patch (100%)
 rename pkgs/development/tools/build-managers/gnumake/{ => 3.82}/parallel-remake.patch (100%)

diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake-3.80/default.nix
rename to pkgs/development/tools/build-managers/gnumake/3.80/default.nix
diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake-3.80/log.patch
rename to pkgs/development/tools/build-managers/gnumake/3.80/log.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/3.81.nix
rename to pkgs/development/tools/build-managers/gnumake/3.81/default.nix
diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
rename to pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/log-3.81.patch
rename to pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/construct-command-line.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/default.nix
rename to pkgs/development/tools/build-managers/gnumake/3.82/default.nix
diff --git a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/glob-speedup.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch
new file mode 100644
index 000000000000..f6646f1d0126
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch
@@ -0,0 +1,34 @@
+diff -rc read.c read.c
+*** read.c	2006-03-17 15:24:20.000000000 +0100
+--- read.c	2007-05-24 17:16:31.000000000 +0200
+***************
+*** 99,107 ****
+--- 99,109 ----
+  #endif
+      INCLUDEDIR,
+  #ifndef _AMIGA
++ #if 0    
+      "/usr/gnu/include",
+      "/usr/local/include",
+      "/usr/include",
++ #endif    
+  #endif
+      0
+    };
+diff -rc reremake.c
+*** remake.c	2006-03-20 03:36:37.000000000 +0100
+--- remake.c	2007-05-24 17:06:54.000000000 +0200
+***************
+*** 1452,1460 ****
+--- 1452,1462 ----
+    static char *dirs[] =
+      {
+  #ifndef _AMIGA
++ #if 0
+        "/lib",
+        "/usr/lib",
+  #endif
++ #endif
+  #if defined(WINDOWS32) && !defined(LIBDIR)
+  /*
+   * This is completely up to the user at product install time. Just define
diff --git a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/log.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/log.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/long-command-line.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/memory-corruption.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/oneshell.patch b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/oneshell.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/parallel-remake.patch
rename to pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db76a4e55065..3bffbc5f2606 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3641,10 +3641,10 @@ let
 
   gnum4 = callPackage ../development/tools/misc/gnum4 { };
 
-  gnumake = callPackage ../development/tools/build-managers/gnumake { };
-
-  gnumake380 = callPackage ../development/tools/build-managers/gnumake-3.80 { };
-  gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81.nix { };
+  gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
+  gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
+  gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
+  gnumake = gnumake382;
 
   gob2 = callPackage ../development/tools/misc/gob2 { };
 

From e2f8c7a208da6c540516873ca10cbfd51a31287c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 16:09:43 +0100
Subject: [PATCH 169/562] all-packages.nix: strip trailing whitespace

---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bffbc5f2606..3566b63bb6c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8492,7 +8492,7 @@ let
     jackSupport = config.mumble.jackSupport or false;
   };
 
-  murmur = callPackage ../applications/networking/mumble/murmur.nix { 
+  murmur = callPackage ../applications/networking/mumble/murmur.nix {
     avahi = avahi.override {
       withLibdnssdCompat = true;
     };
@@ -9599,10 +9599,10 @@ let
 
 
   ### DESKTOP ENVIRONMENTS
-  
+
    cinnamon = recurseIntoAttrs {
     cinnamon-translations  = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
-    }; 
+    };
 
   enlightenment = callPackage ../desktops/enlightenment { };
 

From 6dfc18dc00c159a0ee579153a56811c5ece0905e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 16:14:41 +0100
Subject: [PATCH 170/562] gnumake: add version 4.0

---
 .../4.0/darwin-library_search-dylib.patch     | 17 +++++++
 .../build-managers/gnumake/4.0/default.nix    | 49 +++++++++++++++++++
 .../gnumake/4.0/impure-dirs.patch             | 34 +++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 101 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/default.nix
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
new file mode 100644
index 000000000000..de7e4f615212
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.0/darwin-library_search-dylib.patch
@@ -0,0 +1,17 @@
+Fixed default libpatttern on Darwin, imported from prefix overlay.
+Got merged upstream:
+https://savannah.gnu.org/bugs/?37197
+--- default.c.orig	2009-05-02 12:25:24 +0200
++++ default.c	2009-05-02 12:25:58 +0200
+@@ -509,7 +509,11 @@
+ #ifdef __MSDOS__
+     ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
+ #else
++#ifdef __APPLE__
++    ".LIBPATTERNS", "lib%.dylib lib%.a",
++#else
+     ".LIBPATTERNS", "lib%.so lib%.a",
++#endif
+ #endif
+ #endif
+ 
diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix
new file mode 100644
index 000000000000..6a76fa0302b6
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix
@@ -0,0 +1,49 @@
+{stdenv, fetchurl}:
+
+let version = "4.0"; in
+stdenv.mkDerivation {
+  name = "gnumake-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnu/make/make-${version}.tar.bz2";
+    sha256 = "1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6";
+  };
+
+  /* On Darwin, there are 3 test failures that haven't been investigated
+     yet.  */
+  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
+
+  patches =
+    [
+      # Purity: don't look for library dependencies (of the form
+      # `-lfoo') in /lib and /usr/lib.  It's a stupid feature anyway.
+      # Likewise, when searching for included Makefiles, don't look in
+      # /usr/include and friends.
+      ./impure-dirs.patch
+
+      # a bunch of patches from Gentoo, mostly should be from upstream (unreleased)
+      ./darwin-library_search-dylib.patch
+    ];
+  patchFlags = "-p0";
+
+  meta = {
+    description = "GNU Make, a program controlling the generation of non-source files from sources";
+
+    longDescription =
+      '' Make is a tool which controls the generation of executables and
+         other non-source files of a program from the program's source files.
+
+         Make gets its knowledge of how to build your program from a file
+         called the makefile, which lists each of the non-source files and
+         how to compute it from other files. When you write a program, you
+         should write a makefile for it, so that it is possible to use Make
+         to build and install the program.
+      '';
+
+    homepage = http://www.gnu.org/software/make/;
+
+    license = "GPLv3+";
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch
new file mode 100644
index 000000000000..f6646f1d0126
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.0/impure-dirs.patch
@@ -0,0 +1,34 @@
+diff -rc read.c read.c
+*** read.c	2006-03-17 15:24:20.000000000 +0100
+--- read.c	2007-05-24 17:16:31.000000000 +0200
+***************
+*** 99,107 ****
+--- 99,109 ----
+  #endif
+      INCLUDEDIR,
+  #ifndef _AMIGA
++ #if 0    
+      "/usr/gnu/include",
+      "/usr/local/include",
+      "/usr/include",
++ #endif    
+  #endif
+      0
+    };
+diff -rc reremake.c
+*** remake.c	2006-03-20 03:36:37.000000000 +0100
+--- remake.c	2007-05-24 17:06:54.000000000 +0200
+***************
+*** 1452,1460 ****
+--- 1452,1462 ----
+    static char *dirs[] =
+      {
+  #ifndef _AMIGA
++ #if 0
+        "/lib",
+        "/usr/lib",
+  #endif
++ #endif
+  #if defined(WINDOWS32) && !defined(LIBDIR)
+  /*
+   * This is completely up to the user at product install time. Just define
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3566b63bb6c1..4887b05a2b6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3644,6 +3644,7 @@ let
   gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
   gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
+  gnumake40  = callPackage ../development/tools/build-managers/gnumake/4.0  { };
   gnumake = gnumake382;
 
   gob2 = callPackage ../development/tools/misc/gob2 { };

From 088f472fe5cf7c438645a1085b23a87b893bffbc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 9 Dec 2013 11:37:03 -0500
Subject: [PATCH 171/562] Add oracle jdk 7

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 131 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   7 +
 2 files changed, 138 insertions(+)
 create mode 100644 pkgs/development/compilers/jdk/jdk7-linux.nix

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
new file mode 100644
index 000000000000..42a84fb16ab1
--- /dev/null
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -0,0 +1,131 @@
+{ swingSupport ? true
+, stdenv
+, requireFile
+, xlibs ? null
+, installjdk ? true
+, pluginSupport ? true
+, installjce ? false
+}:
+
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+assert swingSupport -> xlibs != null;
+
+let
+
+  /**
+   * The JRE libraries are in directories that depend on the CPU.
+   */
+  architecture =
+    if stdenv.system == "i686-linux" then
+      "i386"
+    else if stdenv.system == "x86_64-linux" then
+      "amd64"
+    else
+      abort "jdk requires i686-linux or x86_64 linux";
+
+  jce =
+    if installjce then
+      requireFile {
+        name = "UnlimitedJCEPolicyJDK7.zip";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
+        sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh";
+      }
+    else
+      null;
+in
+
+stdenv.mkDerivation {
+  name =
+    if installjdk then "jdk-1.7.0_45" else "jre-1.7.0_45";
+
+  src =
+    if stdenv.system == "i686-linux" then
+      requireFile {
+        name = "jdk-7u45-linux-i586.tar.gz";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
+        sha256 = "1q0nw2rwmavcrssyigq76p1h00hm8kd3rhb5bdv7rbdcs0jxrjsa";
+      }
+    else if stdenv.system == "x86_64-linux" then
+      requireFile {
+        name = "jdk-7u45-linux-x64.tar.gz";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
+        sha256 = "06jbz536zycqkdpc7zriay0jidmj9nriqva60afsgpv93kcf9spj";
+      }
+    else
+      abort "jdk requires i686-linux or x86_64 linux";
+
+  installPhase = ''
+    cd ..
+    if test -z "$installjdk"; then
+      mv $sourceRoot/jre $out
+    else
+      mv $sourceRoot $out
+    fi
+
+    for file in $out/*
+    do
+      if test -f $file ; then
+        rm $file
+      fi
+    done
+
+    if test -n "$installjdk"; then
+      for file in $out/jre/*
+      do
+        if test -f $file ; then
+          rm $file
+        fi
+      done
+    fi
+
+    # construct the rpath
+    rpath=
+    for i in $libraries; do
+        rpath=$rpath''${rpath:+:}$i/lib
+    done
+
+    if test -z "$installjdk"; then
+      jrePath=$out
+    else
+      jrePath=$out/jre
+    fi
+
+    if test -n "$jce"; then
+      unzip $jce
+      cp -v jce/*.jar $jrePath/lib/security
+    fi
+
+    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
+
+    # set all the dynamic linkers
+    find $out -type f -perm +100 \
+        -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+        --set-rpath "$rpath" {} \;
+
+    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+
+    if test -z "$pluginSupport"; then
+      rm -f $out/bin/javaws
+      if test -n "$installjdk"; then
+        rm -f $out/jre/bin/javaws
+      fi
+    fi
+
+    mkdir $jrePath/lib/${architecture}/plugins
+    ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
+  '';
+
+  inherit installjdk pluginSupport;
+
+  /**
+   * libXt is only needed on amd64
+   */
+  libraries =
+    [stdenv.gcc.libc] ++
+    (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
+
+  passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
+
+  meta.license = "unfree";
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4887b05a2b6b..3f9f1ccf0470 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2817,6 +2817,8 @@ let
 
   oraclejdk = pkgs.jdkdistro true false;
 
+  oraclejdk7 = pkgs.oraclejdk7distro true false;
+
   oraclejre = lowPrio (pkgs.jdkdistro false false);
 
   jrePlugin = lowPrio (pkgs.jdkdistro false true);
@@ -2830,6 +2832,11 @@ let
     (if pluginSupport then appendToName "plugin" else x: x)
       (callPackage ../development/compilers/jdk/jdk6-linux.nix { });
 
+  oraclejdk7distro = installjdk: pluginSupport:
+    assert supportsJDK;
+    (if pluginSupport then appendToName "plugin" else x: x)
+      (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; });
+
   jikes = callPackage ../development/compilers/jikes { };
 
   julia = callPackage ../development/compilers/julia {

From 9131b45db45c2a2807f92a52f6cb23ea59c22578 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 9 Dec 2013 12:01:37 -0500
Subject: [PATCH 172/562] Linux 3.12.4

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index df5f596dc74e..842d2911f770 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.3";
+  version = "3.12.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "b649c759646a630893c98855fb7e9e87e954105e3acac7b81ca85b1161572713";
+    sha256 = "c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb";
   };
 
   features.iwlwifi = true;

From ac21aa9a8295c60ac846abcb26e54878dabe2f4f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 9 Dec 2013 13:25:07 -0500
Subject: [PATCH 173/562] Unpacking jce requires zip

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
index 42a84fb16ab1..a7a5eccee9d5 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -1,6 +1,7 @@
 { swingSupport ? true
 , stdenv
 , requireFile
+, unzip
 , xlibs ? null
 , installjdk ? true
 , pluginSupport ? true
@@ -54,6 +55,8 @@ stdenv.mkDerivation {
     else
       abort "jdk requires i686-linux or x86_64 linux";
 
+  buildInputs = if installjce then [ unzip ] else [];
+
   installPhase = ''
     cd ..
     if test -z "$installjdk"; then

From 0856500f3ed0f01eb7993cb98a2088d624ddbdad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 9 Dec 2013 19:41:44 +0100
Subject: [PATCH 174/562] nixos/libvirtd-service: fix fail-to-start when no
 machines are configured

Don't fail to start the libvirtd service just because there are no files
that match the /etc/libvirt/qemu/*.xml pattern.
---
 nixos/modules/virtualisation/libvirtd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index d8668eb16072..583b09192e33 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -107,6 +107,7 @@ in
             # while still being used by the virtual machine. So update the
             # emulator path on each startup to something valid (re-scan $PATH).
             for file in /etc/libvirt/qemu/*.xml; do
+                test -f "$file" || continue
                 # get (old) emulator path from config file
                 emulator=$(grep "^[[:space:]]*<emulator>" "$file" | sed 's,^[[:space:]]*<emulator>\(.*\)</emulator>.*,\1,')
                 # get a (definitely) working emulator path by re-scanning $PATH

From 5acb97b972e4905393cc3a5d5e8cc1c132155d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 9 Dec 2013 21:07:56 +0100
Subject: [PATCH 175/562] libopus: update 1.0.3 -> 1.1, enable tests

---
 pkgs/development/libraries/libopus/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 11f7a370efa9..b1bf65d0fe67 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,15 +1,20 @@
 { stdenv, fetchurl, fixedPoint ? false }:
 
+let
+  version = "1.1";
+in
 stdenv.mkDerivation rec {
-  name = "libopus-1.0.3";
-  
+  name = "libopus-${version}";
+
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz";
-    sha256 = "175l7hv7d03c4iz60g185nqvwrabc39ksil0d7g07i6vjaf0h6hr";
+    url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz";
+    sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr";
   };
 
   configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
 
+  doCheck = true;
+
   meta = {
     description = "Open, royalty-free, highly versatile audio codec";
     license = "BSD";

From 3cff0a80149003620405d841d441119a64936e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 5 Nov 2013 23:11:57 +0100
Subject: [PATCH 176/562] ntopng: new package

ntopng is a high-speed web-based traffic analysis and flow collection
tool. ntopng => ntop next generation.

http://www.ntop.org/products/ntop/
---
 ...-Undo-weird-modification-of-data_dir.patch | 24 +++++++++
 ...ement-to-have-writeable-callback-dir.patch | 29 +++++++++++
 pkgs/tools/networking/ntopng/default.nix      | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 106 insertions(+)
 create mode 100644 pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch
 create mode 100644 pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch
 create mode 100644 pkgs/tools/networking/ntopng/default.nix

diff --git a/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch b/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch
new file mode 100644
index 000000000000..8bec643c6e5f
--- /dev/null
+++ b/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch
@@ -0,0 +1,24 @@
+From d0c56a14e0432faca1e9438b84e5e4090d293bb9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Tue, 3 Dec 2013 20:42:24 +0000
+Subject: [PATCH 1/2] Undo weird modification of data_dir
+
+---
+ Prefs.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Prefs.cpp b/Prefs.cpp
+index b4fde5f..ca04ca1 100644
+--- a/Prefs.cpp
++++ b/Prefs.cpp
+@@ -408,7 +408,6 @@ int Prefs::checkOptions() {
+ 			ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to create log %s", path);
+   }
+ 
+-  free(data_dir); data_dir = strdup(ntop->get_install_dir());
+   docs_dir      = ntop->getValidPath(docs_dir);
+   scripts_dir   = ntop->getValidPath(scripts_dir);
+   callbacks_dir = ntop->getValidPath(callbacks_dir);
+-- 
+1.8.4.3
+
diff --git a/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch b/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch
new file mode 100644
index 000000000000..99467c371264
--- /dev/null
+++ b/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch
@@ -0,0 +1,29 @@
+From d77b42003d13e2775be3255a26f380d6ccda8042 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Tue, 3 Dec 2013 21:10:06 +0000
+Subject: [PATCH 2/2] Remove requirement to have writeable callback dir
+
+* ntopng doesn't write anything to the callback dir
+* it seems to be a copy-paste leftover error from data_dir a couple of
+  lines above
+---
+ Ntop.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Ntop.cpp b/Ntop.cpp
+index 2fb027b..0b4881b 100644
+--- a/Ntop.cpp
++++ b/Ntop.cpp
+@@ -114,8 +114,7 @@ void Ntop::registerPrefs(Prefs *_prefs) {
+   }
+ 
+   if(stat(prefs->get_callbacks_dir(), &statbuf)
+-     || (!(statbuf.st_mode & S_IFDIR)) /* It's not a directory */
+-     || (!(statbuf.st_mode & S_IWRITE)) /* It's not writable    */) {
++     || (!(statbuf.st_mode & S_IFDIR))) { /* It's not a directory */
+     ntop->getTrace()->traceEvent(TRACE_ERROR, "Invalid directory %s specified",
+ 				 prefs->get_callbacks_dir());
+     exit(-1);
+-- 
+1.8.4.3
+
diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
new file mode 100644
index 000000000000..e4f59a98cf05
--- /dev/null
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib, geoip, sqlite
+, which }:
+
+# ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/
+# directory.
+
+stdenv.mkDerivation rec {
+  name = "ntopng-1.1_6932";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ntop/files/ntopng/${name}.tgz";
+    sha256 = "0cdbmrsjp3bb7xzci0vfnnkmbyxwxbf47l4kbnk4ydd7xwhwdnzr";
+  };
+
+  patches = [
+    ./0001-Undo-weird-modification-of-data_dir.patch
+    ./0002-Remove-requirement-to-have-writeable-callback-dir.patch
+  ];
+
+  buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which ];
+
+  preBuild = ''
+    sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \
+        -e "s|/usr/local|$out|g" \
+        -e "s|/bin/rm|rm|g" \
+        -i Makefile
+
+    sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \
+        -e "s|/usr/local|$out|g" \
+        -e "s|/opt/local|/non-existing-dir|g" \
+        -i configure
+
+    sed -e "s|/usr/local|$out|g" \
+        -i Ntop.cpp
+
+    sed -e "s|\(#define CONST_DEFAULT_DATA_DIR\).*|\1 \"/var/lib/ntopng\"|g" \
+        -e "s|\(#define CONST_DEFAULT_DOCS_DIR\).*|\1 \"$out/share/ntopng/httpdocs\"|g" \
+        -e "s|\(#define CONST_DEFAULT_SCRIPTS_DIR\).*|\1 \"$out/share/ntopng/scripts\"|g" \
+        -e "s|\(#define CONST_DEFAULT_CALLBACKS_DIR\).*|\1 \"$out/share/ntopng/scripts/callbacks\"|g" \
+        -e "s|\(#define CONST_DEFAULT_INSTALL_DIR\).*|\1 \"$out/share/ntopng\"|g" \
+        -i ntop_defines.h
+  '';
+
+  meta = with stdenv.lib; {
+    description = "High-speed web-based traffic analysis and flow collection tool";
+    homepage = http://www.ntop.org/products/ntop/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db76a4e55065..bd8b06c8c037 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1448,6 +1448,8 @@ let
 
   ntop = callPackage ../tools/networking/ntop { };
 
+  ntopng = callPackage ../tools/networking/ntopng { };
+
   ntp = callPackage ../tools/networking/ntp { };
 
   numdiff = callPackage ../tools/text/numdiff { };

From 9474fbae65556933538076709332f11d40234b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 5 Dec 2013 22:21:12 +0100
Subject: [PATCH 177/562] nixos: add ntopng service

ntopng is a high-speed web-based traffic analysis and flow collection
tool. Enable it by adding this to configuration.nix:

  services.ntopng.enable = true;

Open a browser at http://localhost:3000 and login with the default
username/password: admin/admin.
---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/networking/ntopng.nix | 116 +++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 nixos/modules/services/networking/ntopng.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 078ea225e167..684850df2aec 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -170,6 +170,7 @@
   ./services/networking/minidlna.nix
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
+  ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
   ./services/networking/oidentd.nix
   ./services/networking/openfire.nix
diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix
new file mode 100644
index 000000000000..156a6b32a6ab
--- /dev/null
+++ b/nixos/modules/services/networking/ntopng.nix
@@ -0,0 +1,116 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.ntopng;
+  redisCfg = config.services.redis;
+
+  configFile = if cfg.configText != "" then
+    pkgs.writeText "ntopng.conf" ''
+      ${cfg.configText}
+    ''
+    else
+    pkgs.writeText "ntopng.conf" ''
+      ${concatStringsSep " " (map (e: "--interface=" + e) cfg.interfaces)}
+      --http-port=${toString cfg.http-port}
+      --redis=localhost:${toString redisCfg.port}
+      ${cfg.extraConfig}
+    '';
+
+in
+
+{
+
+  options = {
+
+    services.ntopng = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable ntopng, a high-speed web-based traffic analysis and flow
+          collection tool.
+
+          With the default configuration, ntopng monitors all network
+          interfaces and displays its findings at http://localhost:${toString
+          cfg.http-port}. Default username and password is admin/admin.
+
+          See the ntopng(8) manual page and http://www.ntop.org/products/ntop/
+          for more info.
+
+          Note that enabling ntopng will also enable redis (key-value
+          database server) for persistent data storage.
+        '';
+      };
+
+      interfaces = mkOption {
+        default = [ "any" ];
+        example = [ "eth0" "wlan0" ];
+        type = types.listOf types.str;
+        description = ''
+          List of interfaces to monitor. Use "any" to monitor all interfaces.
+        '';
+      };
+
+      http-port = mkOption {
+        default = 3000;
+        type = types.uniq types.int;
+        description = ''
+          Sets the HTTP port of the embedded web server.
+        '';
+      };
+
+      configText = mkOption {
+        default = "";
+        example = ''
+          --interface=any
+          --http-port=3000
+          --disable-login
+        '';
+        type = types.lines;
+        description = ''
+          Overridable configuration file contents to use for ntopng. By
+          default, use the contents automatically generated by NixOS.
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Configuration lines that will be appended to the generated ntopng
+          configuration file. Note that this mechanism does not work when the
+          manual <option>configText</option> option is used.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    # ntopng uses redis for data storage
+    services.redis.enable = true;
+
+    # nice to have manual page and ntopng command in PATH
+    environment.systemPackages = [ pkgs.ntopng ];
+
+    systemd.services.ntopng = {
+      description = "Ntopng Network Monitor";
+      requires = [ "redis.service" ];
+      after = [ "network.target" "redis.service" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = "mkdir -p /var/lib/ntopng/";
+      serviceConfig.ExecStart = "${pkgs.ntopng}/bin/ntopng ${configFile}";
+      unitConfig.Documentation = "man:ntopng(8)";
+    };
+
+    # ntopng drops priveleges to user "nobody" and that user is already defined
+    # in users-groups.nix.
+  };
+
+}

From f36d5c162cfff50042decf19373aa596e0ba7132 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 22:11:30 +0100
Subject: [PATCH 178/562] rtorrent: update to version 0.9.3

This version is dubbed "unstable" and apparently it lacks the man page that
used to come with earlier releases. :-(

We need the latest version, though, because of the recent update to libtorrent.
---
 .../tools/networking/p2p/rtorrent/default.nix | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index b503c1d91521..78eaf81e8191 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -1,24 +1,22 @@
 { stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl
-, zlib, openssl }:
+, zlib, openssl
+}:
 
-let
-  version = "0.9.2";
-in
-stdenv.mkDerivation {
-  name = "rtorrent-${version}";
+stdenv.mkDerivation rec {
+  name = "rtorrent-0.9.3";
 
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/rtorrent-${version}.tar.gz";
-    sha256 = "5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d";
+    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
+    sha256 = "043krhsiawigf8yjd5qfkdn5iqrssph1705dsx5fgbxipr0wm4wy";
   };
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
 
-  postInstall = ''
-    mkdir -p $out/share/man/man1 $out/share/rtorrent
-    mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
-    mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
-  '';
+  # postInstall = ''
+  #   mkdir -p $out/share/man/man1 $out/share/rtorrent
+  #   mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
+  #   mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
+  # '';
 
   meta = {
     homepage = "http://libtorrent.rakshasa.no/";

From 08a3ef19cdf53ae947abf05065d0c5b40e51fea1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 9 Dec 2013 12:14:14 +0200
Subject: [PATCH 179/562] dropbear: update from 2013.60 to 2013.62

---
 pkgs/tools/networking/dropbear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 933267eff23d..00e747da7c7e 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -2,11 +2,11 @@
 sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2013.60";
+  name = "dropbear-2013.62";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "1fw1hrcavfqjmsn34dhkrzh8w06yfqvfss2rkvvnxnad7d2m432c";
+    sha256 = "1ylz0zd68cxdgs4x4cpc2y8h75395y10bxb1qflv0m6cpc166rf6";
   };
 
   dontDisableStatic = enableStatic;

From 328d59eab6c2cdd94cb358d635fd6b4b64982e73 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 10 Dec 2013 00:51:04 +0200
Subject: [PATCH 180/562] add meta.repositories.git to several packages

---
 pkgs/applications/science/electronics/verilog/default.nix | 1 +
 pkgs/servers/memcached/default.nix                        | 1 +
 pkgs/tools/filesystems/dosfstools/default.nix             | 1 +
 pkgs/tools/misc/youtube-dl/default.nix                    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix
index 883e332a2671..f2c9d2e646f0 100644
--- a/pkgs/applications/science/electronics/verilog/default.nix
+++ b/pkgs/applications/science/electronics/verilog/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Icarus Verilog compiler";
+    repositories.git = https://github.com/steveicarus/iverilog.git;
     homepage = http://www.icarus.com;
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [winden];
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 1c3c3f706e48..ef77c3191cab 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A distributed memory object caching system";
+    repositories.git = https://github.com/memcached/memcached.git;
     homepage = http://memcached.org/;
     license = "bsd";
     maintainers = [ stdenv.lib.maintainers.coconnor ];
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 7511d75dd1a5..b9f101059186 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Utilities for creating and checking FAT and VFAT file systems";
+    repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git;
     homepage = http://www.daniel-baumann.ch/software/dosfstools/;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index bf9dc76bbc13..77d7efdb5f68 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://rg3.github.com/youtube-dl/";
+    repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";
 
     platforms = with stdenv.lib.platforms; linux ++ darwin;

From 9e4a60d54e5a1c2604f2e379af2574751de96959 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Dec 2013 23:11:50 +0000
Subject: [PATCH 181/562] haskellPackages.extensibleEffects: New expression

---
 .../haskell/extensible-effects/default.nix    | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/extensible-effects/default.nix

diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix
new file mode 100644
index 000000000000..f97b5cd5e28c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix
@@ -0,0 +1,20 @@
+{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "extensible-effects";
+  version = "1.2.1";
+  sha256 = "066977hjhcg44v47hkjpf2gs48xsry74l4h8hp753jsvbfsv0030";
+  testDepends = [
+    HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "https://github.com/RobotGymnast/extensible-effects";
+    description = "An Alternative to Monad Transformers";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 747ce660b511..b23b03a3edb0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -992,6 +992,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   fileLocation = callPackage ../development/libraries/haskell/file-location {};
 
+  extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {};
+
   extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {};
   extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {};
   extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {};

From 7317135edc20ee57b2bcaaf717d645288208ca36 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Dec 2013 23:13:44 +0000
Subject: [PATCH 182/562] haskellPackages.IntervalMap: New expression

---
 .../libraries/haskell/IntervalMap/default.nix    | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/IntervalMap/default.nix

diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix
new file mode 100644
index 000000000000..e2b94abd7c8d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix
@@ -0,0 +1,16 @@
+{ cabal, Cabal, deepseq, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "IntervalMap";
+  version = "0.3.0.2";
+  sha256 = "14pbq5n2cn9gxjkmqpnbn7dx9963wp3sdbb180wm9l5xqi338s0l";
+  buildDepends = [ deepseq ];
+  testDepends = [ Cabal deepseq QuickCheck ];
+  meta = {
+    homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
+    description = "Maps from Intervals to values, with efficient search";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 747ce660b511..c8dba1a891c8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1361,6 +1361,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   intervals = callPackage ../development/libraries/haskell/intervals {};
 
+  IntervalMap = callPackage ../development/libraries/haskell/IntervalMap {};
+
   ioChoice = callPackage ../development/libraries/haskell/io-choice {};
 
   IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};

From 11668c9273f37e0f7ed2b775373463311d174b89 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Dec 2013 23:32:00 +0000
Subject: [PATCH 183/562] haskellPackages.exPool: New expression

---
 .../libraries/haskell/ex-pool/default.nix       | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/ex-pool/default.nix

diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix
new file mode 100644
index 000000000000..9bf966e749af
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ex-pool/default.nix
@@ -0,0 +1,17 @@
+{ cabal, exceptions, hashable, stm, time, transformers, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "ex-pool";
+  version = "0.1.0.2";
+  sha256 = "11q63yfr59r6cfzi635xj75nhcc2yi83snc75k638wyamxgvxng4";
+  buildDepends = [
+    exceptions hashable stm time transformers vector
+  ];
+  meta = {
+    homepage = "https://github.com/kim/ex-pool";
+    description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 747ce660b511..fc8edf5d7877 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -975,6 +975,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   esqueleto = callPackage ../development/libraries/haskell/esqueleto {};
 
+  exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; };
+
   exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
 
   exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {};

From 192cca63ef3bba82e28e0762b75dc651191e3bbb Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 9 Dec 2013 23:35:59 +0000
Subject: [PATCH 184/562] haskellPackages.haskelldb: New expression

---
 .../libraries/haskell/haskelldb/default.nix       | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/haskelldb/default.nix

diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix
new file mode 100644
index 000000000000..fde1d71b2b03
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskelldb/default.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl, time }:
+
+cabal.mkDerivation (self: {
+  pname = "haskelldb";
+  version = "2.2.2";
+  sha256 = "1nwy05wsffagv62kbi8ahm6s591wal7cdl19p0fqi86qz05y9hkm";
+  buildDepends = [ mtl time ];
+  meta = {
+    homepage = "https://github.com/m4dc4p/haskelldb";
+    description = "A library of combinators for generating and executing SQL statements";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 747ce660b511..2c0b8ebf3dfe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1170,6 +1170,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hashtables = callPackage ../development/libraries/haskell/hashtables {};
 
+  haskelldb = callPackage ../development/libraries/haskell/haskelldb {};
+
   haskeline = callPackage ../development/libraries/haskell/haskeline {};
 
   haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};

From 393dcd9c84e104ab7ff7e35f5612dc221e58d29b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 10 Dec 2013 11:56:25 +0200
Subject: [PATCH 185/562] gmime: update from 2.6.15 to 2.6.19

---
 pkgs/development/libraries/gmime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 99859b9f34ef..a8a3943e409e 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "gmime-2.6.15";
+  name = "gmime-2.6.19";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz";
-    sha256 = "16n9gmlwn6rphi59hrwy6dpn785s3r13h2kmrn3k61l2kfws1hml";
+    sha256 = "0jm1fgbjgh496rsc0il2y46qd4bqq2ln9168p4zzh68mk4ml1yxg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 36cb2af0570889d57364b3b71f5526a536d41485 Mon Sep 17 00:00:00 2001
From: Arvin Moezzi <moezzia@gmail.com>
Date: Fri, 6 Dec 2013 21:23:03 +0100
Subject: [PATCH 186/562] calibre: upgrade 1.13.0 -> 1.14.0

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 41f4b4f09042..6c007aadd320 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-1.13.0";
+  name = "calibre-1.14.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0j0l81jkjzd8n3ciqwxh8zxz945y594xjfsizp3cxjjfhj90aagj";
+    sha256 = "1nwrahh8rkllazwjgwv1a5fxcg0x221760ixm3707ikz33i0qvx6";
   };
 
   inherit python;

From ea20904aefbb7a5bd865abd23b850ccb82e36342 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Dec 2013 12:52:18 +0100
Subject: [PATCH 187/562] cabal: add support for the enableStaticLibrary flag
 to enable/disable building of static libraries

Disabling static libraries is supported only in GHC 7.7 or later.
---
 pkgs/build-support/cabal/default.nix | 9 +++++++++
 pkgs/top-level/haskell-packages.nix  | 7 +++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 9b6d8c4e80ed..14bd01c7346e 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -4,6 +4,7 @@
 , enableLibraryProfiling ? false
 , enableSharedLibraries ? false
 , enableSharedExecutables ? false
+, enableStaticLibraries ? true
 , enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version
 }:
 
@@ -25,6 +26,9 @@ assert enableSharedExecutables -> versionOlder "7.4" ghc.version;
 # Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
 assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
 
+# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
+assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
+
 {
   mkDerivation =
     args : # arguments for the individual package, can modify the defaults
@@ -128,6 +132,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
             # and run any regression test suites the package might have
             doCheck = enableCheckPhase;
 
+            # pass the '--enable-library-vanilla' flag to cabal in the
+            # configure stage to enable building shared libraries
+            inherit enableStaticLibraries;
+
             # pass the '--enable-shared' flag to cabal in the configure
             # stage to enable building shared libraries
             inherit enableSharedLibraries;
@@ -140,6 +148,7 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
               (enableFeature self.enableSplitObjs "split-objs")
               (enableFeature enableLibraryProfiling "library-profiling")
               (enableFeature self.enableSharedLibraries "shared")
+              (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla"))
               (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
               (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
             ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 40446bcd3660..87b99ddf5d98 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -63,6 +63,7 @@
 , enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version
 , enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version
 , enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version
+, enableStaticLibraries ? true
 }:
 
 # We redefine callPackage to take into account the new scope. The optional
@@ -113,10 +114,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   # packages. It isn't the Cabal library, which is spelled "Cabal".
 
   cabal = callPackage ../build-support/cabal {
-    inherit enableLibraryProfiling;
-    inherit enableSharedLibraries;
-    inherit enableSharedExecutables;
-    inherit enableCheckPhase;
+    inherit enableLibraryProfiling enableCheckPhase
+      enableStaticLibraries enableSharedLibraries enableSharedExecutables;
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
   };
 

From ebdff3841aa5d2fe145b2ff5074c0a23f2657ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 17 Nov 2013 13:09:01 +0100
Subject: [PATCH 188/562] haskell: Propagate cabal dependencies to user env

Before this commit, if a haskell library X depends on Y, and X was added to
systemPackages, only X would be available in the user environment. Y
would not be avialable, which causes X to be broken. This commit solves
the issue by setting propagatedUserEnvPkgs to all packages X depends
on when X is a library.
---
 pkgs/build-support/cabal/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 14bd01c7346e..b17f720e5618 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -46,6 +46,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
           x : (removeAttrs x internalAttrs) // {
                 buildInputs           = filter (y : ! (y == null)) x.buildInputs;
                 propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
+                propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
                 doCheck               = enableCheckPhase && x.doCheck;
               };
 
@@ -96,6 +97,10 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             # have to check for its existence
             propagatedBuildInputs = if self.isLibrary then self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends else [];
 
+            # By default, also propagate all dependencies to the user environment. This is required, otherwise packages would be broken, because
+            # GHC also needs all dependencies to be available.
+            propagatedUserEnvPkgs = if self.isLibrary then self.buildDepends else [];
+
             # library directories that have to be added to the Cabal files
             extraLibDirs = [];
 

From 6b5f1f35fbf68beee4d81556331892e3ba659e3f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 12:57:47 +0100
Subject: [PATCH 189/562] haskell-errorcall-eq-instance: add version 0.1.0

---
 .../haskell/errorcall-eq-instance/default.nix       | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix

diff --git a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix
new file mode 100644
index 000000000000..e3bfa5c569ea
--- /dev/null
+++ b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix
@@ -0,0 +1,13 @@
+{ cabal, hspec, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "errorcall-eq-instance";
+  version = "0.1.0";
+  sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk";
+  testDepends = [ hspec QuickCheck ];
+  meta = {
+    description = "An orphan Eq instance for ErrorCall";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 87b99ddf5d98..af706d027745 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -966,6 +966,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   erf = callPackage ../development/libraries/haskell/erf {};
 
+  errorcallEqInstance = callPackage ../development/libraries/haskell/errorcall-eq-instance {};
+
   errors = callPackage ../development/libraries/haskell/errors {};
 
   either = callPackage ../development/libraries/haskell/either {};

From 6ea83a9a66a930f98ed7521ad2b05f75f2be520f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 12:58:19 +0100
Subject: [PATCH 190/562] haskell-case-insensitive: update to version 1.1.0.2

---
 .../haskell/case-insensitive/{1.1.0.1.nix => 1.1.0.2.nix}   | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/case-insensitive/{1.1.0.1.nix => 1.1.0.2.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix
rename to pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix
index 4f63796850a0..5fd438e320d5 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "1.1.0.1";
-  sha256 = "1hwkdkpr88r3s7c8w1msw1pawz8cfi0lwj1z9dcsp0xs788yzapp";
+  version = "1.1.0.2";
+  sha256 = "0200jpz2xs67sw5dczfj8nlz2yp40k05bv3rk1phdc093n13kaww";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index af706d027745..a8e563c79cb6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     inherit (self) cabal ghc;
     async        = self.async_2_0_1_4;
     attoparsec   = self.attoparsec_0_10_4_0;
-    caseInsensitive = self.caseInsensitive_1_1_0_1;
+    caseInsensitive = self.caseInsensitive_1_1_0_2;
     cgi          = self.cgi_3001_1_8_4;
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_5_0_2;
@@ -686,8 +686,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cassava = callPackage ../development/libraries/haskell/cassava {};
 
   caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {};
-  caseInsensitive_1_1_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.1.nix {};
-  caseInsensitive = self.caseInsensitive_1_1_0_1;
+  caseInsensitive_1_1_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.2.nix {};
+  caseInsensitive = self.caseInsensitive_1_1_0_2;
 
   cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
 

From 1d56cb64a825e38a7448af16cb0b1adc102acae9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 12:58:47 +0100
Subject: [PATCH 191/562] haskell-http-client-*: new packages

---
 .../haskell/http-client-conduit/default.nix   | 14 ++++++++++
 .../haskell/http-client-multipart/default.nix | 19 +++++++++++++
 .../haskell/http-client-tls/default.nix       | 17 ++++++++++++
 .../libraries/haskell/http-client/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  8 ++++++
 5 files changed, 85 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/http-client-conduit/default.nix
 create mode 100644 pkgs/development/libraries/haskell/http-client-multipart/default.nix
 create mode 100644 pkgs/development/libraries/haskell/http-client-tls/default.nix
 create mode 100644 pkgs/development/libraries/haskell/http-client/default.nix

diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
new file mode 100644
index 000000000000..df4b49b47f39
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix
@@ -0,0 +1,14 @@
+{ cabal, conduit, httpClient, resourcet, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "http-client-conduit";
+  version = "0.2.0.0";
+  sha256 = "1pb47mms5qfi185nrz675if4pb7xji97xdqpmyrplqaxqygwih1y";
+  buildDepends = [ conduit httpClient resourcet transformers ];
+  meta = {
+    homepage = "https://github.com/snoyberg/http-client";
+    description = "Frontend support for using http-client with conduit";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
new file mode 100644
index 000000000000..068efdcb543d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-client-multipart/default.nix
@@ -0,0 +1,19 @@
+{ cabal, blazeBuilder, filepath, httpClient, httpTypes, mimeTypes
+, random, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "http-client-multipart";
+  version = "0.2.0.0";
+  sha256 = "1bahkysh771p3mrfan1gmm6jyx62w3k57ba4rsnx7h1gwbilm878";
+  buildDepends = [
+    blazeBuilder filepath httpClient httpTypes mimeTypes random text
+    transformers
+  ];
+  meta = {
+    homepage = "https://github.com/snoyberg/http-client";
+    description = "Generate multipart uploads for http-client";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
new file mode 100644
index 000000000000..5056a94c5d94
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix
@@ -0,0 +1,17 @@
+{ cabal, connection, dataDefault, hspec, httpClient, httpTypes
+, network, tls
+}:
+
+cabal.mkDerivation (self: {
+  pname = "http-client-tls";
+  version = "0.2.0.0";
+  sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0";
+  buildDepends = [ connection dataDefault httpClient network tls ];
+  testDepends = [ hspec httpClient httpTypes ];
+  meta = {
+    homepage = "https://github.com/snoyberg/http-client";
+    description = "http-client backend using the connection package and tls library";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
new file mode 100644
index 000000000000..fd40ca88e1dc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -0,0 +1,27 @@
+{ cabal, base64Bytestring, blazeBuilder, caseInsensitive, cookie
+, dataDefault, deepseq, failure, hspec, httpTypes, monadControl
+, network, publicsuffixlist, text, time, transformers, zlib
+, zlibBindings
+}:
+
+cabal.mkDerivation (self: {
+  pname = "http-client";
+  version = "0.2.0.1";
+  sha256 = "0iqlq0drylxc9ir362pdbljghh5mxrmqjl51s02381y7jc0mfjs0";
+  buildDepends = [
+    base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
+    deepseq failure httpTypes network publicsuffixlist text time
+    transformers zlibBindings
+  ];
+  testDepends = [
+    base64Bytestring blazeBuilder caseInsensitive dataDefault deepseq
+    failure hspec httpTypes monadControl network text time transformers
+    zlib zlibBindings
+  ];
+  meta = {
+    homepage = "https://github.com/snoyberg/http-client";
+    description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a8e563c79cb6..244ca770c5ae 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1222,6 +1222,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 
+  httpClient = callPackage ../development/libraries/haskell/http-client {};
+
+  httpClientConduit = callPackage ../development/libraries/haskell/http-client-conduit {};
+
+  httpClientMultipart = callPackage ../development/libraries/haskell/http-client-multipart {};
+
+  httpClientTls = callPackage ../development/libraries/haskell/http-client-tls {};
+
   httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {};
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};

From 38ff6648470e3e72e400adde61b6a01e863f3603 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 12:59:50 +0100
Subject: [PATCH 192/562] haskell-parsers: update to version 0.10.1.2

---
 .../libraries/haskell/parsers/{0.10.1.1.nix => 0.10.1.2.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/parsers/{0.10.1.1.nix => 0.10.1.2.nix} (83%)

diff --git a/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix b/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix
similarity index 83%
rename from pkgs/development/libraries/haskell/parsers/0.10.1.1.nix
rename to pkgs/development/libraries/haskell/parsers/0.10.1.2.nix
index db79c81a62d4..0f9c5f6634e7 100644
--- a/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix
+++ b/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parsers";
-  version = "0.10.1.1";
-  sha256 = "1w3dj3r2l0w54rafngrp7r1spqznbj5yzilkprqxvbvvj3jxgn5a";
+  version = "0.10.1.2";
+  sha256 = "1malfr2ls7f6di2rj2jcyxyqvjz0vb3p3v06j0r9if1bkjfzfp2j";
   buildDepends = [
     charset parsec text transformers unorderedContainers
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 244ca770c5ae..6351ea3bcb0f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1706,8 +1706,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   parsec  = self.parsec3;
 
   parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {};
-  parsers_0_10_1_1 = callPackage ../development/libraries/haskell/parsers/0.10.1.1.nix {};
-  parsers = self.parsers_0_10_1_1;
+  parsers_0_10_1_2 = callPackage ../development/libraries/haskell/parsers/0.10.1.2.nix {};
+  parsers = self.parsers_0_10_1_2;
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 

From 375c13622e7c44d504842779e0253096b444a02c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:01:16 +0100
Subject: [PATCH 193/562] haskell-text: update to version 1.0.0.0

---
 .../libraries/haskell/text/1.0.0.0.nix        | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/text/1.0.0.0.nix

diff --git a/pkgs/development/libraries/haskell/text/1.0.0.0.nix b/pkgs/development/libraries/haskell/text/1.0.0.0.nix
new file mode 100644
index 000000000000..fe740864970b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/text/1.0.0.0.nix
@@ -0,0 +1,22 @@
+{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "text";
+  version = "1.0.0.0";
+  sha256 = "13i7xn5xl8lc5hcd08i4n0qp9rx51588jnjn4c68gp87vw1gwvjn";
+  buildDepends = [ deepseq ];
+  testDepends = [
+    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/bos/text";
+    description = "An efficient packed Unicode text type";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6351ea3bcb0f..ed7dddae7f6d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -167,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     split        = self.split_0_2_2;
     stm          = self.stm_2_4_2;
     syb          = self.syb_0_4_1;
-    text         = self.text_0_11_3_1;
+    text         = self.text_1_0_0_0;
     transformers = self.transformers_0_3_0_0;   # this has become a core package in GHC 7.7
     unorderedContainers = self.unorderedContainers_0_2_3_3;
     vector       = self.vector_0_10_9_1;
@@ -2155,7 +2155,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {};
   text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {};
   text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {};
-  text = self.text_0_11_3_1;
+  text_1_0_0_0 = callPackage ../development/libraries/haskell/text/1.0.0.0.nix {};
+  text = self.text_1_0_0_0;
 
   textFormat = callPackage ../development/libraries/haskell/text-format {};
 

From 367b119971fad6314b642c41e8ea6d9216439b85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:02:23 +0100
Subject: [PATCH 194/562] haskell-pretty-show: update to version 1.6.2

---
 .../libraries/haskell/pretty-show/{1.6.1.nix => 1.6.2.nix} | 7 ++++---
 pkgs/top-level/haskell-packages.nix                        | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/pretty-show/{1.6.1.nix => 1.6.2.nix} (75%)

diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
similarity index 75%
rename from pkgs/development/libraries/haskell/pretty-show/1.6.1.nix
rename to pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
index dc31b452a1bb..ea3b7ed27cbf 100644
--- a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
@@ -1,12 +1,13 @@
-{ cabal, filepath, haskellLexer }:
+{ cabal, filepath, happy, haskellLexer }:
 
 cabal.mkDerivation (self: {
   pname = "pretty-show";
-  version = "1.6.1";
-  sha256 = "17zdljvpf7ra9x3lny5kbjvmz3psn8y1k9cwbg97m017gh87gsh0";
+  version = "1.6.2";
+  sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellLexer ];
+  buildTools = [ happy ];
   meta = {
     homepage = "http://wiki.github.com/yav/pretty-show";
     description = "Tools for working with derived `Show` instances and generic inspection of values";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ed7dddae7f6d..f7f2bd9d03b5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1772,8 +1772,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-  prettyShow_1_6_1 = callPackage ../development/libraries/haskell/pretty-show/1.6.1.nix {};
-  prettyShow = self.prettyShow_1_6_1;
+  prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {};
+  prettyShow = self.prettyShow_1_6_2;
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 

From 37d68e69a0803050450a70d0bd6e5fba57cb5c85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:02 +0100
Subject: [PATCH 195/562] haskell-pretty-show: remove obsolete version 1.2

---
 .../libraries/haskell/pretty-show/1.2.nix        | 16 ----------------
 .../pretty-show/{1.6.2.nix => default.nix}       |  0
 pkgs/top-level/haskell-packages.nix              |  4 +---
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix
 rename pkgs/development/libraries/haskell/pretty-show/{1.6.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix
deleted file mode 100644
index 545816a57a02..000000000000
--- a/pkgs/development/libraries/haskell/pretty-show/1.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, haskellLexer }:
-
-cabal.mkDerivation (self: {
-  pname = "pretty-show";
-  version = "1.2";
-  sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ haskellLexer ];
-  meta = {
-    homepage = "http://wiki.github.com/yav/pretty-show";
-    description = "Tools for working with derived Show instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
rename to pkgs/development/libraries/haskell/pretty-show/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f7f2bd9d03b5..f34386fa180b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1771,9 +1771,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
-  prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-  prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {};
-  prettyShow = self.prettyShow_1_6_2;
+  prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 

From c0fc46516dd29dff46edcd19843cdcb566969273 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:18 +0100
Subject: [PATCH 196/562] haskell-github-backup: update to version 1.20131203

---
 .../git-and-tools/github-backup/default.nix                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
index 0752504278be..e7501baf9b41 100644
--- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github-backup";
-  version = "1.20131101";
-  sha256 = "07l8a3xiy65xicxa5v14li6jnj3niwhndm8gd6q4d7aw14yq8wbn";
+  version = "1.20131203";
+  sha256 = "0156g7zbqsp58g8hniqsilyc79sam7plwhn3w56wbzf8m380mwba";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From a91e1a6f85e1021ddedbcfbfe8a6fd3febc0bf49 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:18 +0100
Subject: [PATCH 197/562] haskell-DAV: update to version 0.5

---
 .../development/libraries/haskell/DAV/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index c330f082e890..c24ceacc0216 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -1,17 +1,18 @@
-{ cabal, caseInsensitive, httpConduit, httpTypes, lens, liftedBase
-, mtl, network, optparseApplicative, resourcet, transformers
-, xmlConduit, xmlHamlet
+{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens
+, liftedBase, mtl, network, optparseApplicative, resourcet
+, transformers, xmlConduit, xmlHamlet
 }:
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "0.4.1";
-  sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c";
+  version = "0.5";
+  sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    caseInsensitive httpConduit httpTypes lens liftedBase mtl network
-    optparseApplicative resourcet transformers xmlConduit xmlHamlet
+    caseInsensitive httpClient httpConduit httpTypes lens liftedBase
+    mtl network optparseApplicative resourcet transformers xmlConduit
+    xmlHamlet
   ];
   meta = {
     homepage = "http://floss.scru.org/hDAV";

From 82e26eb2a430ac918d2f9264ab73bd4be6b25500 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:18 +0100
Subject: [PATCH 198/562] haskell-JuicyPixels: update to version 3.1.2

---
 pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index b2947318a1f1..485a80dadb3c 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1.1.1";
-  sha256 = "0lvhaa8pqknkcsfps5gcbwiqx0y1rhasiw9hwy7975vgpsh58dph";
+  version = "3.1.2";
+  sha256 = "19bal3g3cp4nn8g3zp4yi5g4zw5wnkbi74gcra8mxs4zy99bf8s2";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];

From 5afde208e98a40f501025c344d4f6f3612b8237d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 199/562] haskell-authenticate-oauth: update to version 1.4.0.8

---
 .../libraries/haskell/authenticate-oauth/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
index 2ddd7c05ee99..15c8267ca3e2 100644
--- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate-oauth";
-  version = "1.4.0.7";
-  sha256 = "1pmkj35rpbhgyjrfdg8j51xn9a420aawkwfg28fpxz7kid0cqw8g";
+  version = "1.4.0.8";
+  sha256 = "1mc36d6lkmqywzsxhzwv4445mmwdz0rr5ibd2a1nbgw5c5jw76fy";
   buildDepends = [
     base64Bytestring blazeBuilder blazeBuilderConduit conduit
     cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl

From 5b61f54e0972637c697ea1548c6ee493c1e3b756 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 200/562] haskell-base-compat: update to version 0.3.0

---
 pkgs/development/libraries/haskell/base-compat/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix
index ca208b7c1a34..6ce94b0d6c00 100644
--- a/pkgs/development/libraries/haskell/base-compat/default.nix
+++ b/pkgs/development/libraries/haskell/base-compat/default.nix
@@ -1,9 +1,10 @@
-{ cabal, hspec, setenv }:
+{ cabal, errorcallEqInstance, hspec, setenv }:
 
 cabal.mkDerivation (self: {
   pname = "base-compat";
-  version = "0.2.1";
-  sha256 = "1yssx3nww89dmkw8i55bp1vinbczbxhhh0kh4f3b9fyw5ylnai43";
+  version = "0.3.0";
+  sha256 = "0jjj953hr00jj99ld2977al6n6qk67ds9qfzkzwkh5ifgmi6f20i";
+  buildDepends = [ errorcallEqInstance ];
   testDepends = [ hspec setenv ];
   meta = {
     description = "A compatibility layer for base";

From c22384263d9b5297cf89121ef7b4d7c9df347a9e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 201/562] haskell-blaze-html: update to version 0.6.1.2

---
 pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index ec21e3fcd84b..7d799c2ebf62 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.6.1.1";
-  sha256 = "08zfmkvahmm613r0nrabwl5zv9ragcrhdqsa8jfdrfdkrf6ckbrc";
+  version = "0.6.1.2";
+  sha256 = "09a9gp40y31im763bri755if5j369a8m4kkl3c4wabq8q21y8z7m";
   buildDepends = [ blazeBuilder blazeMarkup text ];
   testDepends = [
     blazeBuilder blazeMarkup HUnit QuickCheck testFramework

From 4d90e5aa3afce3056a4b8c207c2c729d6398ca19 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 202/562] haskell-blaze-markup: update to version 0.5.1.6

---
 pkgs/development/libraries/haskell/blaze-markup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
index 0c544119d5ff..23ea971922b1 100644
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-markup";
-  version = "0.5.1.5";
-  sha256 = "0g3smm1ym7h45bkzx94b77ssyg0z0gqfwbnap3ywa2381rb39l74";
+  version = "0.5.1.6";
+  sha256 = "09w0mwws1xz0h0h99n6ppbdycnrv5y74x6asgzvrzqaslrp5rhvm";
   buildDepends = [ blazeBuilder text ];
   testDepends = [
     blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit

From 695c2a345b8f26632607422697be84eaf7df1bb9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 203/562] haskell-cmdargs: update to version 0.10.6

---
 pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 1814ab99784a..ba8793ebb45c 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
-  version = "0.10.5";
-  sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h";
+  version = "0.10.6";
+  sha256 = "1ckzznza8nqidwq7vd6jlxkjgb7xd4rvqi7gm8ca9laj0cvwkclw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];

From c9ecf30aac0e11c0394d5bc99464d2ed9f580656 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 204/562] haskell-crypto-pubkey-types: update to version 0.4.1

---
 .../libraries/haskell/crypto-pubkey-types/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
index e4234d1d4cd0..ba5007e789fa 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-pubkey-types";
-  version = "0.4.0";
-  sha256 = "0bapzvd0xgv38mbj1xhzcswchnx81sq0wwyax3qqzcpgvcyz28sl";
+  version = "0.4.1";
+  sha256 = "1zs0hhpqcfsdyfr3z96m8lwxrxr3mf27wvjrpvih9jlvh64vp1pr";
   buildDepends = [ asn1Types ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";

From fa254e5565fd07dcf0b6846a05599936ed20fb3a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 205/562] haskell-crypto-pubkey: update to version 0.2.3

---
 .../libraries/haskell/crypto-pubkey/default.nix          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
index aa400c736cb1..d3355f4c85c8 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix
@@ -5,14 +5,15 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-pubkey";
-  version = "0.2.2";
-  sha256 = "084758n5fyh2aigd6055a75pnqjhx42sbjg36hhp2a40vhl7xr2f";
+  version = "0.2.3";
+  sha256 = "198gpaxlcqkp6wa5cwwnlzdxnrs7j6h7zyizczd4imwbpl0gd2mk";
   buildDepends = [
     byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom
   ];
   testDepends = [
-    byteable cryptohash cryptoNumbers cryptoRandom HUnit QuickCheck
-    testFramework testFrameworkHunit testFrameworkQuickcheck2
+    byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom
+    HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-pubkey";

From a438e431b36194a105758744e52781e8ac949623 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 206/562] haskell-errors: update to version 1.4.4

---
 pkgs/development/libraries/haskell/errors/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
index 1b0bc4282a75..1b091d871bb8 100644
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "errors";
-  version = "1.4.3";
-  sha256 = "02xvfh0kfca7z5vhnkmqg5gw5i5ad5bc3jf8flxj75ry7wqggfmm";
+  version = "1.4.4";
+  sha256 = "1mhh5xna5nppqg8aw93iil7nsnpx5j6r21a12bx4mmip8nzr6480";
   buildDepends = [ either safe transformers ];
   jailbreak = true;
   meta = {

From b9f4a63413549154679e2bb6a88b65589464092f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 207/562] haskell-fast-logger: update to version 2.0.0

---
 .../libraries/haskell/fast-logger/default.nix            | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index fb8714f3e854..ee51859404ce 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -1,11 +1,10 @@
-{ cabal, blazeBuilder, dateCache, filepath, hspec, text, unixTime
-}:
+{ cabal, blazeBuilder, filepath, hspec, text }:
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "0.3.3";
-  sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh";
-  buildDepends = [ blazeBuilder dateCache filepath text unixTime ];
+  version = "2.0.0";
+  sha256 = "0a2pmdj2q1mlpkwjszlb4gp6xk2bn8540cqhwjya55arx6rj9vs7";
+  buildDepends = [ blazeBuilder filepath text ];
   testDepends = [ hspec ];
   meta = {
     description = "A fast logging system";

From fee913a3efc290b36873f6230e25cba28face186 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 208/562] haskell-ghc-vis: update to version 0.7.2

---
 pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 04af52f26790..bfedbdb776d8 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-vis";
-  version = "0.7.1";
-  sha256 = "05j3yw1276wvy4va7r7pbnvhjg1k1mxzp4baxcb9jlb5dxfh0daa";
+  version = "0.7.2";
+  sha256 = "1mb33fafi212a6wawnd8601r80qjb1bja6nbj6jqrd91y96dxdll";
   buildDepends = [
     cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
     transformers xdot

From 8198b87947ff14e02108f81cb1c1e2f7a3994f51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:19 +0100
Subject: [PATCH 209/562] haskell-glade: update to version 0.12.5.0

---
 pkgs/development/libraries/haskell/glade/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
index 7c49b956aa98..30711083d2c5 100644
--- a/pkgs/development/libraries/haskell/glade/default.nix
+++ b/pkgs/development/libraries/haskell/glade/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "glade";
-  version = "0.12.1";
-  sha256 = "114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990";
+  version = "0.12.5.0";
+  sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr";
   buildDepends = [ glib gtk ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];

From e979b49dd595dcd3766fdc5891124d53d30dd6c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 210/562] haskell-hakyll: update to version 4.4.2.0

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 424860c4677f..f7f318e502aa 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.4.1.2";
-  sha256 = "0rbl0gl5ds63mv8cbcwb8aj0vic9padqs3zrdxr2ny70md1v9m9y";
+  version = "4.4.2.0";
+  sha256 = "10rkqnrj9gi4h25wfh1w4giqiir2d63vb85ysbxpc97rkbz3fwsg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -25,9 +25,6 @@ cabal.mkDerivation (self: {
     snapCore snapServer systemFilepath tagsoup testFramework
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
-  patchPhase = ''
-    sed -i -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal
-  '';
   doCheck = false;
   meta = {
     homepage = "http://jaspervdj.be/hakyll";

From dffb56d5d298a8c7ad1a99d26d191115e945fc34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 211/562] haskell-hamlet: update to version 1.1.7.5

---
 pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index b64668b43660..89513e372ea2 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.7.4";
-  sha256 = "01sgd4p2d4irphgpvr7waag6jn8y329yj9zdjswrqklyygpp98hj";
+  version = "1.1.7.5";
+  sha256 = "1ph92n5l63qr5hpjcvl37j1w857dwwzzgsxn8mdadi2pz35lxm82";
   buildDepends = [
     blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
   ];

From 322a1d40f7fe31b22c85ad2dd5bb8951e3f24741 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 212/562] haskell-hexpat: update to version 0.20.5

---
 pkgs/development/libraries/haskell/hexpat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix
index 03aa9c16ed24..edded9b7698e 100644
--- a/pkgs/development/libraries/haskell/hexpat/default.nix
+++ b/pkgs/development/libraries/haskell/hexpat/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hexpat";
-  version = "0.20.4";
-  sha256 = "09ixvwgrr1046v806d23ngdhc8xqkf0yadzlbwxcy228ka13xwdw";
+  version = "0.20.5";
+  sha256 = "09p8mh2b76ymgfv64zpddywdf34n7b78agri6kjnhls0xsk8260a";
   buildDepends = [ deepseq List text transformers utf8String ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Hexpat/";

From fcb89f41c6b91d30df4c33824f1cfdf84f84e961 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 213/562] haskell-hjsmin: update to version 0.1.4.4

---
 pkgs/development/libraries/haskell/hjsmin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 5980141526b0..008c1766b947 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hjsmin";
-  version = "0.1.4.3";
-  sha256 = "1jhpqfvwvzik41i4mi9fr9w1jlrlc1lj2illlbbwg7r3fwr5hnnl";
+  version = "0.1.4.4";
+  sha256 = "0hzh2xbv9x013s1lhmgapjd0qx8v7n09rjlfxd9b1h5min00k048";
   buildDepends = [ blazeBuilder languageJavascript text ];
   testDepends = [
     blazeBuilder Cabal HUnit languageJavascript QuickCheck

From ee04bc15d022a79df473dbeecf5c097b336956ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 214/562] haskell-hoogle: update to version 4.2.24

---
 .../libraries/haskell/hoogle/default.nix          | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 498e71d06d1e..fb4c33d73374 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -1,14 +1,13 @@
 { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
-, cmdargs, conduit, deepseq, filepath, haskellSrcExts, hspec
-, hspecExpectations, httpTypes, HUnit, parsec, random, safe
-, systemFileio, tagsoup, text, time, transformers, uniplate, wai
-, warp
+, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
+, parsec, random, safe, tagsoup, text, time, transformers, uniplate
+, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.23";
-  sha256 = "1ykjf0w6c3pzsrzdhxs53nxj84aj2px3gpfc8f53dmgqv3wkyii7";
+  version = "4.2.24";
+  sha256 = "01q0pr82wscnrm7flb1sd9fv8sym1pkdfvdmp6qcfwzzvrcsh5h2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -16,9 +15,7 @@ cabal.mkDerivation (self: {
     deepseq filepath haskellSrcExts httpTypes parsec random safe
     tagsoup text time transformers uniplate wai warp
   ];
-  testDepends = [
-    conduit hspec hspecExpectations HUnit systemFileio transformers
-  ];
+  testDepends = [ filepath ];
   meta = {
     homepage = "http://www.haskell.org/hoogle/";
     description = "Haskell API Search";

From 7053a3f96a6d03e16f3efe50dfdacb5ecc9a1c12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 215/562] haskell-hspec-expectations: update to version 0.5.0.1

---
 .../libraries/haskell/hspec-expectations/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
index 789ff5d7b2a4..5a1462657515 100644
--- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-expectations";
-  version = "0.3.3";
-  sha256 = "0sg7wkgr9qmwv0bki1q8wvl5jrlsvn0c7sd2qpqp3cccdhwj9c5k";
+  version = "0.5.0.1";
+  sha256 = "0r1yy94q30gp3wyif7qfa22gn3g2lrszwygsy4wknc396fab7mvj";
   buildDepends = [ HUnit ];
   testDepends = [ hspec HUnit markdownUnlit silently ];
   doCheck = false;

From 6f776d29c5119e4116fd59bec09f0b3ef290d880 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 216/562] haskell-hspec-meta: update to version 1.8.1

---
 pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index d409501d706b..5374ed7cd80a 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.7.2";
-  sha256 = "03ksxx7w61iw3hf055mjb47bjh8srwxpqxs5bxqdqrilfd1cixmj";
+  version = "1.8.1";
+  sha256 = "03582b79cqv3c2z02ni2xyzb3kccgcw0phmg5lklaphkrarm0g3w";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From bb371962ced717ca4adab49a81c8dd46599ac051 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 217/562] haskell-hspec: update to version 1.8.1.1

---
 pkgs/development/libraries/haskell/hspec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 57dab8852fdd..10994799c43d 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.7.2.1";
-  sha256 = "12khyg6ixk2rkbvxjbi210w57cais1s142v337kpcp3dfk6440bk";
+  version = "1.8.1.1";
+  sha256 = "1gpll1pr8zs7ha1nn13rp579av4nnjkz94rq0js6r1awz69cp0rb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 3cb9b9cb3651949fba13a751dcc880b65cd109d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 218/562] haskell-http-conduit: update to version 2.0.0.1

---
 .../haskell/http-conduit/default.nix          | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index f0c559839e05..403fdbe59b79 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -1,31 +1,30 @@
 { cabal, asn1Data, base64Bytestring, blazeBuilder
 , blazeBuilderConduit, caseInsensitive, certificate, conduit
-, cookie, cprngAes, dataDefault, deepseq, failure, filepath, hspec
-, httpTypes, HUnit, liftedBase, mimeTypes, monadControl, mtl
-, network, networkConduit, publicsuffixlist, random, regexCompat
-, resourcet, socks, text, time, tls, tlsExtra, transformers
-, transformersBase, utf8String, void, wai, warp, zlibConduit
+, connection, cookie, cprngAes, dataDefault, deepseq, failure
+, filepath, hspec, httpClient, httpClientConduit
+, httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase
+, mimeTypes, monadControl, mtl, network, networkConduit
+, publicsuffixlist, random, regexCompat, resourcet, socks, text
+, time, tls, tlsExtra, transformers, transformersBase, utf8String
+, void, wai, warp, warpTls, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.9.5.2";
-  sha256 = "0andx8ggcwcd39z10yh5j0rmn7ypypgfzaaibbbh2rhp5v28932b";
+  version = "2.0.0.1";
+  sha256 = "1xkq11yylh4mdx8ml69h17fldmfpxclriw1kl0j44vddqdryn6zd";
   buildDepends = [
-    asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
-    caseInsensitive certificate conduit cookie cprngAes dataDefault
-    deepseq failure filepath httpTypes liftedBase mimeTypes
-    monadControl mtl network publicsuffixlist random regexCompat
-    resourcet socks text time tls tlsExtra transformers
-    transformersBase utf8String void zlibConduit
+    conduit httpClient httpClientConduit httpClientTls httpTypes
+    liftedBase resourcet transformers
   ];
   testDepends = [
     asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
-    caseInsensitive certificate conduit cookie cprngAes dataDefault
-    deepseq failure filepath hspec httpTypes HUnit liftedBase mimeTypes
+    caseInsensitive certificate conduit connection cookie cprngAes
+    dataDefault deepseq failure filepath hspec httpClient
+    httpClientMultipart httpTypes HUnit liftedBase mimeTypes
     monadControl mtl network networkConduit publicsuffixlist random
     regexCompat resourcet socks text time tls tlsExtra transformers
-    transformersBase utf8String void wai warp zlibConduit
+    transformersBase utf8String void wai warp warpTls zlibConduit
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/http-conduit";

From 4675b82d642864895fa9dcbe8a9bd02b799dc114 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 219/562] haskell-http-reverse-proxy: update to version 0.3.0

---
 .../haskell/http-reverse-proxy/default.nix         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index a4f458f83953..f745554e4891 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -1,17 +1,17 @@
 { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit
-, dataDefault, hspec, httpConduit, httpTypes, liftedBase
-, monadControl, network, networkConduit, text, transformers, wai
-, waiLogger, warp, word8
+, dataDefault, hspec, httpClient, httpConduit, httpTypes
+, liftedBase, monadControl, network, networkConduit, resourcet
+, text, transformers, wai, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.2.1.1";
-  sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj";
+  version = "0.3.0";
+  sha256 = "0wwrcm3hhbq9kawk3s12s8ws82vancmc8a5d29f6871jfq3vvzc2";
   buildDepends = [
     basicPrelude blazeBuilder caseInsensitive conduit dataDefault
-    httpConduit httpTypes liftedBase monadControl network
-    networkConduit text wai waiLogger warp word8
+    httpClient httpTypes liftedBase monadControl network networkConduit
+    resourcet text wai waiLogger word8
   ];
   testDepends = [
     blazeBuilder conduit hspec httpConduit httpTypes liftedBase network

From ae925636bd09101f455c2e87761091d1093582de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:20 +0100
Subject: [PATCH 220/562] haskell-http-types: update to version 0.8.3

---
 pkgs/development/libraries/haskell/http-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index c099709e0dae..ed24e1ede749 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.8.2";
-  sha256 = "1536wpmicmq90qvnvcvq1dzk2vfhj7ls6hz4pqp0ll9aksk3msr1";
+  version = "0.8.3";
+  sha256 = "02l1lhl2ajbm5f7zq363nlb21dpdg1m0qsy330arccmds7z9g7a2";
   buildDepends = [ blazeBuilder caseInsensitive text ];
   testDepends = [ blazeBuilder hspec QuickCheck text ];
   meta = {

From 012a7209e58e73a754e4f86927c0280da23530bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:21 +0100
Subject: [PATCH 221/562] haskell-language-ecmascript: update to version 0.15.4

---
 .../libraries/haskell/language-ecmascript/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix
index 458916df9d1b..77165ef104d1 100644
--- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-ecmascript";
-  version = "0.15.3";
-  sha256 = "0ircm20nf321awl0gvy0vh3jplfwpd700br67f0i97rifxx2v40c";
+  version = "0.15.4";
+  sha256 = "1drivy75lvrwjx7irdbnnqp7y6mbzbm2pbxy7zzc1nfln6g3k9x7";
   buildDepends = [
     dataDefaultClass Diff mtl parsec QuickCheck uniplate wlPprint
   ];

From 3c5e50828aaa32a82576ce149a1e79549dfd9339 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:21 +0100
Subject: [PATCH 222/562] haskell-lens: update to version 3.10.0.1

---
 pkgs/development/libraries/haskell/lens/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 60aa29ac089a..fff7f1cc5830 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "3.10";
-  sha256 = "086kbd59zlx3ldrxilssxd0gr9izwhcfhg5k6bqzm6gwvysrzq3y";
+  version = "3.10.0.1";
+  sha256 = "0ar19ls0w1x1cnl6aj5qvrlyhfk51v8czahq4k861666rzglqd28";
   buildDepends = [
     bifunctors comonad contravariant distributive filepath
     genericDeriving hashable MonadCatchIOTransformers mtl parallel

From 832a6b45d6980f5f0680720c1f868dd510fe0bcc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:21 +0100
Subject: [PATCH 223/562] haskell-linear: update to version 1.3.1.1

---
 pkgs/development/libraries/haskell/linear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
index feeeaed3be54..99f5de71b619 100644
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ b/pkgs/development/libraries/haskell/linear/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "linear";
-  version = "1.3.1";
-  sha256 = "1s07qbdi12rc4djk4s0ds5sh79qcqfmgrbwfj1ygskq3ra88qqsa";
+  version = "1.3.1.1";
+  sha256 = "174pqqc2gx8aigm51hfg7di35qbx65sgcqv6y1p25c2853g9h97y";
   buildDepends = [
     binary distributive hashable reflection semigroupoids semigroups
     tagged transformers unorderedContainers vector

From 012480b9f4597f80ef1d63f36127ab227d21abf6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:22 +0100
Subject: [PATCH 224/562] haskell-monad-logger: update to version 0.3.3.1

---
 pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index 0b92ca0bb903..83cd57ce39b7 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.2.0";
-  sha256 = "0pgjayx6h1zqadqrzaf36070kir7qlinha9h4bf532lfx5yc1yxg";
+  version = "0.3.3.1";
+  sha256 = "1amihx9jl42w7sm01ihnldvgv9cilg89im7gr9l0x2f6q4nbhbl2";
   buildDepends = [
     conduit fastLogger liftedBase monadControl monadLoops mtl resourcet
     stm stmChans text transformers transformersBase

From 3df57554b5fc4fcdb26050b8562da60ab25916b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:22 +0100
Subject: [PATCH 225/562] haskell-pandoc: update to version 1.12.2.1

---
 pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index b5ccc95bd3fd..01ce4cc5bfb8 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.12.1";
-  sha256 = "0csyrcfdqv2mc7ngn63lan3c1dd6zy0pb24k0z1lsraqlmmw76nf";
+  version = "1.12.2.1";
+  sha256 = "1xyvhfsz0cy5f7cwpz4kl0l87vylb8860c06wvk49z9fh2xkg6lf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 01a828cbf99608b25396aa1a1f2e9dae69da56f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:22 +0100
Subject: [PATCH 226/562] haskell-quickcheck-instances: update to version 0.3.4

---
 .../libraries/haskell/quickcheck-instances/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
index 647e08718a8c..0b29a55ce5fa 100644
--- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
+++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "quickcheck-instances";
-  version = "0.3.3";
-  sha256 = "0l5rck5sh3cplqqkkasm00phy962y3wa9l8a44843grp3flnpv72";
+  version = "0.3.4";
+  sha256 = "10kkjqn530cd4bz5jfnvfvpswk25glyjnmy21qj253db6ja8xns1";
   buildDepends = [ QuickCheck text time ];
   meta = {
     homepage = "https://github.com/aslatter/qc-instances";

From 7cc0bad3a45a556f13dd06468f8a8e30102a0032 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:22 +0100
Subject: [PATCH 227/562] haskell-reducers: update to version 3.10.1.1

---
 pkgs/development/libraries/haskell/reducers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
index ea1049d2b40a..bc1bf72beea1 100644
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ b/pkgs/development/libraries/haskell/reducers/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reducers";
-  version = "3.10.1";
-  sha256 = "0pgywdgq0rqir95n4z3nzmyx5n54a1df9abyanz4qfv0g080fjkz";
+  version = "3.10.1.1";
+  sha256 = "1d4zhcqy499pm0wxn76gyw0brbrdycmajblqy4mi49kiy0zlg8a7";
   buildDepends = [
     comonad fingertree hashable keys pointed semigroupoids semigroups
     text transformers unorderedContainers

From 42f3190cf8614afa8cb8ac757804d992e05fe2b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:22 +0100
Subject: [PATCH 228/562] haskell-scotty: update to version 0.6.0

---
 pkgs/development/libraries/haskell/scotty/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index ad932df1ac79..3f50ed381523 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -5,14 +5,14 @@
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.5.0";
-  sha256 = "177c7nyjwksm2y98j2swgzfn1rmr2h0v4fk6s525kx803iibvfhc";
+  version = "0.6.0";
+  sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy";
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
     mtl regexCompat resourcet text transformers wai waiExtra warp
   ];
   meta = {
-    homepage = "https://github.com/ku-fpg/scotty";
+    homepage = "https://github.com/scotty-web/scotty";
     description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 8a347b892bb748d6d2052412300adef27f7bd6ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:22 +0100
Subject: [PATCH 229/562] haskell-semigroups: update to version 0.12.1

---
 pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index f1bc7259b799..a0e79c459d9e 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.12";
-  sha256 = "0wk8hxak4dl8nbdif4f8z9gvr5bqm95inrvrcrb6ryaxichrn432";
+  version = "0.12.1";
+  sha256 = "0jxgd487d99cc721wyaxvazphlv567hbb57vdfjn4hq9ly4w464q";
   buildDepends = [ hashable nats text unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";

From f664af533756b5293e2f6defd3f162565fe885f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:22 +0100
Subject: [PATCH 230/562] haskell-shakespeare-css: update to version 1.0.6.5

---
 .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 03b6b057cd1e..7dedf465f655 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.6.4";
-  sha256 = "12f2b69grxpwk56b2d7idlg8axqfgzn0rn3m56r1hcpvkjbynlc4";
+  version = "1.0.6.5";
+  sha256 = "1jmi5rh4a9x7md90sgzk6pmn0pn4h9mn44z8z0haq3fzflravqdk";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {

From d7588eae7925e49a30ee920021aaac9ae4a90972 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:22 +0100
Subject: [PATCH 231/562] haskell-shakespeare-i18n: update to version 1.0.0.5

---
 .../libraries/haskell/shakespeare-i18n/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index b7710d7c3d54..5d7cb8c4abe6 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-i18n";
-  version = "1.0.0.4";
-  sha256 = "1ia73rq9kva2v4vxcyc2nzbvvkrbwrx48gjhnljx39szx1klyk3l";
+  version = "1.0.0.5";
+  sha256 = "0f6i9pxr1lmqwcarb48swhrgab8hpkr46cv16psmbq67dr6h1dgf";
   buildDepends = [ parsec shakespeare text ];
   testDepends = [ hspec text ];
   meta = {

From d20feb0efc1e0dde7cfc1c7b471d63673c0f3028 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 232/562] haskell-shakespeare-text: update to version 1.0.0.10

---
 .../libraries/haskell/shakespeare-text/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index ec60c0375b0c..feadafeb29f2 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.0.9";
-  sha256 = "1rh1dwmc7xam76isa6cwc25rcricakc7ay54hz01fpiy059imx52";
+  version = "1.0.0.10";
+  sha256 = "0az3l70syb7ch5fb4i0nlibgh7wcrzqnqmlp1w5h68s796g5rjlb";
   buildDepends = [ shakespeare text ];
   testDepends = [ hspec HUnit text ];
   meta = {

From de2c3ff933ef2afa2de916890db301c52352d568 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 233/562] haskell-shakespeare: update to version 1.2.0.3

---
 pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 8b5de8ec76b7..f3891e554dd2 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.2.0.2";
-  sha256 = "1vp7zskxrjxcznj1d0nx9iqkfvwa9xwpbxq46z054bizqfkri96c";
+  version = "1.2.0.3";
+  sha256 = "1mhycaw8qa4j7q5jing3hbx5vwwa0h4iv41fsx6xibz3y7lpqgmz";
   buildDepends = [ parsec systemFileio systemFilepath text time ];
   testDepends = [
     hspec parsec systemFileio systemFilepath text time

From 6ff4ebca323d7b15a2ac97f87c5b7123e500b5ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 234/562] haskell-smallcheck: update to version 1.1.0.1

---
 pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index df2517a01ace..ef8f0e5e5ba4 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smallcheck";
-  version = "1.1";
-  sha256 = "167dhi0j4mfmf9idjcfx0x1y1jajx4qmgcpiia93vjpmv8ha56j8";
+  version = "1.1.0.1";
+  sha256 = "02yv4pa6hilxl7fwskayd5nzs4hq46k91wh04sqj4yfk2s3pgb0m";
   buildDepends = [ logict mtl ];
   meta = {
     homepage = "https://github.com/feuerbach/smallcheck";

From 8cdd84fac24ecb6e1c721429288e170d0039d9c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 235/562] haskell-snap: update to version 0.13.1.2

---
 pkgs/development/libraries/haskell/snap/snap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 63103471ac2a..3f4751113be5 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.13.1.1";
-  sha256 = "0nak84xwrfvdcb2ngq71qy8h0h1ih3wifnkgwxabhjbrqmd7ma0x";
+  version = "0.13.1.2";
+  sha256 = "19s7v9wc988yxynwqdhrhncz8vn9ic6d95gwfi1m0gpxxk5qlzzz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From b1c6aabdb16fa26b1f2ece03bddaa1d9df310cde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 236/562] haskell-tasty-ant-xml: update to version 1.0.0.2

---
 .../development/libraries/haskell/tasty-ant-xml/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
index baabf323723c..3d68e8232755 100644
--- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
@@ -4,14 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-ant-xml";
-  version = "1.0.0.1";
-  sha256 = "1yn337dr9clzrkr8kpvm7x07lyb3v8pcijrddqah08k0ds8zpzcj";
+  version = "1.0.0.2";
+  sha256 = "1c13gmqsp33cfqim7aqqjypabkx42rmmhmjj8fpcr0ainpmvwkwi";
   buildDepends = [
     genericDeriving mtl reducers stm tagged tasty transformers xml
   ];
   meta = {
     homepage = "http://github.com/ocharles/tasty-ant-xml";
-    description = "A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework.";
+    description = "Render tasty output to XML for Jenkins";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];

From 5fb617876d605c91f586b429752eef840eb71a3f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 237/562] haskell-tasty: update to version 0.4.2

---
 pkgs/development/libraries/haskell/tasty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index c2c05a68f075..9ad53093c68b 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.4.1.1";
-  sha256 = "09xha87ivkllczbf0vf2n8zjn1wa5g8v8j1h9ad3207r45ndzn0w";
+  version = "0.4.2";
+  sha256 = "06348zdagaxk0axdmfj38r2h6pcacr0kqwx6hz6f499xdj8g74g9";
   buildDepends = [
     ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
   ];

From 710790a7042968ba5b1374cb73bf3cd2cc21f2be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 238/562] haskell-vector-algorithms: update to version 0.6.0.1

---
 .../libraries/haskell/vector-algorithms/default.nix   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
index dc8c9dd35bae..74b098a3a7f1 100644
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -1,10 +1,13 @@
-{ cabal, primitive, vector }:
+{ cabal, mtl, mwcRandom, primitive, QuickCheck, vector }:
 
 cabal.mkDerivation (self: {
   pname = "vector-algorithms";
-  version = "0.5.4.2";
-  sha256 = "08pb6mkghf9h5011vxrfdrfq6g26jk4gxmjh9s3hpdiwybf3ab64";
-  buildDepends = [ primitive vector ];
+  version = "0.6.0.1";
+  sha256 = "0dkiz0c5dmc3a15zz5pxv4rz4n0bw5irb5a148gccfrg5c80vzc5";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl mwcRandom primitive vector ];
+  testDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://code.haskell.org/~dolio/";
     description = "Efficient algorithms for vector arrays";

From ca19f496b85aaf58dc40e2f375b5c18a7f5d0e6b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 239/562] haskell-wai-app-static: update to version 2.0.0

---
 pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index d88eb2df0bc9..3bcf63e17963 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "1.3.3";
-  sha256 = "0lsqfvlh65rggp9z6m5gyx8gv0wk3b44jrk57s8yj2bh74pbr64f";
+  version = "2.0.0";
+  sha256 = "0zbjwghkg4xsjfxq74s6c041mvkj168r8nhh946yz6n660bkisai";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
     cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate

From 40a309e038d39cca527548e9f8a20c5afef59170 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 240/562] haskell-wai-extra: update to version 2.0.0.1

---
 .../libraries/haskell/wai-extra/default.nix    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 7e3424713e0d..d3b835879650 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -1,23 +1,23 @@
 { cabal, ansiTerminal, base64Bytestring, blazeBuilder
 , blazeBuilderConduit, caseInsensitive, conduit, dataDefault
-, dateCache, fastLogger, hspec, httpTypes, HUnit, liftedBase
-, network, resourcet, stringsearch, text, time, transformers, void
-, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit
+, fastLogger, hspec, httpTypes, HUnit, liftedBase, network
+, resourcet, stringsearch, text, time, transformers, void, wai
+, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.3.4.6";
-  sha256 = "09rk9i2fkk4haiq1c6rhcp1p72zw34j9cxsmqnm4jzh6fdsrkq2k";
+  version = "2.0.0.1";
+  sha256 = "16m6scz36yzvyhz098lv6ppxdyk6kmavzyzb42iq0bpyk9m0x2qx";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
-    caseInsensitive conduit dataDefault dateCache fastLogger httpTypes
-    liftedBase network resourcet stringsearch text time transformers
-    void wai waiLogger word8 zlibConduit
+    caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
+    network resourcet stringsearch text time transformers void wai
+    waiLogger word8 zlibConduit
   ];
   testDepends = [
     blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit
-    text transformers wai waiTest zlib zlibBindings
+    resourcet text transformers wai waiTest zlib zlibBindings
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";

From 350a1e1c968061b3760008c47e5e2392c621c0fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 241/562] haskell-wai-handler-launch: update to version 2.0.0

---
 .../libraries/haskell/wai-handler-launch/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
index c4d22a66e006..3ba78e162519 100644
--- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
+++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-handler-launch";
-  version = "1.3.1.5";
-  sha256 = "1iz36j7lzl5c9b2hacxv4v5gfzkfvgj7hlb5xz4r14ca4w5fzzfj";
+  version = "2.0.0";
+  sha256 = "1z03c3hjkh4k6j5dsp4973f05rk2cgl7gazac4vdq4imwfzxj3lg";
   buildDepends = [
     blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai
     warp zlibConduit

From eb16c02c56b878376f4620286f4eb57a2bf3f210 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:23 +0100
Subject: [PATCH 242/562] haskell-wai-logger: update to version 2.0.1

---
 .../libraries/haskell/wai-logger/default.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
index fc958c2576b9..98b0cdee39c4 100644
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -1,14 +1,14 @@
-{ cabal, blazeBuilder, byteorder, caseInsensitive, dateCache
-, doctest, fastLogger, httpTypes, network, wai, waiTest
+{ cabal, blazeBuilder, byteorder, caseInsensitive, doctest
+, fastLogger, httpTypes, network, unixTime, wai, waiTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-logger";
-  version = "0.3.2";
-  sha256 = "0las9jb8cxdsyh1mnrhx48yfbjw5f2x4hhmivhmhzb6qgxnbvma9";
+  version = "2.0.1";
+  sha256 = "1v8n7m314a12421gn10i8vz3nk9sak635dq4nq389sij8w1ihjkw";
   buildDepends = [
-    blazeBuilder byteorder caseInsensitive dateCache fastLogger
-    httpTypes network wai
+    blazeBuilder byteorder caseInsensitive fastLogger httpTypes network
+    unixTime wai
   ];
   testDepends = [ doctest waiTest ];
   meta = {

From 059978b4742aedce62be389372101e381630cecb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 243/562] haskell-wai-test: update to version 2.0.0.1

---
 pkgs/development/libraries/haskell/wai-test/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index bbc1ed1d1366..9cae0a85d6c9 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "1.3.1.1";
-  sha256 = "0daaq8kn1c35y26y7pb00sw1jyhp84zpzk6vfy1p4vfay4ppknd2";
+  version = "2.0.0.1";
+  sha256 = "1lk7i9kiawsn56f8w2nidmas6g94yq7diaprvkd7c52hjki5mla7";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
     httpTypes HUnit network text transformers wai

From ad818c12a695ce61103b0cf660d2654f3fb50dfd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 244/562] haskell-wai: update to version 2.0.0

---
 pkgs/development/libraries/haskell/wai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index 0fff9096cb07..4273e408a7f7 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "1.4.1";
-  sha256 = "1m8z1jc4fvq8rw9vk1x5sy73dbmiifa41973x84i51vsibyaqhgb";
+  version = "2.0.0";
+  sha256 = "11s60v9pw8jl9w950z81gkxci7djrdibi8hxrw6j1v8az40qqiwk";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];

From d6377fa89563810a7c609f7dffc4b4e351b759e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 245/562] haskell-warp-tls: update to version 2.0.0

---
 pkgs/development/libraries/haskell/warp-tls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
index 5b1456c0c48c..b99c5214120b 100644
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "1.4.2";
-  sha256 = "05mbf73859n2ns3bdnw24i7vygr4kysyxfq0xdkmmrd47fh3k9r6";
+  version = "2.0.0";
+  sha256 = "1dfwid6h7yl4v66as166ppbivzafh5wkkrbsvaaar6l3xd9kg211";
   buildDepends = [
     certificate conduit cprngAes cryptocipher cryptoRandomApi network
     networkConduit pem tls tlsExtra transformers wai warp

From 27bdaa32690b828e5c86755e2baed986596b516a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 246/562] haskell-warp: update to version 2.0.0.1

---
 .../libraries/haskell/warp/default.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 100dbbd7024e..15dd0ec15ec1 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,23 +1,23 @@
 { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, hashable, hspec, HTTP, httpAttoparsec, httpTypes, HUnit
-, liftedBase, network, networkConduit, QuickCheck, simpleSendfile
-, transformers, unixCompat, void, wai
+, conduit, doctest, hashable, hspec, HTTP, httpAttoparsec, httpDate
+, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck
+, simpleSendfile, time, transformers, unixCompat, void, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.10.1";
-  sha256 = "1pi2x0gi4r6qy151a9gmfq223yiy53j7prj2pyn00cprr0m4mk2v";
+  version = "2.0.0.1";
+  sha256 = "12n1r1qahngfhrqhlbfjl11rmy5la9mpd0h4ai0lzdxkakb89pxl";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    httpAttoparsec httpTypes liftedBase network networkConduit
+    httpAttoparsec httpDate httpTypes liftedBase network networkConduit
     simpleSendfile transformers unixCompat void wai
   ];
   testDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
-    hspec HTTP httpAttoparsec httpTypes HUnit liftedBase network
-    networkConduit QuickCheck simpleSendfile transformers unixCompat
-    void wai
+    blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest
+    hashable hspec HTTP httpAttoparsec httpDate httpTypes HUnit
+    liftedBase network networkConduit QuickCheck simpleSendfile time
+    transformers unixCompat void wai
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";

From 8d8db388d91c49ebc8534c4dfdc2d61771a5efb6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 247/562] haskell-wl-pprint-extras: update to version 3.5

---
 .../libraries/haskell/wl-pprint-extras/default.nix       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
index 77670b4f117e..dd32750ffe91 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix
@@ -1,10 +1,13 @@
-{ cabal, nats, semigroupoids, semigroups, text, utf8String }:
+{ cabal, HUnit, nats, semigroupoids, semigroups, testFramework
+, testFrameworkHunit, text, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "wl-pprint-extras";
-  version = "3.4";
-  sha256 = "17vxyckx2pj4sc2d1yw1rcsxn1rp4nzdjp0hgpy78xsp9plccgsy";
+  version = "3.5";
+  sha256 = "172xp23j3w8jbd7h0sna9g8p4d6xwy8154gqj93ycz2907r2kwb7";
   buildDepends = [ nats semigroupoids semigroups text utf8String ];
+  testDepends = [ HUnit testFramework testFrameworkHunit ];
   meta = {
     homepage = "http://github.com/ekmett/wl-pprint-extras/";
     description = "A free monad based on the Wadler/Leijen pretty printer";

From 73a20b0473f7aff5132a189e6220fe38840c9470 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 248/562] haskell-wl-pprint-terminfo: update to version 3.7

---
 .../libraries/haskell/wl-pprint-terminfo/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
index d2bd35eebd41..989d56afd7dc 100644
--- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
+++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wl-pprint-terminfo";
-  version = "3.6";
-  sha256 = "14dq0inv6i8pwjzrpys420iwi6002mard1n73z96k89zq5xhwlbg";
+  version = "3.7";
+  sha256 = "01lzk8wfynb98ks8a0gvj8qffi50zlfaywlc9axr6j7h8rrblnm3";
   buildDepends = [
     nats semigroups terminfo text transformers wlPprintExtras
   ];

From a18328c0b6107af70f997e5e1157b57406efdbb5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 249/562] haskell-xdot: update to version 0.2.4.1

---
 pkgs/development/libraries/haskell/xdot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
index f7a2b731d037..7119705b357e 100644
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ b/pkgs/development/libraries/haskell/xdot/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xdot";
-  version = "0.2.4";
-  sha256 = "0723drp9zs3hrayld99j4fniyvm65fz19hkk4001vpvgjw27dfja";
+  version = "0.2.4.1";
+  sha256 = "1k1ci9lq8l9bx8ks7rdng9jjj6d7hcwgmfbz757al85m1q17xa64";
   buildDepends = [ cairo graphviz gtk mtl polyparse text ];
   meta = {
     description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";

From 4923a984a57088451ab46a29ea056cf8f062b3c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 250/562] haskell-xml-conduit: update to version 1.1.0.9

---
 pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 3f97a028729e..28a5beb966f8 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.1.0.8";
-  sha256 = "06if4mbrbcsjhk7hj3616fhgfh0rlsj95jblsbxq2drb4bn56r39";
+  version = "1.1.0.9";
+  sha256 = "01sx8yblknv0dyi7z6k6icfvwjvl4dyhrka1d6y1793xcp1mkxs6";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     blazeHtml blazeMarkup conduit dataDefault deepseq failure

From 3517ae882948351a6883030a10855797ece06873 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 251/562] haskell-xml-hamlet: update to version 0.4.0.6

---
 pkgs/development/libraries/haskell/xml-hamlet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
index e2719984708a..885620f0648a 100644
--- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-hamlet";
-  version = "0.4.0.5";
-  sha256 = "1w1ixjdbpbny332j24d5yjxc4i7cg83jc4yjdm6yl94y1sr90yc5";
+  version = "0.4.0.6";
+  sha256 = "05izdqpxw0gq2wgs4ckr55xvzfk5ay7xpbcvihj66myiah5azqwy";
   buildDepends = [ parsec shakespeare text xmlConduit ];
   testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ];
   meta = {

From c333429da943e049d882d4bf4a1057a30b6bf3cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:24 +0100
Subject: [PATCH 252/562] haskell-yesod-auth: update to version 1.2.4

---
 pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index bdc299939196..87cbe9f3d438 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.2.3";
-  sha256 = "1hnppb36acr18prra702r9hdbs803zfvaj8krq4idlvwb6g7l0d8";
+  version = "1.2.4";
+  sha256 = "1bpcz8ihjqdhyxxm4ib4yhgj5h491lxv34mpc3x55wl2daq731qi";
   buildDepends = [
     aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
     fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network

From c2f98216f8a80bdf989f8b00299b3dbd78ea1cef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:25 +0100
Subject: [PATCH 253/562] haskell-yesod-bin: update to version 1.2.5.1

---
 .../libraries/haskell/yesod-bin/default.nix   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index c93c76ee3fab..dbee52da8680 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -1,5 +1,5 @@
 { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit
-, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit
+, dataDefault, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit
 , httpReverseProxy, httpTypes, liftedBase, network, networkConduit
 , optparseApplicative, parsec, projectTemplate, resourcet
 , shakespeare, shakespeareCss, shakespeareJs, shakespeareText
@@ -10,17 +10,18 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.4.1";
-  sha256 = "18wzxalgiffdjz6x5vxmhksscy5531plgyjkv705kf5vaw6v6rlr";
+  version = "1.2.5.1";
+  sha256 = "1ybj89yvwrsw82jj92rf741jx8na8gp3z4ighyrpavfqhhl6576f";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    attoparsec base64Bytestring blazeBuilder Cabal conduit fileEmbed
-    filepath fsnotify ghcPaths httpConduit httpReverseProxy httpTypes
-    liftedBase network networkConduit optparseApplicative parsec
-    projectTemplate resourcet shakespeare shakespeareCss shakespeareJs
-    shakespeareText split systemFileio systemFilepath tar text time
-    transformers unixCompat unorderedContainers wai warp yaml zlib
+    attoparsec base64Bytestring blazeBuilder Cabal conduit dataDefault
+    fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy
+    httpTypes liftedBase network networkConduit optparseApplicative
+    parsec projectTemplate resourcet shakespeare shakespeareCss
+    shakespeareJs shakespeareText split systemFileio systemFilepath tar
+    text time transformers unixCompat unorderedContainers wai warp yaml
+    zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From c1f1d00bce88843c884950c95852f129c5bfa4a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:25 +0100
Subject: [PATCH 254/562] haskell-yesod-core: update to version 1.2.6.1

---
 .../libraries/haskell/yesod-core/default.nix          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 789d158fa6c5..86b2eec8945c 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -4,21 +4,22 @@
 , httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec
 , pathPieces, QuickCheck, random, resourcet, safe, shakespeare
 , shakespeareCss, shakespeareI18n, shakespeareJs, text, time
-, transformers, transformersBase, vector, wai, waiExtra, waiTest
-, warp, yesodRoutes
+, transformers, transformersBase, unixCompat, vector, wai, waiExtra
+, waiLogger, waiTest, warp, yesodRoutes
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.5";
-  sha256 = "0ia5j6vnxy32y6776wlsfcv9d6s7slqpmkhxw3pipcqd5sjn4kf9";
+  version = "1.2.6.1";
+  sha256 = "12w8lxkxdwf2pfanz33grciyh4ijn6nzrz4lm478w20y9frmf1nm";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault
     failure fastLogger hamlet httpTypes liftedBase monadControl
     monadLogger parsec pathPieces random resourcet safe shakespeare
     shakespeareCss shakespeareI18n shakespeareJs text time transformers
-    transformersBase vector wai waiExtra warp yesodRoutes
+    transformersBase unixCompat vector wai waiExtra waiLogger warp
+    yesodRoutes
   ];
   testDepends = [
     blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase

From 7a7b9e515b09505f19e4eccdfaee65f0b4ed3cc8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:25 +0100
Subject: [PATCH 255/562] haskell-yesod-persistent: update to version 1.2.2

---
 .../libraries/haskell/yesod-persistent/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
index 2c6b6f96fbc5..a3740629150a 100644
--- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-persistent";
-  version = "1.2.1";
-  sha256 = "06kzxdbg3xw128zlacsf51qi7qnccw0gjnwscxshljgipiicfhfc";
+  version = "1.2.2";
+  sha256 = "0pi7r6mf8ikd76cwdpjzb1lf73jc3f0ji3xximmg25q8lwcjygq5";
   buildDepends = [
     blazeBuilder conduit liftedBase persistent persistentTemplate
     poolConduit resourcet transformers yesodCore

From 91e2d2bf9b6362a0e9e8afaaec6aa4d50dcc8daa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:25 +0100
Subject: [PATCH 256/562] haskell-yesod-routes: update to version 1.2.0.2

---
 pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index 4cbb865c9069..d651e90a8a7f 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-routes";
-  version = "1.2.0.1";
-  sha256 = "0pp7g3ccd0swh1j62am1vg9r2gh65jcci5w2n4r42sqzfnql0i8z";
+  version = "1.2.0.2";
+  sha256 = "0mjffsz9rk401a86l10vcjfhvfd8jknzml86jb5kpk6ssvnah0n7";
   buildDepends = [ pathPieces text vector ];
   testDepends = [ hspec HUnit pathPieces text ];
   meta = {

From 48958dac0611b3bb5e68878e2be6afe40e9470a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:25 +0100
Subject: [PATCH 257/562] haskell-yesod-static: update to version 1.2.2

---
 pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index c1f3c4ea8734..c29cbe759749 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.2.1.1";
-  sha256 = "009p6hq6hwmvji40yqv97v1sfwdfh44pasp68cxw05czhcwwcacv";
+  version = "1.2.2";
+  sha256 = "06abyfmqzv6aap0ww7vkw4j6xv6dkivn0g7wx59j2l54dfqrjifr";
   buildDepends = [
     base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi
     dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes

From 5e5855d95ca2d0c104d7903344d0d53ce3a378db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:25 +0100
Subject: [PATCH 258/562] haskell-yesod: update to version 1.2.4

---
 pkgs/development/libraries/haskell/yesod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 9f416ad27f93..b4e935428b2a 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.3";
-  sha256 = "0y1jwz7azk078kf14hsylgpwljdmrainhwflgxwyf0gcc5l7jhz3";
+  version = "1.2.4";
+  sha256 = "0c8z4hsplfjb2ilrk0qbyighjipwcfhf55xqaw4zqvq752yj4n7c";
   buildDepends = [
     aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
     networkConduit safe shakespeareCss shakespeareJs text transformers

From a47b25da5b4e1fab275a34f6c097bc66da47072f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 13:03:25 +0100
Subject: [PATCH 259/562] haskell-keter: update to version 1.1.0.1

---
 .../tools/haskell/keter/default.nix           | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix
index c3f242bc434a..53e2c5a74194 100644
--- a/pkgs/development/tools/haskell/keter/default.nix
+++ b/pkgs/development/tools/haskell/keter/default.nix
@@ -1,25 +1,27 @@
 { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
-, conduit, dataDefault, filepath, fsnotify, httpConduit
-, httpReverseProxy, httpTypes, liftedBase, mtl, network
-, networkConduit, networkConduitTls, random, regexTdfa, stm
-, systemFileio, systemFilepath, tar, text, time, transformers
-, unixCompat, unixProcessConduit, unorderedContainers, vector, wai
-, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib
+, conduit, dataDefault, filepath, fsnotify, httpClient
+, httpClientConduit, httpConduit, httpReverseProxy, httpTypes
+, liftedBase, mtl, network, networkConduit, networkConduitTls
+, random, regexTdfa, stm, systemFileio, systemFilepath, tar, text
+, time, transformers, unixCompat, unixProcessConduit
+, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp
+, warpTls, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "1.0.1.2";
-  sha256 = "1rk0sf6riyb6r1sz0jkvwwj1yyxwjxgafpidp9rqwm8wnqyx6hh8";
+  version = "1.1.0.1";
+  sha256 = "04hvwfs1dskaxl1fw29lf52389hy1yr3hwd05bl294zgfh995i0s";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson async attoparsec blazeBuilder caseInsensitive conduit
-    dataDefault filepath fsnotify httpConduit httpReverseProxy
-    httpTypes liftedBase mtl network networkConduit networkConduitTls
-    random regexTdfa stm systemFileio systemFilepath tar text time
-    transformers unixCompat unixProcessConduit unorderedContainers
-    vector wai waiAppStatic waiExtra warp warpTls yaml zlib
+    dataDefault filepath fsnotify httpClient httpClientConduit
+    httpConduit httpReverseProxy httpTypes liftedBase mtl network
+    networkConduit networkConduitTls random regexTdfa stm systemFileio
+    systemFilepath tar text time transformers unixCompat
+    unixProcessConduit unorderedContainers vector wai waiAppStatic
+    waiExtra warp warpTls yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From fbdbe45393966eb4babd5ff305fce134b807149b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 14:23:56 +0100
Subject: [PATCH 260/562] haskell-pretty-show: the build requires happy version
 1.19.x.

---
 pkgs/top-level/haskell-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f34386fa180b..f77199bd8afd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1771,7 +1771,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
-  prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
+  prettyShow = callPackage ../development/libraries/haskell/pretty-show {
+    happy = self.happy_1_19_2;
+  };
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 

From 9fcd7a8994206536ca0e48a9a2fb64df2bdf7ecf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 19:37:17 +0100
Subject: [PATCH 261/562] haskell-warp: disable test suite to fix the build

See issue <https://github.com/yesodweb/wai/issues/205>.
---
 pkgs/development/libraries/haskell/warp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 15dd0ec15ec1..0b6d3403c46f 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
     liftedBase network networkConduit QuickCheck simpleSendfile time
     transformers unixCompat void wai
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/yesodweb/wai";
     description = "A fast, light-weight web server for WAI applications";

From b2770afe611a0430872a25f014dd564aea7e9dc7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Dec 2013 23:01:48 +0100
Subject: [PATCH 262/562] haskell-cmdargs: work around broken tarball on
 Hackage

---
 pkgs/development/libraries/haskell/cmdargs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index ba8793ebb45c..1bd39a387bba 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];
+  patchPhase = "touch cmdargs.cabal";
   meta = {
     homepage = "http://community.haskell.org/~ndm/cmdargs/";
     description = "Command line argument processing";

From d0ebac24e9a668c20f04466bc56de095496fc602 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 01:10:40 +0100
Subject: [PATCH 263/562] Update Haddock to version 2.13.2.1 (in ghc-head
 environment).

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f77199bd8afd..1b6d333705b2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     zlib         = self.zlib_0_5_4_1;
     cabalInstall = self.cabalInstall_1_18_0_2;
     alex         = self.alex_3_1_3;
-    haddock      = self.haddock_2_13_2;
+    haddock      = self.haddock_2_13_2_1;
     happy        = self.happy_1_19_2;
     primitive    = self.primitive_0_5_1_0;      # semi-official, but specified
   };

From e810997859191f9643a01affe9dae1c19f718743 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 10:40:15 +0100
Subject: [PATCH 264/562] haskell-http-client: disable test suite to fix the
 build

See issue <https://github.com/snoyberg/http-client/issues/11>.
---
 pkgs/development/libraries/haskell/http-client/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index fd40ca88e1dc..3658bc6bf8d1 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     failure hspec httpTypes monadControl network text time transformers
     zlib zlibBindings
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/snoyberg/http-client";
     description = "An HTTP client engine, intended as a base layer for more user-friendly packages";

From 9a7c392af3cd690df8546859f1767fe0e8b7687e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 10:47:53 +0100
Subject: [PATCH 265/562] haskell-http-client-tls: disable test suite to fix
 the build

See issue <https://github.com/snoyberg/http-client/issues/11>.
---
 pkgs/development/libraries/haskell/http-client-tls/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
index 5056a94c5d94..f92ddcd7d551 100644
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0";
   buildDepends = [ connection dataDefault httpClient network tls ];
   testDepends = [ hspec httpClient httpTypes ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/snoyberg/http-client";
     description = "http-client backend using the connection package and tls library";

From d231aca644ec56bea8f1a45f0d7e6b3f45521bcc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:02:59 +0100
Subject: [PATCH 266/562] haskell-parsec: update to version 3.1.4

---
 .../libraries/haskell/parsec/3.1.4.nix            | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/parsec/3.1.4.nix

diff --git a/pkgs/development/libraries/haskell/parsec/3.1.4.nix b/pkgs/development/libraries/haskell/parsec/3.1.4.nix
new file mode 100644
index 000000000000..82032dda61c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parsec/3.1.4.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl, text }:
+
+cabal.mkDerivation (self: {
+  pname = "parsec";
+  version = "3.1.4";
+  sha256 = "0milmi4q5jdcmmwjqa4lcs1vcw5frkrlrxc8q17lkas3p2m10kh5";
+  buildDepends = [ mtl text ];
+  meta = {
+    homepage = "http://www.cs.uu.nl/~daan/parsec.html";
+    description = "Monadic parser combinators";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1b6d333705b2..2e8e5c741ba9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -158,7 +158,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     OpenGL       = self.OpenGL_2_9_1_0;
     OpenGLRaw    = self.OpenGLRaw_1_4_0_0;
     parallel     = self.parallel_3_2_0_4;
-    parsec       = self.parsec_3_1_3;
+    parsec       = self.parsec_3_1_4;
     QuickCheck   = self.QuickCheck_2_6;
     random       = self.random_1_0_1_1;
     regexBase    = self.regexBase_0_93_2;
@@ -1701,8 +1701,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   parsec_3_1_1   = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {};
   parsec_3_1_2   = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {};
   parsec_3_1_3   = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {};
+  parsec_3_1_4   = callPackage ../development/libraries/haskell/parsec/3.1.4.nix {};
   parsec2 = self.parsec_2_1_0_1;
-  parsec3 = self.parsec_3_1_3;
+  parsec3 = self.parsec_3_1_4;
   parsec  = self.parsec3;
 
   parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {};

From e9848e3b792cedbe8cebb26b05f565252dce3c25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:03:13 +0100
Subject: [PATCH 267/562] haskell-cmdargs: update to version 0.10.7

---
 pkgs/development/libraries/haskell/cmdargs/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 1bd39a387bba..7678849930e4 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -2,12 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
-  version = "0.10.6";
-  sha256 = "1ckzznza8nqidwq7vd6jlxkjgb7xd4rvqi7gm8ca9laj0cvwkclw";
+  version = "0.10.7";
+  sha256 = "0mhsj27vynilpmwxgdpb3r383rksrqs9ix15zl2xbhc95a815pfl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];
-  patchPhase = "touch cmdargs.cabal";
   meta = {
     homepage = "http://community.haskell.org/~ndm/cmdargs/";
     description = "Command line argument processing";

From 00b20b6caf51b9f98fa3521a5dd0dd6d6ec714eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:03:13 +0100
Subject: [PATCH 268/562] haskell-haskell-names: update to version 0.3.2.2

---
 pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index 7e6619d4f357..b77cd134dc81 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-names";
-  version = "0.3.2.1";
-  sha256 = "1ddixm37y1wkqsrs4cxvnmjczapwq1n67xg5rhkj0k7d04c8agha";
+  version = "0.3.2.2";
+  sha256 = "0imr0kgxkm2j2xx9ryll5s1b5bn8s4bkwpqdvvb4z44jhrgcgz7b";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass

From 55ed7d9466b634cb8df5fe99b8f02dab1a1c120e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:03:13 +0100
Subject: [PATCH 269/562] haskell-hoogle: update to version 4.2.25

---
 pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index fb4c33d73374..40d475421141 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.24";
-  sha256 = "01q0pr82wscnrm7flb1sd9fv8sym1pkdfvdmp6qcfwzzvrcsh5h2";
+  version = "4.2.25";
+  sha256 = "0s62h90hbmq1w11iqf44r1lx4acad9h6h62i8qjbsygbnmgkbn95";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a21f8721c4a6d8af300ef2e2ff414da35e2c7dd6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:03:13 +0100
Subject: [PATCH 270/562] haskell-persistent-template: update to version
 1.2.0.5

---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index c3bb228933d3..e54ebce96762 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.2.0.4";
-  sha256 = "0lhqv4mcai9r5mzj5h6fsd1hd8mv1458id0rb6q157192gywxhzf";
+  version = "1.2.0.5";
+  sha256 = "1i1rfs1x9dfm89zib1wy0wsksk3cfwkz84b492v6751v8ysdfsjh";
   buildDepends = [
     aeson monadControl monadLogger persistent text transformers
   ];

From 702370e3cdd228f060009528a99bbc4c8b5f14df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:03:13 +0100
Subject: [PATCH 271/562] haskell-shakespeare-css: update to version 1.0.6.6

---
 .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 7dedf465f655..853a6294131f 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.6.5";
-  sha256 = "1jmi5rh4a9x7md90sgzk6pmn0pn4h9mn44z8z0haq3fzflravqdk";
+  version = "1.0.6.6";
+  sha256 = "1xjavlw88nj5ila2b4m44zj0qgkpq147b30x1arwv0ik8szgml9k";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {

From cd3a9434fee4c8c50688a5542ec418b89995e1f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:03:13 +0100
Subject: [PATCH 272/562] haskell-unix-process-conduit: update to version
 0.2.2.1

---
 .../libraries/haskell/unix-process-conduit/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
index 1f04d939d9c1..8470a2d3f821 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-process-conduit";
-  version = "0.2.2";
-  sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6";
+  version = "0.2.2.1";
+  sha256 = "0zix8m38dza95g6ijip4r5nxz6y9vkh5jy8ksg4qpx1v2ib1m2cc";
   buildDepends = [ conduit filepath stm time transformers ];
   testDepends = [ conduit hspec transformers ];
   meta = {

From 3242e0d495d3ff12d30c229ba3d2807f61f1e83b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:03:13 +0100
Subject: [PATCH 273/562] haskell-wai-app-static: update to version 2.0.0.1

---
 .../libraries/haskell/wai-app-static/default.nix   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 3bcf63e17963..a6b8eeb4058b 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -1,18 +1,18 @@
 { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup
 , cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed
-, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio
-, systemFilepath, text, time, transformers, unixCompat
-, unorderedContainers, wai, waiTest, zlib
+, filepath, hspec, httpDate, httpTypes, mimeTypes, network
+, systemFileio, systemFilepath, text, time, transformers
+, unixCompat, unorderedContainers, wai, waiTest, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "2.0.0";
-  sha256 = "0zbjwghkg4xsjfxq74s6c041mvkj168r8nhh946yz6n660bkisai";
+  version = "2.0.0.1";
+  sha256 = "0c02j61a62dpl9i736q8cv0b9kw17akkws7waqa4zcbad1wyiqps";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
-    cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate
-    httpTypes mimeTypes systemFileio systemFilepath text time
+    cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath
+    httpDate httpTypes mimeTypes systemFileio systemFilepath text time
     transformers unixCompat unorderedContainers wai zlib
   ];
   testDepends = [

From 9d38ae8bcf7168987b99e07369fb43ccb47d5975 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:10:50 +0100
Subject: [PATCH 274/562] haskell-http-conduit: disable test suite to fix the
 build

See issue <https://github.com/snoyberg/http-client/issues/11>.
---
 pkgs/development/libraries/haskell/http-conduit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 403fdbe59b79..30dacc9b6b1c 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -26,6 +26,7 @@ cabal.mkDerivation (self: {
     regexCompat resourcet socks text time tls tlsExtra transformers
     transformersBase utf8String void wai warp warpTls zlibConduit
   ];
+  doCheck = false;
   meta = {
     homepage = "http://www.yesodweb.com/book/http-conduit";
     description = "HTTP client package with conduit interface and HTTPS support";

From 12a3008d4c0683818976508f62bf10eb205d80cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 11:46:18 +0100
Subject: [PATCH 275/562] haskell-http-reverse-proxy: disable test suite to fix
 the build

See issue <https://github.com/snoyberg/http-client/issues/11>.
---
 .../development/libraries/haskell/http-reverse-proxy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index f745554e4891..a8e0afc786ea 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     blazeBuilder conduit hspec httpConduit httpTypes liftedBase network
     networkConduit transformers wai warp
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/fpco/http-reverse-proxy";
     description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";

From c9a52836c83d8e455092e0a1e210f59aec22c077 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:18:54 +0100
Subject: [PATCH 276/562] haskell-pretty-show: resurrect version 1.2, which is
 required to build hledger on old versions of GHC

This reverts commit 54bfef6fc3d88eabfbd17c440c906170f7bc00ef.
---
 .../libraries/haskell/pretty-show/1.2.nix        | 16 ++++++++++++++++
 .../pretty-show/{default.nix => 1.6.2.nix}       |  0
 pkgs/top-level/haskell-packages.nix              |  4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix
 rename pkgs/development/libraries/haskell/pretty-show/{default.nix => 1.6.2.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix
new file mode 100644
index 000000000000..545816a57a02
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pretty-show/1.2.nix
@@ -0,0 +1,16 @@
+{ cabal, haskellLexer }:
+
+cabal.mkDerivation (self: {
+  pname = "pretty-show";
+  version = "1.2";
+  sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ haskellLexer ];
+  meta = {
+    homepage = "http://wiki.github.com/yav/pretty-show";
+    description = "Tools for working with derived Show instances";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/pretty-show/default.nix
rename to pkgs/development/libraries/haskell/pretty-show/1.6.2.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2e8e5c741ba9..5e4488add3fe 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1772,9 +1772,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
-  prettyShow = callPackage ../development/libraries/haskell/pretty-show {
+  prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
+  prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {
     happy = self.happy_1_19_2;
   };
+  prettyShow = self.prettyShow_1_6_2;
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 

From 0262a86ad1ae97d792c73f221994873b03973d7a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 277/562] haskell-blaze-builder: update to version 0.3.3.2

---
 pkgs/development/libraries/haskell/blaze-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
index 36b8f57cc400..51dda936687d 100644
--- a/pkgs/development/libraries/haskell/blaze-builder/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder";
-  version = "0.3.3.0";
-  sha256 = "0j6nrwcnpcr7c17cxw3v85m19q8z91wb6jir8c6kls5m321hwd63";
+  version = "0.3.3.2";
+  sha256 = "038ig1a1iz0hc36l53f5g7h6aiz7b1lggq1d04y3ql9a0553vd40";
   buildDepends = [ text ];
   meta = {
     homepage = "http://github.com/meiersi/blaze-builder";

From d5a0a812ddb993ea2a3816d42dd8ec08516d3fbf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 278/562] haskell-digestive-functors-heist: update to version
 0.8.3.0

---
 .../libraries/haskell/digestive-functors-heist/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index 91d1bf0bcbcd..f83488b850d9 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.8.1.0";
-  sha256 = "0f9nhfy8rc1w9nnhq1yf9y2kwxlb9b6v8y1jz5q3lrpb1cnq31j0";
+  version = "0.8.3.0";
+  sha256 = "1im9247mvqngknvkjncjrjj3wydz2k9wlsin53vyddjcqbqxa54g";
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];

From 6e0f60a5395fa1e453607046bab60dd4f559de1b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 279/562] haskell-digestive-functors-snap: update to version
 0.6.0.1

---
 .../libraries/haskell/digestive-functors-snap/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
index f23ee6d06910..6b20ed6ae89e 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-snap";
-  version = "0.6.0.0";
-  sha256 = "18hc0sx7in0df6kgkc8mrxag5h2rmdj2cca9zf9w1if6wimx3g88";
+  version = "0.6.0.1";
+  sha256 = "0y26fqhjb78mv6rzp3x6cbxrq4dqh2dzd81wd5sgsm079j5frjj7";
   buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";

From 7534476fada3910714ab740e7535be42c3f4dbb1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 280/562] haskell-digestive-functors: update to version 0.6.1.1

---
 .../libraries/haskell/digestive-functors/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix
index 1d3f31e55688..2207f18c35cd 100644
--- a/pkgs/development/libraries/haskell/digestive-functors/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors";
-  version = "0.6.1.0";
-  sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d";
+  version = "0.6.1.1";
+  sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw";
   buildDepends = [ mtl text ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit

From c97000f77c068c8aecbc73d2ac4d4deb07f92771 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 281/562] haskell-hoogle: update to version 4.2.26

---
 pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 40d475421141..70c8ecb249d8 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.25";
-  sha256 = "0s62h90hbmq1w11iqf44r1lx4acad9h6h62i8qjbsygbnmgkbn95";
+  version = "4.2.26";
+  sha256 = "07nc58vqdj5x3h6d7z8ilbff0pkqd3r7g789xyaalnh6wjkd7380";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 9d3022ec35305d8ff2b5a60496828153190f29e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 282/562] haskell-http-client: update to version 0.2.0.2

---
 pkgs/development/libraries/haskell/http-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 3658bc6bf8d1..2724b27673db 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.2.0.1";
-  sha256 = "0iqlq0drylxc9ir362pdbljghh5mxrmqjl51s02381y7jc0mfjs0";
+  version = "0.2.0.2";
+  sha256 = "1b6057yvbcrd01qp9gcmqh27zbla4d5krrsl279hmklkm2fd2zm3";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
     deepseq failure httpTypes network publicsuffixlist text time

From 66bd60896df4343c2e7b1e1e8fffb9d6dc6b5052 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 283/562] haskell-http-conduit: update to version 2.0.0.2

---
 pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 30dacc9b6b1c..b041957e555b 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.1";
-  sha256 = "1xkq11yylh4mdx8ml69h17fldmfpxclriw1kl0j44vddqdryn6zd";
+  version = "2.0.0.2";
+  sha256 = "0ypwn63brdjxyh70x10wb26xbsymj5x9v664nzc3nwvlh22ldhyw";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers

From e51fe9c496cab1f236129768d07592f54316eb44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 284/562] haskell-path-pieces: update to version 0.1.3.1

---
 pkgs/development/libraries/haskell/path-pieces/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix
index cdfe320a0609..b29527488436 100644
--- a/pkgs/development/libraries/haskell/path-pieces/default.nix
+++ b/pkgs/development/libraries/haskell/path-pieces/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "path-pieces";
-  version = "0.1.3";
-  sha256 = "03x9kfcaz1zsdpdzs05pcl0hv4hffgsl2js8xiy5slba6n841v4l";
+  version = "0.1.3.1";
+  sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic";
   buildDepends = [ text time ];
   testDepends = [ hspec HUnit QuickCheck text ];
   meta = {

From 303ce435511963cb83e517f3049f1b956f01762f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 12:21:53 +0100
Subject: [PATCH 285/562] haskell-persistent-template: update to version
 1.2.0.6

---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index e54ebce96762..9dc42ea5e39c 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.2.0.5";
-  sha256 = "1i1rfs1x9dfm89zib1wy0wsksk3cfwkz84b492v6751v8ysdfsjh";
+  version = "1.2.0.6";
+  sha256 = "1vkrxf2dabk9z0igfbvb2ib2bxcxi5af2vpxllv74cbjz9r6ip3s";
   buildDepends = [
     aeson monadControl monadLogger persistent text transformers
   ];

From 878227d7aa7383bf8a0daeaeeae7614673c50ea3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:39:20 +0100
Subject: [PATCH 286/562] haskell-ListLike: jailbreak to fix the build with
 text 1.x

---
 pkgs/development/libraries/haskell/ListLike/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
index d8e1e0c6f429..973fca3fb991 100644
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv";
   buildDepends = [ text vector ];
   testDepends = [ HUnit QuickCheck random text vector ];
+  jailbreak = true;
   meta = {
     homepage = "http://software.complete.org/listlike";
     description = "Generic support for list-like structures";

From 5afc2d5cf323cf40bbce5c8978c3e35e751d6740 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:45:18 +0100
Subject: [PATCH 287/562] haskell-http-client: update to version 0.2.0.3

---
 pkgs/development/libraries/haskell/http-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 2724b27673db..221d82033bc5 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.2.0.2";
-  sha256 = "1b6057yvbcrd01qp9gcmqh27zbla4d5krrsl279hmklkm2fd2zm3";
+  version = "0.2.0.3";
+  sha256 = "0dy0nf92404hlg4f4zifx6b1qs5wadgky7snqrizl5kk5af43i4h";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
     deepseq failure httpTypes network publicsuffixlist text time

From 8248ffc9e4681bf67b9db11ba491b964208eb5ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:45:18 +0100
Subject: [PATCH 288/562] haskell-lifted-async: update to version 0.1.0.1

---
 pkgs/development/libraries/haskell/lifted-async/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
index 8fbfd1f51b01..fa48f289a4ca 100644
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-async/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-async";
-  version = "0.1.0";
-  sha256 = "09ns06qgnwls6zcqsjvr7ykhpr1w12vq49ix4bkqriarl1q3ap7b";
+  version = "0.1.0.1";
+  sha256 = "03b89cixfin7ksdjh12g0pfrmgzw9mnx6nyvywv3rjc1sra3b8f0";
   buildDepends = [ async liftedBase monadControl transformersBase ];
   testDepends = [
     HUnit liftedBase monadControl mtl testFramework testFrameworkHunit

From 49536b487f7448bc93e2ab37b120251a0b888dc6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:45:18 +0100
Subject: [PATCH 289/562] haskell-tasty-ant-xml: update to version 1.0.0.4

---
 pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
index 3d68e8232755..4d90d51fceb9 100644
--- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-ant-xml";
-  version = "1.0.0.2";
-  sha256 = "1c13gmqsp33cfqim7aqqjypabkx42rmmhmjj8fpcr0ainpmvwkwi";
+  version = "1.0.0.4";
+  sha256 = "09qgakwqaqgppplxybkgyhyryxrw1pwlgkiqpixrqqhjans3z0hn";
   buildDepends = [
     genericDeriving mtl reducers stm tagged tasty transformers xml
   ];

From bf34b53746231b553c3c163b77207f367683eda7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:45:18 +0100
Subject: [PATCH 290/562] haskell-tasty-golden: update to version 2.2.0.1

---
 pkgs/development/libraries/haskell/tasty-golden/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix
index 2f27e50d8f9c..14c642239399 100644
--- a/pkgs/development/libraries/haskell/tasty-golden/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-golden";
-  version = "2.2";
-  sha256 = "0z49w4ksbbih3x0j170pfy93r2d68jw34hdni4s2p43kds52cakb";
+  version = "2.2.0.1";
+  sha256 = "0zr8ikg1j1nc29b6i23wb7zwbq0kmvjry7a1a6ldnz4p13m05q6d";
   buildDepends = [
     filepath mtl optparseApplicative tagged tasty temporary
   ];

From 28ba549fa8b02de5c16da37f8fc205e64230ced9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:45:18 +0100
Subject: [PATCH 291/562] haskell-tasty: update to version 0.5.1

---
 pkgs/development/libraries/haskell/tasty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 9ad53093c68b..8153eb9f6a76 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.4.2";
-  sha256 = "06348zdagaxk0axdmfj38r2h6pcacr0kqwx6hz6f499xdj8g74g9";
+  version = "0.5.1";
+  sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd";
   buildDepends = [
     ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
   ];

From e32ee4acf9f5fd8b8fadcfb92d2bde3993cfae9a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:45:19 +0100
Subject: [PATCH 292/562] haskell-vault: update to version 0.3.0.3

---
 pkgs/development/libraries/haskell/vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix
index 3f2842844443..8786838ab3db 100644
--- a/pkgs/development/libraries/haskell/vault/default.nix
+++ b/pkgs/development/libraries/haskell/vault/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vault";
-  version = "0.3.0.2";
-  sha256 = "1m9vanwzlw61fbdcy7qvv2prmbax5y9dsl52dldcf5zr7vip2hpb";
+  version = "0.3.0.3";
+  sha256 = "0wpj73jbwgcva1hfjc0bpf9l3lfc3iwdz70m29dh1785wvzxhsh5";
   buildDepends = [ hashable unorderedContainers ];
   jailbreak = true;
   meta = {

From 4df80c3c2edc1b709423c3b00b293e22968178bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:45:19 +0100
Subject: [PATCH 293/562] haskell-warp: update to version 2.0.1

---
 pkgs/development/libraries/haskell/warp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 0b6d3403c46f..04fb88de0d6b 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.0.0.1";
-  sha256 = "12n1r1qahngfhrqhlbfjl11rmy5la9mpd0h4ai0lzdxkakb89pxl";
+  version = "2.0.1";
+  sha256 = "1sgsiw75xm3b1bv0cnpkx6vn6k0r1an3c94xw5bab4h7blb9jk4a";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpAttoparsec httpDate httpTypes liftedBase network networkConduit

From 43070fe84f2d70de650987de5e92248290d9152d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 20:45:19 +0100
Subject: [PATCH 294/562] haskell-yesod-platform: update to version 1.2.5

---
 .../haskell/yesod-platform/default.nix        | 77 ++++++++++---------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index 7d56ca1142cd..ee9cd3b1fd3b 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -2,56 +2,59 @@
 , attoparsecConduit, authenticate, base64Bytestring
 , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
 , blazeMarkup, byteable, byteorder, caseInsensitive, cereal
-, certificate, cipherAes, cipherRc4, clientsession, conduit, cookie
-, cprngAes, cryptoApi, cryptoCipherTypes, cryptoConduit, cryptohash
-, cryptohashCryptoapi, cryptoNumbers, cryptoPubkey
-, cryptoPubkeyTypes, cryptoRandom, cssText, dataDefault
-, dataDefaultClass, dataDefaultInstancesBase
+, certificate, cipherAes, cipherRc4, clientsession, conduit
+, connection, controlMonadLoop, cookie, cprngAes, cryptoApi
+, cryptoCipherTypes, cryptoConduit, cryptohash, cryptohashCryptoapi
+, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom
+, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase
 , dataDefaultInstancesContainers, dataDefaultInstancesDlist
-, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate
-, entropy, failure, fastLogger, fileEmbed, filesystemConduit
-, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit
-, httpAttoparsec, httpConduit, httpDate, httpTypes
-, languageJavascript, liftedBase, mimeMail, mimeTypes, mmorph
-, monadControl, monadLogger, networkConduit, pathPieces, pem
-, persistent, persistentTemplate, poolConduit, primitive
-, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
-, resourcePool, resourcet, safe, securemem, semigroups, setenv, SHA
-, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
-, shakespeareText, silently, simpleSendfile, skein, socks
-, stringsearch, systemFileio, systemFilepath, tagged, tagsoup
-, tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat
-, unorderedContainers, utf8Light, utf8String, vector, void, wai
-, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8
-, xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth
-, yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic
-, yesodTest, zlibBindings, zlibConduit
+, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy
+, failure, fastLogger, fileEmbed, filesystemConduit, hamlet, hjsmin
+, hspec, hspecExpectations, htmlConduit, httpAttoparsec, httpClient
+, httpClientConduit, httpClientTls, httpConduit, httpDate
+, httpTypes, languageJavascript, liftedBase, mimeMail, mimeTypes
+, mmorph, monadControl, monadLogger, monadLoops, networkConduit
+, pathPieces, pem, persistent, persistentTemplate, poolConduit
+, primitive, processConduit, publicsuffixlist, pureMD5, pwstoreFast
+, quickcheckIo, resourcePool, resourcet, safe, securemem
+, semigroups, setenv, SHA, shakespeare, shakespeareCss
+, shakespeareI18n, shakespeareJs, shakespeareText, silently
+, simpleSendfile, skein, socks, stmChans, stringsearch
+, systemFileio, systemFilepath, tagged, tagsoup, tagstreamConduit
+, tls, tlsExtra, transformersBase, unixCompat, unorderedContainers
+, utf8Light, utf8String, vector, void, wai, waiAppStatic, waiExtra
+, waiLogger, waiTest, warp, word8, xmlConduit, xmlTypes
+, xssSanitize, yaml, yesod, yesodAuth, yesodCore, yesodForm
+, yesodPersistent, yesodRoutes, yesodStatic, yesodTest
+, zlibBindings, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.4.4";
-  sha256 = "0avqaqx81rald37j4qxp75ixgq5q4a3b8fnlmfsp9d54nfp3hxji";
+  version = "1.2.5";
+  sha256 = "1qd1r3ihnmzpc9jspvrygvxvp7si7j9rjrdp18jibsx3ijpkkif3";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
     blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
     caseInsensitive cereal certificate cipherAes cipherRc4
-    clientsession conduit cookie cprngAes cryptoApi cryptoCipherTypes
-    cryptoConduit cryptohash cryptohashCryptoapi cryptoNumbers
-    cryptoPubkey cryptoPubkeyTypes cryptoRandom cssText dataDefault
-    dataDefaultClass dataDefaultInstancesBase
-    dataDefaultInstancesContainers dataDefaultInstancesDlist
-    dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy
-    failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec
-    hspecExpectations htmlConduit httpAttoparsec httpConduit httpDate
-    httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph
-    monadControl monadLogger networkConduit pathPieces pem persistent
-    persistentTemplate poolConduit primitive publicsuffixlist pureMD5
+    clientsession conduit connection controlMonadLoop cookie cprngAes
+    cryptoApi cryptoCipherTypes cryptoConduit cryptohash
+    cryptohashCryptoapi cryptoNumbers cryptoPubkey cryptoPubkeyTypes
+    cryptoRandom cssText dataDefault dataDefaultClass
+    dataDefaultInstancesBase dataDefaultInstancesContainers
+    dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist
+    emailValidate entropy failure fastLogger fileEmbed
+    filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
+    httpAttoparsec httpClient httpClientConduit httpClientTls
+    httpConduit httpDate httpTypes languageJavascript liftedBase
+    mimeMail mimeTypes mmorph monadControl monadLogger monadLoops
+    networkConduit pathPieces pem persistent persistentTemplate
+    poolConduit primitive processConduit publicsuffixlist pureMD5
     pwstoreFast quickcheckIo resourcePool resourcet safe securemem
     semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n
     shakespeareJs shakespeareText silently simpleSendfile skein socks
-    stringsearch systemFileio systemFilepath tagged tagsoup
+    stmChans stringsearch systemFileio systemFilepath tagged tagsoup
     tagstreamConduit tls tlsExtra transformersBase unixCompat
     unorderedContainers utf8Light utf8String vector void wai
     waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit

From 6cd149f2a975e9db3716bc5aa0e95674064bef0b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 21:47:39 +0100
Subject: [PATCH 295/562] hoogle: disable test suite to fix the build

See issue <https://github.com/ndmitchell/hoogle/issues/43>.
---
 pkgs/development/libraries/haskell/hoogle/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 70c8ecb249d8..b461b5a1fd41 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     tagsoup text time transformers uniplate wai warp
   ];
   testDepends = [ filepath ];
+  doCheck = false;
   meta = {
     homepage = "http://www.haskell.org/hoogle/";
     description = "Haskell API Search";

From 48f24712dca6859a4f66dcb46c5b5056a12f0ef8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Dec 2013 23:20:23 +0100
Subject: [PATCH 296/562] Fix a lots of evaluation errors on Hydra.

---
 pkgs/development/libraries/haskell/HFuse/default.nix       | 2 +-
 pkgs/development/libraries/haskell/alsa-core/default.nix   | 2 +-
 pkgs/development/libraries/haskell/alsa-pcm/default.nix    | 2 +-
 .../libraries/haskell/gloss-accelerate/default.nix         | 1 +
 .../libraries/haskell/gloss-raster-accelerate/default.nix  | 1 +
 pkgs/development/libraries/imlib2/default.nix              | 6 +++---
 pkgs/development/libraries/json-c/default.nix              | 2 +-
 pkgs/development/libraries/libmng/default.nix              | 2 +-
 pkgs/development/libraries/pango/default.nix               | 2 +-
 pkgs/tools/X11/bgs/default.nix                             | 7 +++----
 pkgs/tools/backup/bup/default.nix                          | 3 +--
 pkgs/tools/networking/pdsh/default.nix                     | 2 +-
 pkgs/tools/typesetting/asciidoc/default.nix                | 2 +-
 pkgs/tools/typesetting/lhs2tex/default.nix                 | 1 +
 14 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
index 9d37b580d802..2012739afb45 100644
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
     homepage = "https://github.com/toothbrush/hfuse";
     description = "HFuse is a binding for the Linux FUSE library";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix
index 140d554e88c6..f38082fba88b 100644
--- a/pkgs/development/libraries/haskell/alsa-core/default.nix
+++ b/pkgs/development/libraries/haskell/alsa-core/default.nix
@@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
     homepage = "http://www.haskell.org/haskellwiki/ALSA";
     description = "Binding to the ALSA Library API (Exceptions)";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix
index 3d1091f27027..39123a176dc7 100644
--- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix
+++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix
@@ -16,6 +16,6 @@ cabal.mkDerivation (self: {
     homepage = "http://www.haskell.org/haskellwiki/ALSA";
     description = "Binding to the ALSA Library API (PCM audio)";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
index c4a31d541b58..2c53925f975d 100644
--- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Extras to interface Gloss and Accelerate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
index 7ed70bc092cf..db5b62169c40 100644
--- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
+++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix
@@ -9,5 +9,6 @@ cabal.mkDerivation (self: {
     description = "Parallel rendering of raster images using Accelerate";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index d77e2052f811..b1c154badd8e 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -2,17 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "imlib2-1.4.5";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
     sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14";
   };
-  
+
   buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ];
 
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-    platforms = stdenv.lib.platforms.gnu; # random choice
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index 7953b04183a9..78100521584b 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
       and parse JSON formatted strings back into the C representation of JSON
       objects.
     '';
-    platforms = platforms.linux;
+    hydraPlatforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index fcaf95672e18..818789173844 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.libmng.com;
     license = "zlib/libpng";
     maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
-    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index ca1db1372064..f57ee931fafa 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index 0c6951aa3e76..ed700fa63569 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -14,11 +14,10 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
 
-  meta = { 
+  meta = {
       description = "Extremely fast and small background setter for X";
       license = "MIT";
-      platforms = with stdenv.lib.platforms; all;
-      maintainers = with stdenv.lib.maintainers; [pSub]; 
+      hydraPlatforms = stdenv.lib.platforms.linux;
+      maintainers = with stdenv.lib.maintainers; [pSub];
   };
 }
-
diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 54b089bd08e9..d1748cc252ef 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation {
       Capable of doing *fast* incremental backups of virtual machine images.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 80fc075107c1..d6952b8e3757 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
       while timeouts occur on some connections.
     '';
 
-    platforms = stdenv.lib.platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 723741b2c836..8a5eb6ad759e 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -257,7 +257,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.methods.co.nz/asciidoc/";
     license = licenses.gpl2Plus;
-    platforms = platforms.linux ++ [ "x86_64-darwin" ];
+    hydraPlatforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index ec1c9021522f..ade7fd202d53 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     description = "Preprocessor for typesetting Haskell sources with LaTeX";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.linux;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

From 7d5ab6167c866c98ad6014429ce034de98e3b3f9 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Wed, 11 Dec 2013 13:05:07 +0800
Subject: [PATCH 297/562] renpy: update to 6.16.3

---
 .../interpreters/renpy/default.nix            | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index f7d8b93f966d..60884fce69d1 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -3,11 +3,19 @@
 }:
 
 stdenv.mkDerivation {
-  name = "renpy-6.15.5";
+  name = "renpy-6.16.3";
+
+  meta = {
+    description = "Ren'Py Visual Novel Engine";
+    homepage = "http://renpy.org/";
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.15.5/renpy-6.15.5-source.tar.bz2";
-    sha256 = "1k57dak1yk5iyxripqn2syhwwkh70y00pnnb9i1qf19lmiirxa60";
+    url = "http://www.renpy.org/dl/6.16.3/renpy-6.16.3-source.tar.bz2";
+    sha256 = "0yd7wj85kp0hlaqlrhl40irhkmcng89vcxypyx40pqmk87gjagqn";
   };
 
   buildInputs = [
@@ -34,16 +42,8 @@ stdenv.mkDerivation {
     makeWrapper ${python}/bin/python $out/bin/renpy \
       --set PYTHONPATH $program_PYTHONPATH \
       --set RENPY_BASE $out/share/renpy \
-      --set RENPY_LESS_UPDATES 1 \
       --add-flags "-O $out/share/renpy/renpy.py"
   '';
 
   NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}";
-
-  meta = {
-    description = "Ren'Py Visual Novel Engine";
-    homepage = "http://renpy.org/";
-    license = "MIT";
-    platforms = stdenv.lib.platforms.linux;
-  };
 }

From 6ba2d327b6d17237f6272546bc4fe65281534b07 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 10 Dec 2013 15:44:54 +0200
Subject: [PATCH 298/562] amsn: update from 0.98.4 to 0.98.9

---
 .../networking/instant-messengers/amsn/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix
index fc7906b3e402..37c0b4a694dd 100644
--- a/pkgs/applications/networking/instant-messengers/amsn/default.nix
+++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "amsn-0.98.4";
+  name = "amsn-0.98.9";
   src = fetchurl {
-    url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz;
-    sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx";
+    url = mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz;
+    sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r";
   };
 
   configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";

From 96f551a8f96e1bc28c36528e180277dbd772a633 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 10 Dec 2013 17:03:58 +0200
Subject: [PATCH 299/562] libgtop: update from 2.28.4 to 2.28.5

---
 pkgs/development/libraries/libgtop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index b592f458c6ce..b9ae43a7c8b9 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, glib, pkgconfig, perl, intltool }:
 stdenv.mkDerivation {
-  name = "libgtop-2.28.4";
+  name = "libgtop-2.28.5";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.4.tar.xz;
-    sha256 = "1n71mg82k8m7p6kh06vgb1hk4y9cqwk1lva53pl7w9j02pyrqqdn";
+    url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.5.tar.xz;
+    sha256 = "0hik1aklcn79irgw1xf7d6cfkw8hzmy46r9jyfhp32aawisc24n8";
   };
 
   propagatedBuildInputs = [ glib ];

From 3b3e7e8f25c8cf7fca5ebba9af690288ac6e4023 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 10 Dec 2013 17:10:46 +0200
Subject: [PATCH 300/562] gnome.gvfs: update from 1.14.1 to 1.14.2

---
 pkgs/desktops/gnome-2/desktop/gvfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
index 9e7949047c7f..a2044d1b2702 100644
--- a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
@@ -3,11 +3,11 @@
 , udev, avahi, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "gvfs-1.14.1";
+  name = "gvfs-1.14.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
-    sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a";
+    sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
   };
 
   buildInputs =

From d706aab747c1b7e2e5d26d0870c165219c1bcbcd Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Tue, 10 Dec 2013 18:30:42 +0200
Subject: [PATCH 301/562] diffstat: update from 1.45 to 1.58

---
 pkgs/tools/text/diffstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix
index d1d366ba5998..6bbf1a9a8c7f 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/pkgs/tools/text/diffstat/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, stdenv}:
 
 stdenv.mkDerivation rec {
-  name = "diffstat-1.45";
+  name = "diffstat-1.58";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/diffstat/"+ name +".tgz";
-    md5 = "cfe06ffcdbeaaa2fd296db867157ef78";
+    sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs";
   };
 
   meta = {

From b7a9e1a9982d4f63508db872a93e0ca5e4935a52 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Sat, 7 Dec 2013 00:13:35 -0500
Subject: [PATCH 302/562] Add shellinabox

---
 pkgs/servers/shellinabox/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/servers/shellinabox/default.nix

diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
new file mode 100644
index 000000000000..49d7810a3c20
--- /dev/null
+++ b/pkgs/servers/shellinabox/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pam, openssl, openssh }:
+
+stdenv.mkDerivation {
+  name = "shellinabox-2.14";
+
+  src = fetchurl {
+    url = "https://shellinabox.googlecode.com/files/shellinabox-2.14.tar.gz";
+    sha1 = "9e01f58c68cb53211b83d0f02e676e0d50deb781";
+  };
+  buildInputs = [pam openssl openssh];
+
+  # Disable GSSAPIAuthentication errors as well as correct hardcoded path. Take /usr/games's place. 
+  preConfigure = ''
+    substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" ""
+    substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
+    '';
+  meta = {
+    homepage = https://code.google.com/p/shellinabox;
+    description = "Web based AJAX terminal emulator";
+    license = "GPLv2";
+    maintainers = [stdenv.lib.maintainers.tomberek];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f9f1ccf0470..4a2b66bb29bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1776,6 +1776,8 @@ let
 
   shebangfix = callPackage ../tools/misc/shebangfix { };
 
+  shellinabox = callPackage ../servers/shellinabox { };
+
   siege = callPackage ../tools/networking/siege {};
 
   silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };

From db426d4601be0279cdb0cecb311a09dee8227b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 11 Dec 2013 12:00:05 +0100
Subject: [PATCH 303/562] k3d: fix changed URL/patch

---
 pkgs/applications/graphics/k3d/debian-patches.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/k3d/debian-patches.nix b/pkgs/applications/graphics/k3d/debian-patches.nix
index fe1289f14413..cf6b47ee9597 100644
--- a/pkgs/applications/graphics/k3d/debian-patches.nix
+++ b/pkgs/applications/graphics/k3d/debian-patches.nix
@@ -1,6 +1,6 @@
 # Generated by debian-patches.sh from debian-patches.txt
 let
-  prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15";
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-18";
 in
 [
   {
@@ -9,6 +9,6 @@ in
   }
   {
     url = "${prefix}/k3d_gtkmm224.patch";
-    sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
+    sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji";
   }
 ]

From 900786ab3732caa371cbfbce49fcf59cb075da58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Dec 2013 12:08:12 +0100
Subject: [PATCH 304/562] Fix more evaluation errors on Hydra.

---
 pkgs/development/libraries/libdaemon/default.nix | 2 +-
 pkgs/tools/graphics/graphviz/default.nix         | 2 +-
 pkgs/tools/misc/direnv/default.nix               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index f9666ccf4ddc..58c150a22d6e 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    hydraPlatforms = stdenv.lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 0ef70a197d6f..171a6202e738 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       interfaces for other technical domains.
     '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = with stdenv.lib.maintainers; [ simons bjornfor ];
   };
 }
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 5588fe3d647f..2850c35b720e 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://direnv.net;
     license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+    hydraPlatforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.zimbatm ];
   };
 }

From 4855b0a22eb957740e7c1e0ead39ca3984f98d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 11 Dec 2013 12:13:24 +0100
Subject: [PATCH 305/562] dragonegg: fix build via update to 3.3

---
 pkgs/development/compilers/llvm/dragonegg.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/dragonegg.nix
index 42d337b8eace..737b9533a089 100644
--- a/pkgs/development/compilers/llvm/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/dragonegg.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, llvm, gmp, mpfr, mpc}:
 
 stdenv.mkDerivation rec {
-  version = "3.2";
+  version = "3.3";
   name = "dragonegg-${version}";
 
   src = fetchurl {
     url = "http://llvm.org/releases/${version}/${name}.src.tar.gz";
-    sha256 = "0jfxhqy3177drlvzgp6m0kwnbfyzrd4vzidnxjhck8a7a69a26bg";
+    sha256 = "1kfryjaz5hxh3q6m50qjrwnyjb3smg2zyh025lhz9km3x4kshlri";
   };
 
   # The gcc the plugin will be built for (the same used building dragonegg)

From 9e329b9fd1437724e30d4ae1fa5290aaa1e62fe6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 11 Dec 2013 16:37:08 +0400
Subject: [PATCH 306/562] Fix a minor bug in fsg

---
 pkgs/games/fsg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index 7a9dc1105408..a4579ad2ae36 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation {
     sed -e '
       s@currentProbIndex != 100@0@;
     ' -i MainFrame.cpp
+    sed -re '/ctrans_prob/s/energy\[center][+]energy\[other]/(int)(fmin(energy[center]+energy[other],99))/g' -i Canvas.cpp
   '';
 
   installPhase = ''

From f329865aa26fa1ebc90d1901b2e0d9883d8c59d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Dec 2013 12:55:55 +0100
Subject: [PATCH 307/562] apr: Update to 1.5.0

---
 pkgs/development/libraries/apr/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 1893a2c94136..e248dbd649e7 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,26 +1,26 @@
 { stdenv, fetchurl }:
 
-let
-   inherit (stdenv.lib) optionals;
-in
-
 stdenv.mkDerivation rec {
-  name = "apr-1.4.8";
+  name = "apr-1.5.0";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41";
+    md5 = "cc93bd2c12d0d037f68e21cc6385dc31";
   };
 
-  patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
 
   configureFlags =
     # Including the Windows headers breaks unistd.h.
     # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
     stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://apr.apache.org/;
     description = "The Apache Portable Runtime library";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }

From f74ca42ba6daee4558b6708c36d46baaa81f5db4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Dec 2013 14:28:37 +0100
Subject: [PATCH 308/562] linux: Update to 3.4.73

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index e7405c522a62..4cf3229f6fde 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.71";
+  version = "3.4.73";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0l9bv40mwk45ccmb2pfy574h6zrclrz5vhvmnn61q3z16j269dpp";
+    sha256 = "052g799pq6k0xzs231n3502bsv0k9ap3q8clxpyzyila8sx4rll7";
   };
 
   features.iwlwifi = true;

From f7b256a221c2bf12c17685b533cf443a1b1b8c1b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 11 Dec 2013 15:32:27 +0100
Subject: [PATCH 309/562] Add initial configuration for Google Compute Engine

---
 .../virtualisation/google-compute-config.nix  |   5 +
 .../virtualisation/google-compute-image.nix   | 158 ++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 nixos/modules/virtualisation/google-compute-config.nix
 create mode 100644 nixos/modules/virtualisation/google-compute-image.nix

diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
new file mode 100644
index 000000000000..9e6be93b6d98
--- /dev/null
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ];
+}
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
new file mode 100644
index 000000000000..edf10c0e5048
--- /dev/null
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -0,0 +1,158 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
+
+  system.build.googleComputeImage =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "google-compute-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/disk.raw
+              truncate $diskImage --size 10G
+              mv closure xchg/
+            '';
+
+          postVM =
+            ''
+              PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
+              pushd $out
+              tar -Szcf disk.raw.tar.gz disk.raw
+              rm $out/disk.raw
+              popd
+            '';
+
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          exportReferencesGraph =
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create partition table
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 10G
+          ${pkgs.parted}/sbin/parted /dev/vda print
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+
+          # Create an empty filesystem and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+          mkdir /mnt
+          mount /dev/vda1 /mnt
+
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+
+          mount --bind /proc /mnt/proc
+          mount --bind /dev /mnt/dev
+          mount --bind /sys /mnt/sys
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+
+          mkdir -p /mnt/nix/store
+          echo "copying everything (will take a while)..."
+          cp -prd $storePaths /mnt/nix/store/
+
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+              chroot /mnt ${config.nix.package}/bin/nix-store --load-db
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.nix.package}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos /mnt/boot/grub
+          cp ${./google-compute-config.nix} /mnt/etc/nixos/configuration.nix
+
+          # Generate the GRUB menu.
+          ln -s vda /dev/sda
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /mnt/proc /mnt/dev /mnt/sys
+          umount /mnt
+        ''
+    );
+
+  fileSystems."/".label = "nixos";
+
+  boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
+  boot.initrd.kernelModules = [ "virtio_scsi" ];
+
+  # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+  boot.loader.grub.device = "/dev/sda";
+  boot.loader.grub.timeout = 0;
+
+  # Don't put old configurations in the GRUB menu.  The user has no
+  # way to select them anyway.
+  boot.loader.grub.configurationLimit = 0;
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time.
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
+
+  # Force getting the hostname from Google Compute.
+  networking.hostName = mkDefault "";
+
+  # Always include cryptsetup so that NixOps can use it.
+  environment.systemPackages = [ pkgs.cryptsetup ];
+
+  # Prevent logging in as root without a password.  This doesn't really matter,
+  # since the only PAM services that allow logging in with a null
+  # password are local ones that are inaccessible on Google Compute machines.
+  security.initialRootPassword = "!";
+
+  # Configure default metadata hostnames
+  networking.extraHosts = ''
+    169.254.169.254 metadata.google.internal metadata
+  '';
+
+  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt9GBbtWUTDacovm2O6qDw/SsmUmwYBu3k+6kx8/Xv7IJK5uqxhNTBc0MfADBV6EMZVDkaw+rDeRvcDuEzz2r/CP/x1vVDiwWYjyU2uOZEHFKh15W/1qC9fwBIikcbgm+8R33kmpFr9AChP4KWR+4T3jf0AYknZ3pbZ5GPCTWmWeOR4PVhtusDt0/cfWrENrA0mFo37xohn5lFsbrJ5/rMuhWglTuHIQFGwECqbYPvyxDLZxAfqg1Wc1AJAW8xRuJafvPyuxsj+qJu+MfKpAcxSoXDtldPxCFF6e/4j0Ey/kz435fJS/AjSJwmeurOQ/vB+tm2Db1wLWc1669S46Kl rbvermaa@propowerrrr"];
+
+  # fetch authorized keys for root user
+  systemd.services.fetch-root-authorized-keys =
+    { description = "Fetch authorized_keys for root user.";
+
+      wantedBy = [ "multi-user.target" ];
+      before = [ "sshd.service" ];
+      after = [ "network.target" ];
+
+      path  = [ pkgs.curl ];
+      script =
+        ''
+          # Don't download the SSH key if it has already been downloaded
+          if ! [ -e /root/.ssh/authorized_keys ]; then
+                echo "obtaining SSH key..."
+                mkdir -p /root/.ssh
+                curl -o /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys
+                if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then
+                    cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub
+                    if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                        cat /root/key.pub >> /root/.ssh/authorized_keys
+                        echo "new key added to authorized_keys"
+                    fi
+                    chmod 600 /root/.ssh/authorized_keys
+                    rm -f /root/key.pub /root/authorized-keys-metadata
+                fi
+          fi
+        '';
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
+     };
+
+
+}

From ee8a58a72f8c39096e2dc19bb8ddba673616b7c6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 11 Dec 2013 16:18:12 +0100
Subject: [PATCH 310/562] Remove a hardcoded SSH public key from the Google
 Compute image.

---
 nixos/modules/virtualisation/google-compute-image.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index edf10c0e5048..3254d64b2849 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -121,8 +121,6 @@ with pkgs.lib;
     169.254.169.254 metadata.google.internal metadata
   '';
 
-  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt9GBbtWUTDacovm2O6qDw/SsmUmwYBu3k+6kx8/Xv7IJK5uqxhNTBc0MfADBV6EMZVDkaw+rDeRvcDuEzz2r/CP/x1vVDiwWYjyU2uOZEHFKh15W/1qC9fwBIikcbgm+8R33kmpFr9AChP4KWR+4T3jf0AYknZ3pbZ5GPCTWmWeOR4PVhtusDt0/cfWrENrA0mFo37xohn5lFsbrJ5/rMuhWglTuHIQFGwECqbYPvyxDLZxAfqg1Wc1AJAW8xRuJafvPyuxsj+qJu+MfKpAcxSoXDtldPxCFF6e/4j0Ey/kz435fJS/AjSJwmeurOQ/vB+tm2Db1wLWc1669S46Kl rbvermaa@propowerrrr"];
-
   # fetch authorized keys for root user
   systemd.services.fetch-root-authorized-keys =
     { description = "Fetch authorized_keys for root user.";

From 14018c2de1a1b4244fda239ee318f0b5d81dea57 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Dec 2013 21:14:17 +0100
Subject: [PATCH 311/562] fail2ban: Fix preStart action

Creating /run/fail2ban didn't work since it didn't have write
permission to /run.  Now it does.

Reported by Thomas Bereknyei.
---
 nixos/modules/services/security/fail2ban.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 395a5df8af07..ae1fd22d23ee 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -106,7 +106,7 @@ in
         serviceConfig =
           { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
             ReadOnlyDirectories = "/";
-            ReadWriteDirectories = "/run/fail2ban /var/tmp";
+            ReadWriteDirectories = "/run /var/tmp";
             CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
           };
 

From 3e06d3da1db823a598925aee0f94180bbff73029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 12 Dec 2013 00:32:13 +0100
Subject: [PATCH 312/562] dmidecode: set meta.platforms to linux

---
 pkgs/os-specific/linux/dmidecode/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index 40564f9f95a7..19d4092ba783 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = "prefix=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.nongnu.org/dmidecode/;
     description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard";
+    platforms = platforms.linux;
   };
 }

From b95f7102eea4f00dd723671fca29041c461efb9b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 09:52:31 +0200
Subject: [PATCH 313/562] flpsed: update from 0.7.0 to 0.7.1

---
 pkgs/applications/editors/flpsed/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 15605218b741..a18bfd8b2c65 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, fltk13, ghostscript}:
 
 stdenv.mkDerivation {
-  name = "flpsed-0.7.0";
+  name = "flpsed-0.7.1";
 
   src = fetchurl {
-    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.0.tar.gz";
-    sha1 = "7966fd3b6fb3aa2a376386533ed4421ebb66ad62";
+    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.1.tar.gz";
+    sha256 = "16i3mjc1cdx2wiwfhnv3z2ywmjma9785vwl3l31izx9l51w7ngj3";
   };
 
   buildInputs = [ fltk13 ghostscript ];

From c584ac123f716f52fb0779a3b66b84c514126a02 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 09:57:03 +0200
Subject: [PATCH 314/562] fping: update from 3.4 to 3.8

---
 pkgs/tools/networking/fping/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 4bda944c68a5..10f31fb8297d 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-3.4";
+  name = "fping-3.8";
 
   src = fetchurl {
     url = "http://www.fping.org/dist/${name}.tar.gz";
-    sha256 = "1zkawlk6lcqw6nakqnl3v0x1cwnxrx2lmg9q6j76mw9i96pjh9fl";
+    sha256 = "04iwj4x3wns09wp777mb3kwfi7ypb4m9m73p0s2y699px77hcx67";
   };
 
   meta = {

From c8f28ec7e32619103232af7d19e11e21d22a24a1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 09:58:18 +0200
Subject: [PATCH 315/562] geany: update from 1.23 to 1.23.1

---
 pkgs/applications/editors/geany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index e7c8e276d27b..d7ed048cdaa8 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk2, which, pkgconfig, intltool }:
 
 let
-  version = "1.23";
+  version = "1.23.1";
 in
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.geany.org/${name}.tar.bz2";
-    sha256 = "1c78rggjaz9fa8gj25wka1sa3argvixnzrarmqvwh0s8d5ragm6d";
+    sha256 = "1bcgjxywggsljs9kq22kr9xpzrq5xr7pb9d1b71rwryqb5pb25c8";
   };
 
   buildInputs = [ gtk2 which pkgconfig intltool ];

From 57826becead63ab9fe0245ec5f0912fb3bbc5175 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 10:01:00 +0200
Subject: [PATCH 316/562] gengetopt: update from 2.22.5 to 2.22.6

---
 pkgs/development/tools/misc/gengetopt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix
index dc7a467fb0c2..d0efe4e62494 100644
--- a/pkgs/development/tools/misc/gengetopt/default.nix
+++ b/pkgs/development/tools/misc/gengetopt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gengetopt-2.22.5";
+  name = "gengetopt-2.22.6";
 
   src = fetchurl {
     url = "mirror://gnu/gengetopt/${name}.tar.gz";
-    sha256 = "0dr1xmlgk9q8za17wnpgghb5ifnbca5vb0w5bc6fpc2j0cjb6vrv";
+    sha256 = "1xq1kcfs6hri101ss4dhym0jn96z4v6jdvx288mfywadc245mc1h";
   };
 
   doCheck = true;

From 143dcc1123dbb7cacb221a01073355e28f8516b4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 10:06:26 +0200
Subject: [PATCH 317/562] geos: update from 3.3.8 to 3.4.2

---
 pkgs/development/libraries/geos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index 56c3c3e7a2bd..d1695f295fcb 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -10,11 +10,11 @@ composableDerivation.composableDerivation {} rec {
     # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
     # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
 
-  name = "geos-3.3.8";
+  name = "geos-3.4.2";
 
   src = fetchurl {
     url = "http://download.osgeo.org/geos/${name}.tar.bz2";
-    sha256 = "0fshz8s9g610ycl4grrmcdcxb01aqpc6qac3x3jjik0vlz8x9v7b";
+    sha256 = "0lvcs8x9as5jlxilykgg3i4220x8m4z59b2ngfapl219gvgvzs0m";
   };
 
   enableParallelBuilding = true;

From b35d255286a0240b0fe37f038f31b65ea8e8d505 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 10:10:58 +0200
Subject: [PATCH 318/562] gkrellm: update from 2.3.4 to 2.3.5

---
 pkgs/applications/misc/gkrellm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index af10ca9800d0..3b8f8b1cc680 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }:
 
 stdenv.mkDerivation rec {
-  name = "gkrellm-2.3.4";
+  name = "gkrellm-2.3.5";
   src = fetchurl {
     url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2";
-    sha256 = "0mjg2pxpiqms7d6dvxzxvpa420cakhpjxvrclhq0y8jd2dlv2irl";
+    sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
   };
 
   buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE];

From 8cfaf0697c841c0dd8dcd540bac4e6cd17782eff Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 10:13:44 +0200
Subject: [PATCH 319/562] global: update from 6.2.2 to 6.2.9

---
 pkgs/development/tools/misc/global/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 91cf2be4f73b..d1cd59d8828a 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtool, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.2.2";
+  name = "global-6.2.9";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "0a41d3wc22f05fqi5zpx1r22annsi4whdkjdmw50nidjca1vq5pj";
+    sha256 = "00y38kp0zbpjl9c9phldy7j2ihqc54qn4cdgk0azbjdsv75k3n6q";
   };
 
   buildInputs = [ libtool ncurses ];

From 510100344efb9ce96e799dc06eb1a74d208e40b3 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 10:15:58 +0200
Subject: [PATCH 320/562] glpk: update from 4.47 to 4.52.1

---
 pkgs/development/libraries/glpk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index edfbc0e86d7d..eb653591005e 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.47";
+  name = "glpk-4.52.1";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
-    sha256 = "13gl75w9dqh1a83v8wvlz9ychwljhy26n3l16r9dia3lpbikhm63";
+    sha256 = "0nz9ngmx23c8gbjr8l8ygnfaanxj2mwbl8awpg630bgrkxdnhc9j";
   };
 
   doCheck = true;

From e0ae2b01e615551164314468beda62f91921d8f7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 10:20:20 +0200
Subject: [PATCH 321/562] gnome.gnome_doc_utils: update from 0.20.7 to 0.20.10

---
 .../tools/documentation/gnome-doc-utils/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index 374002e8d6ca..b653c705478d 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -2,11 +2,11 @@
 , makeWrapper, pythonPackages }:
 
 stdenv.mkDerivation {
-  name = "gnome-doc-utils-0.20.7";
+  name = "gnome-doc-utils-0.20.10";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.7.tar.xz;
-    sha256 = "01lcq6gm4q9awvg7lccq43qh8g4ibz49s2mgykin78mgph9h396q";
+    url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz;
+    sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
   };
 
   configureFlags = "--disable-scrollkeeper";

From 687a074979f50b7025d21e8cbdd4e8ef05b5c8a4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 10:23:06 +0200
Subject: [PATCH 322/562] gnonlin: update from 0.10.15 to 0.10.17

---
 pkgs/development/libraries/gstreamer/gnonlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index ca386b15f0e1..820e8eb07c9e 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }:
 
 stdenv.mkDerivation rec {
-  name = "gnonlin-0.10.15";
+  name = "gnonlin-0.10.17";
 
   src = fetchurl {
     urls = [
       "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "1yz0i3vzpadz5axwdb310bypl4rm1xy2n6mgajja0w2z6afnrfv0";
+    sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4";
   };
 
   buildInputs = [ gst_plugins_base gstreamer pkgconfig ];

From f453b1fd03eaea85871274d50339625433b9cc6b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Wed, 11 Dec 2013 10:24:44 +0200
Subject: [PATCH 323/562] gnuvd: update from 1.0.10 to 1.0.12

---
 pkgs/tools/misc/gnuvd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix
index 122694af4567..359f04673ea8 100644
--- a/pkgs/tools/misc/gnuvd/default.nix
+++ b/pkgs/tools/misc/gnuvd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "gnuvd-1.0.10";
+  name = "gnuvd-1.0.12";
 
   src = fetchurl {
-    url = http://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.10.tar.gz ;
-    sha256 = "07mlynarcaal74ibbpqrsd982jmw6xfwgvcp9n6191d4h56a000s";
+    url = http://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ;
+    sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz";
   };
 
   meta = {

From bf05b39cd53147f869607370caab3e2d585e1e42 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 11 Dec 2013 22:00:31 +0200
Subject: [PATCH 324/562] gptfdisk: fix maintainers

---
 pkgs/tools/system/gptfdisk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 7c8c2ec09ed3..817e3015efe9 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.rodsbooks.com/gdisk/;
 
-    maintainers = stdenv.lib.maintainers.shlevy;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
 
     platforms = stdenv.lib.platforms.linux;
   };

From 1cedd2647f8d3baf3bc5bd1bf306d4c9097a660b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 12 Dec 2013 03:26:11 +0200
Subject: [PATCH 325/562] autopanosiftc: update from 2.5.0 to 2.5.1

---
 pkgs/applications/graphics/autopanosiftc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix
index a27d982ce8b2..be3cfc5935c7 100644
--- a/pkgs/applications/graphics/autopanosiftc/default.nix
+++ b/pkgs/applications/graphics/autopanosiftc/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "autopano-sift-C-2.5.0";
+  name = "autopano-sift-C-2.5.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/hugin/autopano-sift-C-2.5.0.tar.gz;
-    sha256 = "0pvkapjg7qdkjg151wjc7islly9ag8fg6bj0g5nbllv981ixjql3";
+    url = mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz;
+    sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
   };
 
   buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];

From b376a50dc52c2d12f81004e7c835938a3d97e218 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 12 Dec 2013 03:30:14 +0200
Subject: [PATCH 326/562] autossh: update from 1.4b to 1.4c

---
 pkgs/tools/networking/autossh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix
index 0c32b1c12400..94c466612ef5 100644
--- a/pkgs/tools/networking/autossh/default.nix
+++ b/pkgs/tools/networking/autossh/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssh}:
 
 stdenv.mkDerivation {
-  name = "autossh-1.4b";
+  name = "autossh-1.4c";
   
   src = fetchurl {
-    url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz";
-    md5 = "8f9aa006f6f69e912d3c2f504622d6f7";
+    url = "http://www.harding.motd.ca/autossh/autossh-1.4c.tgz";
+    sha256 = "07gxqxfsk24msd0py0hirvmlblh9iyxkcrq86bwbsils81mbmjkg";
   };
   
   buildInputs = [ openssh ];

From 233118579400d89af0674ac11aa0bb9f920734e7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 12 Dec 2013 03:34:12 +0200
Subject: [PATCH 327/562] qbittorrent: update from 3.1.2 to 3.1.3

---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 5aff37580d31..0ba160c8a917 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -2,11 +2,11 @@
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qbittorrent-3.1.2";
+  name = "qbittorrent-3.1.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "1viia11qixp1qqxcyiw1x4if63cfyqk4rscpzp1vnhnzm06irv7y";
+    sha256 = "16m3l8qjcj63brzrdn82cbijvz8fcxfgpibi4g5g6sbissjkwsww";
   };
 
   buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar

From 85372d5fba8cbe85326801a336f5919e0ed64d27 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Thu, 12 Dec 2013 11:04:38 +0800
Subject: [PATCH 328/562] add ranger 1.6.1

---
 pkgs/applications/misc/ranger/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/misc/ranger/default.nix

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
new file mode 100644
index 000000000000..5f75c05a68f3
--- /dev/null
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, python, fetchurl }:
+
+buildPythonPackage {
+  name = "ranger-1.6.1";
+
+  meta = {
+    description = "File manager with minimalistic curses interface";
+    homepage = "http://ranger.nongnu.org/";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "http://ranger.nongnu.org/ranger-1.6.1.tar.gz";
+    sha256 = "0pnvfwk2a1p35246fihm3fsr1m7r2njirbxm28ba276psajk1cnc";
+  };
+
+  doCheck = false;
+
+  propagatedBuildInputs = with python.modules; [ curses ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f9f1ccf0470..5ada4859ac1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1672,6 +1672,8 @@ let
 
   radvd = callPackage ../tools/networking/radvd { };
 
+  ranger = callPackage ../applications/misc/ranger { };
+
   privateer = callPackage ../games/privateer { };
 
   rtmpdump = callPackage ../tools/video/rtmpdump { };

From 6129be5a7a471e47fa79a14c1d2683273d712770 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Wed, 11 Dec 2013 23:17:53 -0500
Subject: [PATCH 329/562] Correct web-skip value to match behavior of
 checkip.dyndns.com

---
 nixos/modules/services/networking/ddclient.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 62709a040a1f..c53cb68fb75f 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -86,7 +86,7 @@ in
       };
 
       web = mkOption {
-        default = "web, web=checkip.dyndns.com/, web-skip='IP Address'" ;
+        default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '" ;
         description = "";
       };
 

From 4c1981c4e0b016db127e86eacff7e8d5269ef898 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 12 Dec 2013 09:33:57 +0200
Subject: [PATCH 330/562] Revert "virtuoso: update from 6.1.6 to 6.1.7"

Upstream KDE advises against 6.1.7 for now

This reverts commit 7c19a2213fe578a73994455bff650eaf7c0a4d3b.
---
 pkgs/servers/sql/virtuoso/6.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix
index 83ad717c0d3c..9453b8d2cdb2 100644
--- a/pkgs/servers/sql/virtuoso/6.x.nix
+++ b/pkgs/servers/sql/virtuoso/6.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, openssl, readline, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "virtuoso-opensource-6.1.7";
+  name = "virtuoso-opensource-6.1.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
-    sha256 = "0zxaf6i93jnh9lmgxxlb3jddp9ianil0szazfb6mrnqh13liwb68";
+    sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];

From 8c2dd86fe282adc473590c5ba09ee6d96f27717f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Dec 2013 10:37:29 +0100
Subject: [PATCH 331/562] Manual: Fix typo

Fixes #1363.
---
 nixos/doc/manual/development.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml
index cbf7ff8902fc..be1cbc97d5ed 100644
--- a/nixos/doc/manual/development.xml
+++ b/nixos/doc/manual/development.xml
@@ -494,7 +494,7 @@ module writers.</para>
 <variablelist>
 
   <varlistentry>
-    <term><option>etc.environment</option></term>
+    <term><option>environment.etc</option></term>
     <listitem>
       <para>This set defines files in <filename>/etc</filename>.  A
       typical use is:

From 61d346eaaf6327cba260a0d1c67112dbe37ad4cf Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 12 Dec 2013 12:48:09 +0100
Subject: [PATCH 332/562] Google Compute image: fix punctuation in description,
 give disk image proper name with version and revision.

---
 nixos/modules/virtualisation/google-compute-image.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 3254d64b2849..098c9ede8533 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -11,7 +11,7 @@ with pkgs.lib;
         { preVM =
             ''
               mkdir $out
-              diskImage=$out/disk.raw
+              diskImage=$out/$diskImageBase
               truncate $diskImage --size 10G
               mv closure xchg/
             '';
@@ -20,11 +20,11 @@ with pkgs.lib;
             ''
               PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
               pushd $out
-              tar -Szcf disk.raw.tar.gz disk.raw
-              rm $out/disk.raw
+              tar -Szcf $diskImageBase.tar.gz $diskImageBase
+              rm $out/$diskImageBase
               popd
             '';
-
+          diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
           buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph =
             [ "closure" config.system.build.toplevel ];
@@ -121,9 +121,8 @@ with pkgs.lib;
     169.254.169.254 metadata.google.internal metadata
   '';
 
-  # fetch authorized keys for root user
   systemd.services.fetch-root-authorized-keys =
-    { description = "Fetch authorized_keys for root user.";
+    { description = "Fetch authorized_keys for root user";
 
       wantedBy = [ "multi-user.target" ];
       before = [ "sshd.service" ];

From 38a0e6dfd583d00edc5d8caedbbee86761ed8af1 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 12 Dec 2013 14:11:24 +0100
Subject: [PATCH 333/562] lispPackages: Fix Github URIs.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/development/lisp-modules/lisp-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 015d5fccdc35..f7d6dd2676d6 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -23,7 +23,7 @@ let lispPackages = rec {
     description = "X11 bindings for Common Lisp";
     deps = [];
     src = pkgs.fetchgit {
-      url = "https://github.com/sharplispers/clx/";
+      url = "https://github.com/sharplispers/clx.git";
       rev = "e2b762ac93d78d6eeca4f36698c8dfd1537ce998";
       sha256 = "0jcrmlaayz7m8ixgriq7id3pdklyk785qvpcxdpcp4aqnfiiqhij";
     };
@@ -64,7 +64,7 @@ let lispPackages = rec {
     description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
     deps = [alexandria cl-unification esrap iterate];
     src = pkgs.fetchgit {
-      url = "https://github.com/fb08af68/esrap-peg";
+      url = "https://github.com/fb08af68/esrap-peg.git";
       sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1";
       rev = ''1f2f21e32e618f71ed664cdc5e7005f8b6b0f7c8'';
       
@@ -92,7 +92,7 @@ let lispPackages = rec {
     description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp.";
     deps = [alexandria];
     src = pkgs.fetchgit {
-      url = "https://github.com/scymtym/esrap";
+      url = "https://github.com/scymtym/esrap.git";
       sha256 = "c56616ac01be0f69e72902f9fd830a8af2c2fa9018b66747a5da3988ae38817f";
       rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26'';
       

From 0e18b7cd9707240287f17b530c99aa5368c14b0b Mon Sep 17 00:00:00 2001
From: Chong Li <chongli@gmail.com>
Date: Wed, 11 Dec 2013 21:12:40 +0100
Subject: [PATCH 334/562] Switched xbmc to pythonFull. Fixes python plugin
 errors.

---
 pkgs/applications/video/xbmc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 59537c7dce02..691b41dc6e30 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, makeWrapper
-, pkgconfig, cmake, gnumake, yasm, python
+, pkgconfig, cmake, gnumake, yasm, pythonFull
 , boost, avahi, libdvdcss, lame
 , gettext, pcre, yajl, fribidi
 , openssl, gperf, tinyxml2, taglib, libssh, swig, jre
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
     buildInputs = [
       makeWrapper
-      pkgconfig cmake gnumake yasm python
+      pkgconfig cmake gnumake yasm pythonFull
       boost libmicrohttpd
       gettext pcre yajl fribidi
       openssl gperf tinyxml2 taglib libssh swig jre
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     postInstall = ''
       for p in $(ls $out/bin/) ; do
         wrapProgram $out/bin/$p \
-          --prefix PATH ":" "${python}/bin" \
+          --prefix PATH ":" "${pythonFull}/bin" \
           --prefix PATH ":" "${glxinfo}/bin" \
           --prefix PATH ":" "${xdpyinfo}/bin" \
           --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \

From e69887ea67297b99f3c89f58fc2486c2e0dd1cfc Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 12 Dec 2013 18:49:14 +0100
Subject: [PATCH 335/562] LISP: Don't build/download texlive for every
 lispPackage.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f9f1ccf0470..d995a9ef7928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6021,7 +6021,9 @@ let
 
   ### DEVELOPMENT / LISP MODULES
 
-  asdf = callPackage ../development/lisp-modules/asdf {};
+  asdf = callPackage ../development/lisp-modules/asdf {
+    texLive = null;
+  };
   clwrapperFunction = callPackage ../development/lisp-modules/clwrapper;
   wrapLisp = lisp: clwrapperFunction {lisp=lisp;};
   lispPackagesFor = clwrapper: callPackage ../development/lisp-modules/lisp-packages.nix{

From a42508a8ba3f0cba2b62c138f242461e302e96df Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 12 Dec 2013 13:10:30 -0500
Subject: [PATCH 336/562] Add function to call a function with a cross-product
 of lists of arguments

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 lib/lists.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/lists.nix b/lib/lists.nix
index d6e8628f03a1..561a657264bb 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -225,4 +225,10 @@ in rec {
 
   deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 
+  crossLists = f: xss:
+    let
+      argss = fold (l: argss:
+        concatMap (arg: map (args: [ arg ] ++ args) argss) l
+      ) [[]] xss;
+    in map (args: foldl (f: arg: f arg) f args) argss;
 }

From a2c48451a25ca95d82090c3e5e8134dd3a923c97 Mon Sep 17 00:00:00 2001
From: Roelof Wobben <rwobben@hotmail.com>
Date: Thu, 12 Dec 2013 19:41:51 +0100
Subject: [PATCH 337/562] enabled introspection for clutter,cogl and json-glib

---
 pkgs/development/libraries/clutter/default.nix   | 8 +++++---
 pkgs/development/libraries/cogl/default.nix      | 7 +++++--
 pkgs/development/libraries/json-glib/default.nix | 6 ++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 33bc196143b1..df3ffc8f60f8 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
+, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
+gobjectIntrospection 
+}:
 
 stdenv.mkDerivation {
   name = "clutter-1.8.2";
@@ -12,10 +14,10 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib
+      atk json_glib gobjectIntrospection
     ];
 
-  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
 
   meta = {
     description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index abb92f7b08b4..b02319fd3e88 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite
 , libXdamage, libintlOrEmpty
-, pangoSupport ? true, pango, cairo }:
+, pangoSupport ? true, pango, cairo, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "cogl-1.8.2";
@@ -12,8 +12,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  configureFlags = " --enable-introspection " ; 
+
   propagatedBuildInputs =
-    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]
+    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage 
+gobjectIntrospection ]
     ++ libintlOrEmpty;
 
   buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 8ca1445b1f6d..005b9fac2e55 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl_gnome, glib, pkgconfig }:
+{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq";
   };
 
+  configureflags= " --with-introspection " ; 
+
   propagatedBuildInputs = [ glib ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig  gobjectIntrospection];
 
   meta = {
     homepage = http://live.gnome.org/JsonGlib;

From 3c5971692a0edd8867b1c6f91598e0c403bf1376 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 12 Dec 2013 14:01:48 -0500
Subject: [PATCH 338/562] Simplify crossLists

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 lib/lists.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 561a657264bb..71a897027962 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -225,10 +225,5 @@ in rec {
 
   deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 
-  crossLists = f: xss:
-    let
-      argss = fold (l: argss:
-        concatMap (arg: map (args: [ arg ] ++ args) argss) l
-      ) [[]] xss;
-    in map (args: foldl (f: arg: f arg) f args) argss;
+  crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
 }

From dbfeebeef74a8ef5b13424985f7e05d1d841e51e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 12 Dec 2013 22:26:57 +0200
Subject: [PATCH 339/562] libzip: update from 0.10 to 0.11.1, potentially fixes
 CVE-2012-1162, CVE-2012-1163

---
 pkgs/development/libraries/libzip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 48ef55892c8f..914157c7a0cd 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libzip-0.10";
+  name = "libzip-0.11.1";
   
   src = fetchurl {
     url = "http://www.nih.at/libzip/${name}.tar.gz";
-    sha256 = "1lnpxcl4z084bvx3jd0pqgr350ljnizpnlwh5vbzjp0iw9jakbxp";
+    sha256 = "15fwscng2lk0ypg45awk4y2grjqm987frnjcsnbxznfgpckrq7yy";
   };
   
   propagatedBuildInputs = [ zlib ];

From 8264cb98ae14305e6f89728cacd3ea88064c24ca Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 12 Dec 2013 23:46:12 +0200
Subject: [PATCH 340/562] perlPackages.HTTPBody: update from 1.17 to 1.19,
 potentially fixes CVE-2013-4407

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 05a6aec35a22..c683a91e468d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4008,10 +4008,10 @@ rec {
   };
 
   HTTPBody = buildPerlPackage {
-    name = "HTTP-Body-1.17";
+    name = "HTTP-Body-1.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.17.tar.gz;
-      sha256 = "1476zdcg1cdal3ik6ccwm3rqfgsdac6b63f92wmipvn8lkjdl70k";
+      url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.19.tar.gz;
+      sha256 = "0ahhksj0zg6wq6glpjkxdr3byd5riwvq2f5aw21n1jcsl71nll01";
     };
     buildInputs = [ TestDeep ];
     propagatedBuildInputs = [ HTTPMessage ];

From aef9ae72d014bb40dd1ffaab72485321c7d9c706 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 12 Dec 2013 23:50:47 +0200
Subject: [PATCH 341/562] bogofilter: update from 1.1.7 to 1.2.4, potentially
 fixes CVE-2012-5468

---
 pkgs/tools/misc/bogofilter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index 3d9287a9b8c2..2ec7f433596c 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -1,10 +1,10 @@
 {fetchurl, stdenv, flex, bdb}:
 
 stdenv.mkDerivation rec {
-  name = "bogofilter-1.1.7";
+  name = "bogofilter-1.2.4";
   src = fetchurl {
     url = "mirror://sourceforge/bogofilter/${name}.tar.bz2";
-    sha256 = "0ahi3pxv9v6yjjpfyr0x7fch4c4jdikshrcx86q0j8s2rhv94snm";
+    sha256 = "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1";
   };
 
   # FIXME: We would need `pax' as a "propagated build input" (for use

From 22840f80487d8531728fafd3fc3b1d9256142573 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Thu, 12 Dec 2013 23:55:06 +0200
Subject: [PATCH 342/562] libgcrypt: update from 1.5.2 to 1.5.3, potentially
 fixes CVE-2013-4242

---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index cb60355ef558..997e9cfc5b88 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libgpgerror }:
 
 stdenv.mkDerivation (rec {
-  name = "libgcrypt-1.5.2";
+  name = "libgcrypt-1.5.3";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "0gwnzqd64cpwdmk93nll54nidsr74jpimxzj4p4z7502ylwl66p4";
+    sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw";
   };
 
   propagatedBuildInputs = [ libgpgerror ];

From 22eabfcc025992ad340124fbdf72ce8fc1940ac3 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 00:00:48 +0200
Subject: [PATCH 343/562] libproxy: update from 0.4.7 to 0.4.11, potentially
 fixes CVE-2012-4504

---
 pkgs/development/libraries/libproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 8461bfef4391..68c3ac5130df 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, cmake, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "libproxy-0.4.7";
+  name = "libproxy-0.4.11";
   src = fetchurl {
     url = "http://libproxy.googlecode.com/files/${name}.tar.gz";
-    sha256 = "15rp97g3s2xkc842p5qfm8kx3p4awvrwrpl6w71a76qk224abq4g";
+    sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw";
   };
   buildInputs = [cmake zlib];
 }

From 36677bbe869c7738a04540a01bd89c82da112dba Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 00:08:33 +0200
Subject: [PATCH 344/562] smbldaptools: update from 0.9.7 to 0.9.10,
 potentially fixes CVE-2012-0961, CVE-2013-1051

---
 pkgs/tools/networking/smbldaptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix
index 962799117a05..74e8a530560c 100644
--- a/pkgs/tools/networking/smbldaptools/default.nix
+++ b/pkgs/tools/networking/smbldaptools/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}:
 
 let
-  version = "0.9.7";
+  version = "0.9.10";
 in
 stdenv.mkDerivation {
   name = "smbldap-tools-${version}";
   src = fetchurl {
     url = "http://download.gna.org/smbldap-tools/sources/${version}/smbldap-tools-${version}.tar.gz";
-    sha256 = "0y1k2j5qjxy66yvl36adbp9m1brapiz9ycaisdyy6093xvw1nh7j";
+    sha256 = "19hsvslfs61pk9nhyqdkd68gc95z26kpkmsj10b8zvzlhqmwdvy4";
   };
 
   buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ];

From ec833696392789e4b6016292892c19dc77d9286f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 00:10:35 +0200
Subject: [PATCH 345/562] subversionClient: update from 1.7.13 to 1.7.14,
 potentially fixes CVE-2013-4558

---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index bdf34cdba9a4..1af54994fd14 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.13";
+  version = "1.7.14";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "844bb756ec505edaa12b9610832bcd21567139f1";
+    sha256 = "038jbcpwm083abp0rvk0fhnx65kp9mz1qvzs3f83ig8fxcvqzb64";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

From ed9ce850fd317e38295b7a441c580f9678b51ca6 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 00:39:20 +0200
Subject: [PATCH 346/562] policycoreutils: update from 2.2.4 to 2.2.5

---
 pkgs/os-specific/linux/policycoreutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index 5c7e704390b5..063f89edaa2b 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -4,12 +4,12 @@
 stdenv.mkDerivation rec {
 
   name = "policycoreutils-${version}";
-  version = "2.2.4";
+  version = "2.2.5";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
-    sha256 = "08zpd2a2j45j1qkmq9sz084r2xr0fky1cnld45sn8w5xgdw8k81n";
+    sha256 = "1i0chc3km3wdgzrd556mmhvsglydxrimclnn77s73wy2qfl51y5v";
   };
 
   patchPhase = ''

From d9f3dab48ebe4614f1813229071eb05578511046 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Thu, 12 Dec 2013 20:27:07 -0800
Subject: [PATCH 347/562] Firefox 26.0.  (Doesn't build.)

---
 pkgs/applications/networking/browsers/firefox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 1f37911b8327..a48535b9b327 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "25.0.1";
+  firefoxVersion = "26.0";
 
-  xulVersion = "25.0.1"; # this attribute is used by other packages
+  xulVersion = "26.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
@@ -29,7 +29,7 @@ rec {
         # Fall back to this url for versions not available at releases.mozilla.org.
         "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
     ];
-    sha1 = "592ebd242c4839ef0e18707a7e959d8bed2a98f3";
+    sha1 = "f7c6642d6f62aea8d4eced48dd27aba0634edcd5";
   };
 
   commonConfigureFlags =

From 8ddc7b8db26747ef7f0554fa486ba044150ae742 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Fri, 13 Dec 2013 00:11:52 -0800
Subject: [PATCH 348/562] firefox: Hack to get it to compile.

---
 .../networking/browsers/firefox/default.nix           |  1 +
 .../networking/browsers/firefox/xpidl.patch           | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox/xpidl.patch

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index a48535b9b327..49c1e5951b6d 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -143,6 +143,7 @@ rec {
 
     patches = [
       ./disable-reporter.patch # fixes "search box not working when built on xulrunner"
+      ./xpidl.patch
     ];
 
     propagatedBuildInputs = [xulrunner];
diff --git a/pkgs/applications/networking/browsers/firefox/xpidl.patch b/pkgs/applications/networking/browsers/firefox/xpidl.patch
new file mode 100644
index 000000000000..e6a6b4d82646
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/xpidl.patch
@@ -0,0 +1,11 @@
+--- mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py	2013-12-05 08:07:53.000000000 -0800
++++ mozilla-release_1/python/mozbuild/mozbuild/backend/recursivemake.py	2013-12-12 23:38:39.697318563 -0800
+@@ -421,7 +421,7 @@
+     def _handle_idl_manager(self, manager):
+         build_files = self._purge_manifests['xpidl']
+ 
+-        for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
++        for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done',
+             'xpt/.mkdir.done'):
+             build_files.add(p)
+ 

From 3c677fde651aa07e310fe351b84f7737c9f51bf7 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 09:32:36 +0100
Subject: [PATCH 349/562] ati-drivers: fix aticonfig segmentation fault

Fix aticonfig tool by setting libXinerama to LD_LIBRARY_PATH
---
 pkgs/os-specific/linux/ati-drivers/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index ab95accd7493..51430f6e4eb4 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   patchPhase = "patch -p0 < ${./gentoo-patches.patch}";
 
   buildInputs =
-    [ xlibs.libXext xlibs.libX11
+    [ xlibs.libXext xlibs.libX11 xlibs.libXinerama
       xlibs.libXrandr which imake makeWrapper
       patchelf
       unzip
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
       "${xorg.libXrender}/lib"
       "${xorg.libXext}/lib"
       "${xorg.libX11}/lib"
+      "${xorg.libXinerama}/lib"
     ];
 
   # without this some applications like blender don't start, but they start

From 698860bf7cd0b85f4d4e0a019ac96da26a23455b Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 09:38:09 +0100
Subject: [PATCH 350/562] nginx: add headers more nginx module

---
 pkgs/servers/http/nginx/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 86b22ab5a18c..fe0681448e32 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat
 , rtmp ? false
 , fullWebDAV ? false
-, syslog ? false}:
+, syslog ? false
+, moreheaders ? false}:
 
 let
   version = "1.4.4";
@@ -27,6 +28,12 @@ let
     rev = "165affd9741f0e30c4c8225da5e487d33832aca3";
     sha256 = "14dkkafjnbapp6jnvrjg9ip46j00cr8pqc2g7374z9aj7hrvdvhs";
   };
+
+  moreheaders-ext = fetchgit {
+    url = https://github.com/agentzh/headers-more-nginx-module.git;
+    rev = "refs/tags/v0.23";
+    sha256 = "12pbjgsxnvcf2ff2i2qdn39q4cm5czlgrng96j8ml4cgxvnbdh39";
+  };
 in
 
 stdenv.mkDerivation rec {
@@ -49,7 +56,8 @@ stdenv.mkDerivation rec {
     # "--with-http_perl_module"
   ] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}"
     ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}"
-    ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}";
+    ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}"
+    ++ stdenv.lib.optional moreheaders "--add-module=${moreheaders-ext}";
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"

From 1b019fe39fbc9638cf616698cbe7fe7fe4d85c36 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 09:41:22 +0100
Subject: [PATCH 351/562] nginx: enable ipv6 and spdy

---
 pkgs/servers/http/nginx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 86b22ab5a18c..d29518d710ee 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -40,11 +40,13 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-http_ssl_module"
+    "--with-http_spdy_module"
     "--with-http_xslt_module"
     "--with-http_sub_module"
     "--with-http_dav_module"
     "--with-http_gzip_static_module"
     "--with-http_secure_link_module"
+    "--with-ipv6"
     # Install destination problems
     # "--with-http_perl_module"
   ] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}"

From c2f385cf4acd1dadca8a780935a99c0ea0d8fba3 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 09:44:51 +0100
Subject: [PATCH 352/562] dhcpcd: make dhcpcd work in linux containers

---
 pkgs/tools/networking/dhcpcd/default.nix             |  2 ++
 .../dhcpcd/lxc_ro_promote_secondaries.patch          | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 9b3b6238420c..ad0b62d19f81 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3";
   };
 
+  patches = [ ./lxc_ro_promote_secondaries.patch ];
+
   configureFlags = "--sysconfdir=/etc";
 
   makeFlags = "PREFIX=\${out}";
diff --git a/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch b/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch
new file mode 100644
index 000000000000..066ea67db9ee
--- /dev/null
+++ b/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch
@@ -0,0 +1,12 @@
+diff -rupN dhcpcd-6.1.0-old/if-linux.c dhcpcd-6.1.0/if-linux.c
+--- dhcpcd-6.1.0-old/if-linux.c	2013-09-20 12:27:24.000000000 +0200
++++ dhcpcd-6.1.0/if-linux.c	2013-12-13 09:50:24.183694744 +0100
+@@ -86,7 +86,7 @@ if_init(struct interface *iface)
+ 
+ 	fp = fopen(path, "w");
+ 	if (fp == NULL)
+-		return errno == ENOENT ? 0 : -1;
++		return (errno == ENOENT || errno == EROFS) ? 0 : -1;
+ 	n = fprintf(fp, "1");
+ 	fclose(fp);
+ 	return n == -1 ? -1 : 0;

From 24e2ef512682a4c86c9b2f22c3412fbf74639cea Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 10:05:36 +0100
Subject: [PATCH 353/562] memcached: set uid to make it work with #1076

---
 nixos/modules/misc/ids.nix                     | 1 +
 nixos/modules/services/databases/memcached.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ccd75d5b9158..6f2666e4ae54 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -108,6 +108,7 @@
       haproxy = 97;
       mongodb = 98;
       openldap = 99;
+      memcached = 100;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index a0e264f22990..505253229c9c 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -68,8 +68,9 @@ in
 
   config = mkIf config.services.memcached.enable {
 
-    users.extraUsers = singleton
+    users.extraUsers.memcached =
       { name = cfg.user;
+        uid = config.ids.uids.memcached;
         description = "Memcached server user";
       };
 

From c53d8c81f5025a9a182c7843f3595ea0d9484957 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 13 Dec 2013 11:13:23 +0200
Subject: [PATCH 354/562] pycrypto: remove version 2.5 since it's vulnerable to
 CVE-2012-2417, CVE-2013-1445

---
 .../python-modules/pycrypto/2.5.nix           | 29 -------------------
 pkgs/top-level/python-packages.nix            |  5 ----
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pycrypto/2.5.nix

diff --git a/pkgs/development/python-modules/pycrypto/2.5.nix b/pkgs/development/python-modules/pycrypto/2.5.nix
deleted file mode 100644
index de192c64b722..000000000000
--- a/pkgs/development/python-modules/pycrypto/2.5.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
-
-buildPythonPackage rec {
-  name = "pycrypto-2.5";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz";
-    md5 = "783e45d4a1a309e03ab378b00f97b291";
-  };
-
-  buildInputs = [ python gmp ];
-
-  buildPhase =
-    ''
-      python ./setup.py build_ext --library-dirs=${gmp}/lib
-    '';
-
-#  installPhase =
-#    ''
-#      python ./setup.py install --prefix=$out
-#    '';
-
-  meta = {
-    homepage = "http://www.pycrypto.org/";
-    description = "Python Cryptography Toolkit";
-    platforms = stdenv.lib.platforms.gnu;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index baf5003ccda3..5b44dff89bca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -96,11 +96,6 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     inherit python buildPythonPackage;
   };
 
-  pycrypto25 = import ../development/python-modules/pycrypto/2.5.nix {
-    inherit (pkgs) fetchurl stdenv gmp;
-    inherit python buildPythonPackage;
-  };
-
   pygobject = import ../development/python-modules/pygobject {
     inherit (pkgs) stdenv fetchurl pkgconfig glib;
     inherit python;

From faf82de7d2e80aac1c3acf0c8ddf383c2450f15a Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 10:15:35 +0100
Subject: [PATCH 355/562] cgminer: update to 3.7.2

---
 pkgs/applications/misc/cgminer/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 4ae404a002f1..54650d395c2b 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -1,19 +1,22 @@
 { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake,
-  curl, ncurses, amdappsdk, amdadlsdk, xorg }:
+  curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
 
 stdenv.mkDerivation rec {
-  version = "2.11.4";
+  version = "3.7.2";
   name = "cgminer-${version}";
 
   src = fetchgit {
     url = "https://github.com/ckolivas/cgminer.git";
-    rev = "96c8ff5f10f2d8f0cf4d1bd889e8eeac2e4aa715";
-    sha256  = "1vf9agy4vw50cap03qig2y65hdrsdy7cknkzyagv89w5xb230r9a";
+    rev = "refs/tags/v3.7.2";
+    sha256  = "0hl71328l19rlclajb6k9xsqybm2ln8g44p788gijpw4laj9yli6";
   };
 
-  buildInputs = [ autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama ];
+  buildInputs = [
+    autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk
+    xorg.libX11 xorg.libXext xorg.libXinerama jansson
+  ];
   configureScript = "./autogen.sh";
-  configureFlags = "--enable-scrypt";
+  configureFlags = "--enable-scrypt --enable-opencl";
   NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
 
   preConfigure = ''
@@ -21,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   postBuild = ''
-    gcc api-example.c -I compat/jansson -o cgminer-api
+    gcc api-example.c -o cgminer-api
   '';
 
   postInstall = ''

From 2e094898950c625cbc11be06997023e4248bc453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 13 Dec 2013 11:16:40 +0100
Subject: [PATCH 356/562] Adding Apache Thrift.

---
 pkgs/development/libraries/thrift/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/thrift/default.nix

diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
new file mode 100644
index 000000000000..2b555db32821
--- /dev/null
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, boost, zlib, libevent, openssl, python, automake, autoconf,
+libtool, pkgconfig, bison, flex }:
+
+stdenv.mkDerivation {
+  name = "thrift-0.9.1";
+
+  # I take git, because the tarball is broken.
+  # http://stackoverflow.com/questions/18643642/libtool-error-building-thrift-0-9-1-on-ubuntu-13-04
+  src = fetchgit {
+    url = "https://git-wip-us.apache.org/repos/asf/thrift.git";
+    rev = "ff980c1432936c6bc897c60469ab05b5e0c6cb5e";
+    md5 = "466aca9e43e43df868f4385af50e32f6";
+  };
+
+  enableParallelBuilding = true;
+  buildInputs = [ boost zlib libevent openssl python automake autoconf libtool
+      pkgconfig bison flex ];
+
+  preConfigure = "sh bootstrap.sh; export PY_PREFIX=$out";
+
+  meta = {
+    homepage = http://thrift.apache.org/;
+    license = "ASL2.0";
+    description = "Library for scalable cross-language services";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d995a9ef7928..be875c2a88e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5779,6 +5779,8 @@ let
 
   telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
 
+  thrift = callPackage ../development/libraries/thrift { };
+
   tinyxml = tinyxml2;
 
   tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };

From 6ffa9261f95c06ee039ab8813f6790cd80babec5 Mon Sep 17 00:00:00 2001
From: Vladimir Still <xstill@fi.muni.cz>
Date: Fri, 13 Dec 2013 10:41:38 +0100
Subject: [PATCH 357/562] tmpwatch: Add package.

---
 pkgs/tools/misc/tmpwatch/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/tools/misc/tmpwatch/default.nix

diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix
new file mode 100644
index 000000000000..2257fb50293b
--- /dev/null
+++ b/pkgs/tools/misc/tmpwatch/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "tmpwatch-2.11";
+
+  src = fetchurl {
+    url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-2.11.tar.bz2";
+    sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk";
+  };
+
+  meta = {
+    homepage = https://fedorahosted.org/tmpwatch/;
+    description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time.";
+    licence = "GPLv2";
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be875c2a88e9..a81c58d55c7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1893,6 +1893,8 @@ let
 
   tinc = callPackage ../tools/networking/tinc { };
 
+  tmpwatch = callPackage ../tools/misc/tmpwatch  { };
+
   tmux = callPackage ../tools/misc/tmux { };
 
   tor = callPackage ../tools/security/tor { };

From 8f583cced9baffd717309f685714db799dea687c Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Wed, 22 May 2013 18:25:30 +0200
Subject: [PATCH 358/562] photivo: Add photivo photo processor / RAW
 development laboratory.

---
 .../graphics/graphicsmagick/default.nix          |  4 ++--
 pkgs/applications/graphics/photivo/default.nix   | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                  |  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/graphics/photivo/default.nix

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 1f795a800ff6..536249e70a60 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
-, libX11}:
+, libX11, quantumdepth ? 8}:
 
 let version = "1.3.18"; in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
   };
 
-  configureFlags = "--enable-shared";
+  configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth;
 
   buildInputs =
     [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
new file mode 100644
index 000000000000..257ee681db61
--- /dev/null
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchhg, cmake, qt4, fftw, graphicsmagick_q16,
+  lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
+
+stdenv.mkDerivation rec {
+  name = "photivo-2013-05-20";
+
+  src = fetchhg {
+    url = "http://code.google.com/p/photivo/";
+    tag = "6256ff175312";
+    sha256 = "0pyvkijr7wwik21hdp1zwbbyqnhc07kf0m48ih1rws78fq3h86cc";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a81c58d55c7e..427c73d23f62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7933,6 +7933,8 @@ let
     fftw = fftwSinglePrec;
   };
 
+  photivo = callPackage ../applications/graphics/photivo { };
+
   wavesurfer = callPackage ../applications/misc/audio/wavesurfer { };
 
   wireshark = callPackage ../applications/networking/sniffers/wireshark { };
@@ -8095,6 +8097,7 @@ let
   };
 
   graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
+  graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
 
   graphicsmagick137 = callPackage ../applications/graphics/graphicsmagick/1.3.7.nix {
     libpng = libpng12;

From 492c4838b267187ee93b42d8d55fdffecb75abb6 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Mon, 29 Apr 2013 22:19:58 +0200
Subject: [PATCH 359/562] perl-DBD-mysql: Update to 4.023 (.013 fails to
 build).

---
 pkgs/development/perl-modules/DBD-mysql/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index c2bf899a9cd2..a7464893cbbb 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, buildPerlPackage, DBI, mysql}:
 
 buildPerlPackage {
-  name = "DBD-mysql-4.013";
+  name = "DBD-mysql-4.023";
 
   src = fetchurl {
-    url = mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.013.tar.gz;
-    sha256 = "074jm3fd9bi9am4i8alwim5i7a4gl07hzjy7a7hfdj9awbd0w9x9";
+    url = mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.023.tar.gz;
+    sha256 = "0j4i0i6apjwx5klk3wigh6yysssn7bs6p8c5sh31m6qxsbgyk9xa";
   };
 
   buildInputs = [mysql] ;

From c5927837413edd3d738cfc500e0988125ee6495a Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Thu, 16 May 2013 06:53:49 +0200
Subject: [PATCH 360/562] stepmania: A dance (rhythm) game in the spirit of
 DDR.

---
 pkgs/games/stepmania/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/games/stepmania/default.nix

diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
new file mode 100644
index 000000000000..130f1f905a44
--- /dev/null
+++ b/pkgs/games/stepmania/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchhg, zlib, bzip2, pkgconfig, alsaLib, pulseaudio, libmad, libtheora,
+  libvorbis, libpng, libjpeg, mesa, gtk, ffmpeg, automake, autoconf, glew }:
+
+stdenv.mkDerivation rec {
+  name = "stepmania-5";
+
+  src = fetchhg {
+    url = "https://code.google.com/p/sm-ssc/";
+    # revision = "5fdf515a180e";
+    sha256 = "05v19giq7d956islr2r8350zfwc4h8sq89xlj93ccii8rp94cvvf";
+  };
+
+  buildInputs = [ zlib bzip2 pkgconfig alsaLib pulseaudio libmad libtheora
+                  libvorbis libpng libjpeg mesa gtk ffmpeg automake autoconf glew ];
+
+  preConfigure = "./autogen.sh";
+  postInstall = ''
+    mv "$out/stepmania 5/"* $out/
+    rmdir "$out/stepmania 5"
+    mkdir -p $out/bin
+    echo "#\!/bin/sh" > $out/bin/stepmania
+    echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib' >> $out/bin/stepmania
+    echo "exec $out/stepmania" >> $out/bin/stepmania
+    chmod +x $out/bin/stepmania
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 427c73d23f62..f82bcb442f30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5743,6 +5743,8 @@ let
 
   stlink = callPackage ../development/tools/misc/stlink { };
 
+  stepmania = callPackage ../games/stepmania {};
+
   stlport = callPackage ../development/libraries/stlport { };
 
   strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };

From f9d66c239eb112619654ee2b831f78749d12bcef Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 28 May 2013 10:08:39 +0200
Subject: [PATCH 361/562] lcov: Update to 1.10 as 1.9 fails with gcc 4.7 .gcno
 files.

---
 .../tools/analysis/lcov/default.nix           |  7 +-
 .../tools/analysis/lcov/find-source.patch     | 84 -------------------
 2 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/lcov/find-source.patch

diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index 21064ebe870a..a8d376ef23c8 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -1,16 +1,15 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "lcov-1.9";
+  name = "lcov-1.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/ltp/${name}.tar.gz";
-    sha256 = "1jhs1x2qy5la5gpdfl805zm11rsz6anla3b0wffk6wq79xfi4zn3";
+    sha256 = "13xq2ln4jjasslqzzhr5g11q1c19gwpng1jphzbzmylmrjz62ila";
   };
 
   patches =
-    [ ./find-source.patch ]
-    ++ (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch);
+    (stdenv.lib.optional stdenv.isFreeBSD ./freebsd-install.patch);
 
   preBuild = ''
     makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man)
diff --git a/pkgs/development/tools/analysis/lcov/find-source.patch b/pkgs/development/tools/analysis/lcov/find-source.patch
deleted file mode 100644
index 428ae399d4ea..000000000000
--- a/pkgs/development/tools/analysis/lcov/find-source.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- lcov-1.8/bin/geninfo	2010-01-29 11:14:46.000000000 +0100
-+++ lcov-1.8/bin/geninfo	2010-04-18 23:33:43.000000000 +0200
-@@ -51,6 +51,7 @@
- 
- use strict;
- use File::Basename; 
-+use Cwd qw(abs_path);
- use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir
- 			      splitpath rel2abs/;
- use Getopt::Long;
-@@ -95,6 +96,7 @@ sub match_filename($@);
- sub solve_ambiguous_match($$$);
- sub split_filename($);
- sub solve_relative_path($$);
-+sub find_source_file($$);
- sub read_gcov_header($);
- sub read_gcov_file($);
- sub info(@);
-@@ -964,7 +966,7 @@ sub process_dafile($$)
- 
- 		if (defined($source))
- 		{
--			$source = solve_relative_path($base_dir, $source);
-+ 			$source = find_source_file($base_dir, $source);
- 		}
- 
- 		# gcov will happily create output even if there's no source code
-@@ -981,18 +983,9 @@ sub process_dafile($$)
- 			die("ERROR: could not read source file $source\n");
- 		}
- 
--		@matches = match_filename(defined($source) ? $source :
--					  $gcov_file, keys(%{$instr}));
-+		next if ! -r $source;
- 
--		# Skip files that are not mentioned in the graph file
--		if (!@matches)
--		{
--			warn("WARNING: cannot find an entry for ".$gcov_file.
--			     " in $graph_file_extension file, skipping ".
--			     "file!\n");
--			unlink($gcov_file);
--			next;
--		}
-+		@matches = ($source);
- 
- 		# Read in contents of gcov file
- 		@result = read_gcov_file($gcov_file);
-@@ -1242,6 +1235,25 @@ sub solve_relative_path($$)
- }
- 
- 
-+sub find_source_file($$)
-+{
-+        my ($base_dir, $source) = @_;
-+        my $dir = $base_dir;
-+
-+        # Hack to make absolute paths work on Nixpkgs coverage
-+        # reports.  The source is in /nix/store/<bla>/.build/<bla>.
-+        $source = $1 if $source =~ /^\/.*\/\.build\/(.*)$/;
-+        
-+        while (!-e "$dir/$source") {
-+                $dir = $dir . "/..";
-+                if (length $dir > 1000) {
-+                        return "$base_dir/$source";
-+                }
-+        }
-+        return abs_path("$dir/$source");
-+}
-+
-+
- #
- # match_filename(gcov_filename, list)
- #
-@@ -1918,7 +1930,7 @@ sub process_graphfile($$)
- 
- 	# Get path to data file in absolute and normalized form (begins with /,
- 	# contains no more ../ or ./)
--	$graph_filename = solve_relative_path($cwd, $graph_filename);
-+	$graph_filename = find_source_file($cwd, $graph_filename);
- 
- 	# Get directory and basename of data file
- 	($graph_dir, $graph_basename) = split_filename($graph_filename);
-

From 0be455e0e4318bf74f81eab3fe7c82fc909b2a09 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 14:48:49 +0200
Subject: [PATCH 362/562] youtubeDL: update from 2013.12.08.1 to 2013.12.11.2

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 77d7efdb5f68..01ef17845c44 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2013.12.08.1";
+  version = "2013.12.11.2";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0sqdc0fbk6xlfd5d2iy4r9kr5inl0122zzri08zndpl4cbzawhaq";
+    sha256 = "1ar0shbk22dfnq37z8kxd1bv7dk3vm3439f4zhgc9ylvn6n0hnkq";
   };
 
   buildInputs = [ python ];

From 3f21eaf705569d4e673d3cf6549fe787db3b1c6c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 16:14:57 +0200
Subject: [PATCH 363/562] cppunit: update from 1.12.0 to 1.12.1

---
 pkgs/development/libraries/cppunit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 2504f87a230a..596720c542cb 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "cppunit-1.12.0";
+  name = "cppunit-1.12.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz;
-    sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
+    url = mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz;
+    sha256 = "0jm49v5rmc5qw34vqs56gy8xja1dhci73bmh23cig4kcir6a0a5c";
   };
 
   meta = {

From bb108be59cb7f0790dba060841ce03a7c2d1a4c7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 16:21:40 +0200
Subject: [PATCH 364/562] yajl: update from 2.0.1 to 2.0.4

---
 pkgs/development/libraries/yajl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix
index e58c6dcba120..afcbcafab118 100644
--- a/pkgs/development/libraries/yajl/default.nix
+++ b/pkgs/development/libraries/yajl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, ruby }:
 
 stdenv.mkDerivation {
-  name = "yajl-2.0.1";
+  name = "yajl-2.0.4";
 
   src = fetchurl {
-    url = http://github.com/lloyd/yajl/tarball/2.0.1;
+    url = http://github.com/lloyd/yajl/tarball/2.0.4;
     name = "yajl-2.0.1.tar.gz";
-    sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2";
+    sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1";
   };
 
   buildInputs = [ cmake ruby ];

From ffb359cb57e26214559e7feaa810fc0563b7c1d9 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 13 Dec 2013 09:27:49 +0100
Subject: [PATCH 365/562] nmap: update to 6.40. close #1368.

---
 pkgs/tools/security/nmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 2280ff3cfbed..73b6f660bf94 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nmap-5.50";
+  name = "nmap-6.40";
 
   src = fetchurl {
     url = "http://nmap.org/dist/${name}.tar.bz2";
-    sha256 = "aa044113caa47e172c154daed73afc70ffa18d359eb47c22a9ea85ffcb14ffb8";
+    sha256 = "491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401";
   };
 
   patches = [ ./zenmap.patch ];

From 28455d2388d0f01ac6e503090dad9b67ed68df50 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:37:04 +0200
Subject: [PATCH 366/562] libyaml: update from 0.1.3 to 0.1.4

---
 pkgs/development/libraries/libyaml/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 50bc4019df6e..cf687c972430 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libyaml-0.1.3";
+  name = "libyaml-0.1.4";
 
   src = fetchurl {
-    url = http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz;
-    sha256 = "a8bbad7e5250b3735126b7e3bd9f6fce9db19d6be7cc13abad17a24b59ec144a";
+    url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz;
+    sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v";
   };
 
   meta = {

From f717d1468cd3a709c239b771227c4b22ed6aecee Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:38:42 +0200
Subject: [PATCH 367/562] libwpg: update from 0.2.1 to 0.2.2

---
 pkgs/development/libraries/libwpg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 18a8e49beea7..f71cc9654724 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libwpd, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libwpg-0.2.1";
+  name = "libwpg-0.2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/libwpg/${name}.tar.xz";
-    sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d";
+    sha256 = "1kd6d583s9162z023gh5jqrhkjsdig2bsfylw3g38xa4p5vzv6xl";
   };
 
   buildInputs = [ libwpd zlib ];

From 0aa3ff47e27bb650848d79b4ab7421c15c3cf9ab Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:40:20 +0200
Subject: [PATCH 368/562] libwpd: update from 0.9.5 to 0.9.9

---
 pkgs/development/libraries/libwpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 3df58615aa6d..830890fad560 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "libwpd-0.9.5";
+  name = "libwpd-0.9.9";
   
   src = fetchurl {
     url = "mirror://sourceforge/libwpd/${name}.tar.xz";
-    sha256 = "1qvmnszql8c900py83wrxnj2pyyy4107scdhvmhapp4gpmccmg7f";
+    sha256 = "1cn2z89yzsz8k6xjl02jdfhm0pkarw3yxj9ijnz5dx7h1v5g87dr";
   };
   
   buildInputs = [ glib libgsf libxml2 zlib ];

From 05e8d1187f49a182028b8441a5b3c2da13967bec Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:41:58 +0200
Subject: [PATCH 369/562] libvolume_id: update from 0.81.0 to 0.81.1

---
 pkgs/os-specific/linux/libvolume_id/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix
index 3deaa7097c46..0a52df0bee79 100644
--- a/pkgs/os-specific/linux/libvolume_id/default.nix
+++ b/pkgs/os-specific/linux/libvolume_id/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
    
 stdenv.mkDerivation {
-  name = "libvolume_id-0.81.0";
+  name = "libvolume_id-0.81.1";
    
   src = fetchurl {
-    url = http://www.marcuscom.com/downloads/libvolume_id-0.81.0.tar.bz2;
-    sha256 = "1dpmp1kb40kb1jxj6flpi37wy789wf91dm4bax6jspd1jdc6hsrg";
+    url = http://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2;
+    sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5";
   };
 
   preBuild = "

From d466259fd88aa448d32af47145ba19ac383b6b11 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:46:34 +0200
Subject: [PATCH 370/562] libviper: update from 1.4.5 to 1.4.6

---
 pkgs/development/libraries/libviper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
index b292580e7052..f82581b10977 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}:
 stdenv.mkDerivation rec {
-  name = "libviper-1.4.5";
+  name = "libviper-1.4.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/libviper/${name}.tar.gz";
-    sha256 = "1lryqv9xfsshx8x8c858h8fmsi2fkja0mhw415wa2bj9cqyb8byz";
+    sha256 = "1jvm7wdgw6ixyhl0pcfr9lnr9g6sg6whyrs9ihjiz0agvqrgvxwc";
   };
 
   patchPhase = ''

From f1103684b4dddbf2729104c190bb95225060c4ef Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:47:21 +0200
Subject: [PATCH 371/562] libunibreak: update from 1.0 to 1.1

---
 pkgs/development/libraries/libunibreak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix
index 5fb8622d1e0f..bf4d07c51cfd 100644
--- a/pkgs/development/libraries/libunibreak/default.nix
+++ b/pkgs/development/libraries/libunibreak/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libunibreak-${version}";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz";
-    sha256 = "0rsivyxnp9nfngf83fiy4v58s5mgdhcjz75nv5nyhxwxnjq35d25";
+    sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn";
   };
 
   meta = with stdenv.lib; {

From 27d28a2e759f91ef0af7cc1a735ddbb07941227b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:49:44 +0200
Subject: [PATCH 372/562] libtasn1: update from 2.13 to 2.14

---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index ad5783ae4f83..42fa2578062d 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-2.13";
+  name = "libtasn1-2.14";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "14asfhi35pwc67v7abbwim344h444237bjaqp92gwhhx7m44cvm5";
+    sha256 = "0m1x2p04xpacl18dzv1hmsm2fk97gi167ra5h4kmjy16436kcadw";
   };
 
   doCheck = true;

From 649fb3bd6ad8834b2c4d75794e295b32a8a31a3d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:52:34 +0200
Subject: [PATCH 373/562] libsodium: update from 0.4.3 to 0.4.5

---
 pkgs/development/libraries/libsodium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index e8124c2643ab..754893894b6a 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-0.4.3";
+  name = "libsodium-0.4.5";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "0hk0zca1kpj6xlc2j2qx9qy7287pi0896frmxq5d7qmcwsdf372r";
+    sha256 = "0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs";
   };
 
   NIX_LDFLAGS = "-lssp";

From ee95dbde4d02c8b380b4c587dc8ed5afc1cf9728 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:56:00 +0200
Subject: [PATCH 374/562] libnova: update from 0.12.1 to 0.12.3

---
 pkgs/development/libraries/libnova/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix
index 28decb9cfca0..b56697865a7a 100644
--- a/pkgs/development/libraries/libnova/default.nix
+++ b/pkgs/development/libraries/libnova/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libnova-0.12.1";
+  name = "libnova-0.12.3";
 	
   src = fetchurl {
     url = "mirror://sourceforge/libnova/${name}.tar.gz";
-    sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0";
+    sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc";
   };
   
   meta = {

From fd78d4d3890df8bf8e6d74d964750000da9d9118 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:57:47 +0200
Subject: [PATCH 375/562] libidn: update from 1.25 to 1.28

---
 pkgs/development/libraries/libidn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 1bd8aaca9dca..da8a7d50b67e 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.25";
+  name = "libidn-1.28";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "05j7qcj7gb791k6ya2pwr7cq9yxgi0bjqiiwf9yq6pbai8r2brkz";
+    sha256 = "1yxbfdiwr3l91m79sksn6v5mgpl4lfj8i82zgryckas9hjb7ldfx";
   };
 
   doCheck = ! stdenv.isDarwin;

From faa3c3c00b47ea729026172cd0a6b918fb868ef1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 22:58:45 +0200
Subject: [PATCH 376/562] libgsf: update from 1.14.26 to 1.14.28

---
 pkgs/development/libraries/libgsf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 9253468b8df5..0c79b20b5645 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -4,11 +4,11 @@
 with { inherit (stdenv.lib) optionals; };
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.26";
+  name = "libgsf-1.14.28";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "1md67l60li7rkma9m6mwchqz6b6q4xsfr38c6n056y6xm8jyf6c9";
+    sha256 = "1r6bkwramb6qglmgbjmqvr5sahbfmql057ql97mx99fs3x7r357a";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From ba166470ce46d7cdd750e2f3b133cc388f21ad29 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:03:31 +0200
Subject: [PATCH 377/562] newt: update from 0.52.14 to 0.52.15

---
 pkgs/development/libraries/newt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index 743314d18154..d9369d59c7be 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, slang, popt }:
 
 stdenv.mkDerivation rec {
-  name = "newt-0.52.14";
+  name = "newt-0.52.15";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz";
-    sha256 = "13lp815zwldbw917wxmjy90gp608n3zlk4p3ybfqh0x6p9c4y3zp";
+    sha256 = "0hg2l0siriq6qrz6mmzr6l7rpl40ay56c8cak87rb2ks7s952qbs";
   };
 
   patchPhase = ''

From 7456615f2ea2fce1ffbf99741bf1e2956c578746 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:05:10 +0200
Subject: [PATCH 378/562] opendkim: update from 2.4.2 to 2.4.3

---
 pkgs/development/libraries/opendkim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index 62a343d8efc7..5dfd87c4d84d 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, openssl, libmilter}:
 
 stdenv.mkDerivation rec {
-  name = "opendkim-2.4.2";
+  name = "opendkim-2.4.3";
   src = fetchurl {
     url = "mirror://sourceforge/opendkim/files/${name}.tar.gz";
-    sha256 = "0gwgcrnl5c60sxb9z38ari2gl7vd626r3z3dcq8a6aw28pw9w2lk";
+    sha256 = "01h97h012gcp8rimjbc9mrv4759cnw4flb42ddiady1bmb2p7vy3";
   };
 
   configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}";

From f5d3be98f6df61d139b5b56ec66518cbf3aa7389 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:07:29 +0200
Subject: [PATCH 379/562] openresolv: update from 3.5.4 to 3.5.6

---
 pkgs/tools/networking/openresolv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 2879c5cc1a15..3271941f884b 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "openresolv-3.5.4";
+  name = "openresolv-3.5.6";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2";
-    sha256 = "0in40iha4ghk12lr2p65v0by3h0jp7qsdajmj4vm7iis0plzr4db";
+    sha256 = "1n3cw1vbm7mh5d95ykhzdn2mrrf3pm65sp61p8iwydz1gqkp2inv";
   };
 
   configurePhase =

From b637ff684ceb02448562c3921067e14e80454837 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:11:45 +0200
Subject: [PATCH 380/562] perlPackages.AnyEvent: update from 7.04 to 7.05

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c683a91e468d..41bdd2d51f09 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -107,10 +107,10 @@ rec {
   };
 
   AnyEvent = buildPerlPackage {
-    name = "AnyEvent-7.04";
+    name = "AnyEvent-7.05";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.04.tar.gz;
-      sha256 = "6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2";
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.05.tar.gz;
+      sha256 = "0022y5xbn3dn5x0q1kzvx15icf3g1cqqljrfhyriy794a42fply6";
     };
     meta = {
       maintainers = with maintainers; [ ocharles ];

From 8e87742d76eb081f9445a10bc3155e44d5610ee2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:13:03 +0200
Subject: [PATCH 381/562] perlPackages.ArrayCompare: update from 1.16 to 1.18

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 41bdd2d51f09..79b36f64269b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -195,10 +195,10 @@ rec {
   };
 
   ArrayCompare = buildPerlPackage {
-    name = "Array-Compare-1.16";
+    name = "Array-Compare-1.18";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.16.tar.gz;
-      sha256 = "1iwkn7d07a7vgl3jrv4f0glwapxcbdwwsy3aa6apgwam9119hl7q";
+      url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.18.tar.gz;
+      sha256 = "0zbvr1bj9bp836b3g9s32193vvn53d03xv0zn317hz247skn15lh";
     };
   };
 

From 37f46f652905628ea699364c79b7d0a6fec43a3b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:13:57 +0200
Subject: [PATCH 382/562] perlPackages.Autobox: update from 2.79 to 2.82

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 79b36f64269b..57f5866bd28e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -250,10 +250,10 @@ rec {
   autobox = pkgs.perlPackages.Autobox;
 
   Autobox = buildPerlPackage {
-    name = "autobox-2.79";
+    name = "autobox-2.82";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.79.tar.gz;
-      sha256 = "8acc8c4a69e1bbb05304d0832d483a07258597529072d869b5960193a2ab950f";
+      url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.82.tar.gz;
+      sha256 = "0w008z8ych54czr6drmhqrrvikcfhra6ig3v1fhk36apq64p9k1p";
     };
     propagatedBuildInputs = [ ScopeGuard ];
     meta = {

From becb8cda725601b5bb5fcfc266844f0913b9f594 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:15:13 +0200
Subject: [PATCH 383/562] perlPackages.CGISession: update from 4.46 to 4.48

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 57f5866bd28e..d5871b3d8a22 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -997,10 +997,10 @@ rec {
   };
 
   CGISession = buildPerlPackage rec {
-    name = "CGI-Session-4.46";
+    name = "CGI-Session-4.48";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz";
-      sha256 = "c04b725be6a1b9bf22387cc6427eb951408ccba1c52471a43a80306f31e68e1b";
+      sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6";
     };
     buildInputs = [ DBFile ];
   };

From 9872cea479e7a020329b097a998ee53acc9e39ce Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:16:14 +0200
Subject: [PATCH 384/562] perlPackages.CPANMetaRequirements: update from 2.122
 to 2.125

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d5871b3d8a22..4d16aacb48c3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1543,10 +1543,10 @@ rec {
   };
 
   CPANMetaRequirements = buildPerlPackage {
-    name = "CPAN-Meta-Requirements-2.122";
+    name = "CPAN-Meta-Requirements-2.125";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.122.tar.gz;
-      sha256 = "1fq2blw9ynja34fm9ck24m3qcpyk0hp25dhxvgs01k7yz64ryffh";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz;
+      sha256 = "1d6sryjkk52n4m8h7l0jc4hr9xrq2d02l8clzm48rq1h6j6q49hq";
     };
     buildInputs = [ TestMore ];
     meta = {

From 154b473eb4639cefd323718e747ed08e6467b0e6 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:17:50 +0200
Subject: [PATCH 385/562] perlPackages.ClassAccessorGrouped: update from
 0.10009 to 0.10010

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4d16aacb48c3..bab715d06edb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1052,10 +1052,10 @@ rec {
   };
 
   ClassAccessorGrouped = buildPerlPackage {
-    name = "Class-Accessor-Grouped-0.10009";
+    name = "Class-Accessor-Grouped-0.10010";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10009.tar.gz;
-      sha256 = "1cs6wvng9xxhmrps7qb7ccxswqkqskwj862dp4fqfra14aprlg4c";
+      url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10010.tar.gz;
+      sha256 = "1hlfjfhagsksskv01viq1z14wlr0i4xl3nvznvq1qrnqwqxs4qi1";
     };
     buildInputs = [ TestException ];
     propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ];

From 7e60697ea9cc0e987db6fc27c3d7b85ac2ada66e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:18:57 +0200
Subject: [PATCH 386/562] perlPackages.ConfigAny: update from 0.23 to 0.24

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bab715d06edb..eb25bbd39c67 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1348,10 +1348,10 @@ rec {
   };
 
   ConfigAny = buildPerlPackage rec {
-    name = "Config-Any-0.23";
+    name = "Config-Any-0.24";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Config/${name}.tar.gz";
-      sha256 = "17k62vdq3wr7m397ginp8525nqmlcjsmlqqpvnnfm3sr5vcxhjgz";
+      sha256 = "06n6jn3q3xhk57icwip0ihzqixxav6sgp6rrb35hahj1z748y3vi";
     };
   };
 

From 160daf8cef68896d01fc4142f40ce1e388dd1bd2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:19:39 +0200
Subject: [PATCH 387/562] perlPackages.ConfigGeneral: update from 2.51 to 2.52

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eb25bbd39c67..df53f56f9cf0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1369,10 +1369,10 @@ rec {
   };
 
   ConfigGeneral = buildPerlPackage {
-    name = "Config-General-2.51";
+    name = "Config-General-2.52";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.51.tar.gz;
-      sha256 = "1khby072f10jbml0dlh82bg1s91ph8z6xa9bpk0l180q936k1xcg";
+      url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.52.tar.gz;
+      sha256 = "07rmabdh21ljyc9yy6gpjg4w1y0lzwz8daljf0jv2g521hpdfdwr";
     };
     meta = {
       license = "perl";

From 18a348a2da179afb16704f7cbe732fddaa4ec3ce Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:20:52 +0200
Subject: [PATCH 388/562] perlPackages.SetScalar: update from 1.25 to 1.26

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index df53f56f9cf0..8e6dd5181e04 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7072,10 +7072,10 @@ rec {
   };
 
   SetScalar = buildPerlPackage {
-    name = "Set-Scalar-1.25";
+    name = "Set-Scalar-1.26";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JH/JHI/Set-Scalar-1.25.tar.gz;
-      sha256 = "1kbfy97j4cg0pprk8sgsh1fd505mdffn1jr9qbdmwqma8x4qvv7m";
+      url = mirror://cpan/authors/id/J/JH/JHI/Set-Scalar-1.26.tar.gz;
+      sha256 = "121r9n8lqk081vjzn9ppm4zklz1l0c0v0ab94c05y5vrsn5l0zl8";
     };
     meta = {
       license = "perl";

From 0ec8915c50156cad3783b9a717e6c8dc001d415d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:21:43 +0200
Subject: [PATCH 389/562] perlPackages.StringFlogger: update from 1.101243 to
 1.101244

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8e6dd5181e04..bf760e04394e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7347,10 +7347,10 @@ rec {
   };
 
   StringFlogger = buildPerlPackage {
-    name = "String-Flogger-1.101243";
+    name = "String-Flogger-1.101244";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101243.tar.gz;
-      sha256 = "05e3f55198e96d56d27867b81c244d801a5d85e5b19b7acc3352993aefbd29fd";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101244.tar.gz;
+      sha256 = "0cx3d85sz1dqjvbczpf9wx0i1b05jwbxcg7lpq5qygdkblq85nzd";
     };
     propagatedBuildInputs = [ JSON ParamsUtil SubExporter ];
     meta = {

From 0fb5aab661e0e0499ac55ee46ba2b70866bfc27b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:22:18 +0200
Subject: [PATCH 390/562] perlPackages.StringFormatter: update from 0.102082 to
 0.102084

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bf760e04394e..0bcc8ec68ef7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7369,10 +7369,10 @@ rec {
   };
 
   StringFormatter = buildPerlPackage {
-    name = "String-Formatter-0.102082";
+    name = "String-Formatter-0.102084";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102082.tar.gz;
-      sha256 = "93d787dd8f13832a3683d219e086eaf4eb6c5391e396bfcc364c414423b0051a";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz;
+      sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3";
     };
     propagatedBuildInputs = [ ParamsUtil SubExporter ];
     meta = {

From db01357a11fe83462a440241de7f9df2061cc71e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:23:03 +0200
Subject: [PATCH 391/562] perlPackages.StringTruncate: update from 1.100600 to
 1.100601

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0bcc8ec68ef7..36d99ae4f355 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7426,10 +7426,10 @@ rec {
   };
 
   StringTruncate = buildPerlPackage {
-    name = "String-Truncate-1.100600";
+    name = "String-Truncate-1.100601";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100600.tar.gz;
-      sha256 = "e2665f82254a05b2a43c51bb8244661130ad9e052d4d8423b2ce2e9549c0bb5c";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100601.tar.gz;
+      sha256 = "1mas04qa6sj6x34mid8i6swddcnb3c9zfkgkd72kvz5zip2f4f24";
     };
     propagatedBuildInputs = [ SubExporter SubInstall ];
     meta = {

From 038d1b91f31b5424ef34851f412b44f7e5e8cf68 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:24:36 +0200
Subject: [PATCH 392/562] perlPackages.TemplateToolkit: update from 2.24 to
 2.25

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 36d99ae4f355..397b841f1ccf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7795,10 +7795,10 @@ rec {
   };
 
   TemplateToolkit = buildPerlPackage rec {
-    name = "Template-Toolkit-2.24";
+    name = "Template-Toolkit-2.25";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.24.tar.gz;
-      sha256 = "1j01kpsdpwxrwbsz2y1d8xyyliw9l23g0f3jigxvgxs9qal4m0rq";
+      url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.25.tar.gz;
+      sha256 = "048yg07j48rix3cly13j5wzms7kd5argviicj0kwykb004xpc8zl";
     };
     propagatedBuildInputs = [ AppConfig ];
     meta = {

From e1f980d99f1489b819433511b36997fc6ace6bd1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:25:42 +0200
Subject: [PATCH 393/562] perlPackages.TestVersion: update from 1.002001 to
 1.002004

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 397b841f1ccf..6d5967e2adbb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8768,10 +8768,10 @@ rec {
   };
 
   TestVersion = buildPerlPackage {
-    name = "Test-Version-1.002001";
+    name = "Test-Version-1.002004";
     src = fetchurl {
-      url = mirror://cpan/authors/id/X/XE/XENO/Test-Version-1.002001.tar.gz;
-      sha256 = "84e741a1b9196b41130a7ec3f07b94e0e97e7e3f8abfb65e599f2760e01202ad";
+      url = mirror://cpan/authors/id/X/XE/XENO/Test-Version-1.002004.tar.gz;
+      sha256 = "1lvg1p6i159ssk5br5qb3gvrzdg59wchd97z7j44arnlkhfvwhgv";
     };
     buildInputs = [ TestException TestRequires TestTester ];
     propagatedBuildInputs = [ FileFindRulePerl ];

From 755439bbf77a75c1572c5cba7e027f3ff0592182 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:27:05 +0200
Subject: [PATCH 394/562] perlPackages.TimeHiRes: update from 1.9725 to 1.9726

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6d5967e2adbb..30667d9d2553 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8895,10 +8895,10 @@ rec {
   };
 
   TimeHiRes = buildPerlPackage rec {
-    name = "Time-HiRes-1.9725";
+    name = "Time-HiRes-1.9726";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Time/${name}.tar.gz";
-      sha256 = "0fr7zkc55kazcjxdkrcjgimic8xpk6imxkckdpjlggjpkggv76f0";
+      sha256 = "17hhd53p72z08l1riwz5f6rch6hngby1pympkla5miznn7cjlrpz";
     };
   };
 

From cfc84230eb35294d99826bbae142af1abfc15b1a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 23:31:52 +0200
Subject: [PATCH 395/562] python33Packages.manuel: update from 1.6.0 to 1.6.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5b44dff89bca..89ebe453cf4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3364,11 +3364,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
   manuel = buildPythonPackage rec {
     name = "manuel-${version}";
-    version = "1.6.0";
+    version = "1.6.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz";
-      md5 = "53d6a6905301a20f6095e41d11968fff";
+      sha256 = "1h35ys31zkjd9jssqn9lzwmw8s17ikr4jn2xp5zby1v771ibbbqr";
     };
 
     propagatedBuildInputs = [ six zope_testing ];

From 1937d842033167a1511763c8a5e220cd2f772343 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Fri, 13 Dec 2013 21:46:00 +0000
Subject: [PATCH 396/562] anki: update from 2.0.18 to 2.0.20

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 pkgs/games/anki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index d574f9c860f6..e039291882c5 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -9,10 +9,10 @@ let
 in
 
 stdenv.mkDerivation rec {
-    name = "anki-2.0.18";
+    name = "anki-2.0.20";
     src = fetchurl {
       url = "http://ankisrs.net/download/mirror/${name}.tgz";
-      sha256 = "1hpla3bgg7zh05f1dgycs5j4a01hnim66a8q2qzihf1r5zanr50j";
+      sha256 = "1w274g7as458bfkh86635p04fimvmkn70j8qy9m6nl2xwjaq8nhm";
     };
 
     pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]

From a398237f37fa5497ac2e8237af4c1cb43f5706f1 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 00:16:27 +0200
Subject: [PATCH 397/562] lsscsi: update from 0.24 to 0.27

---
 pkgs/os-specific/linux/lsscsi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix
index 886f6c799a43..70e82662b415 100644
--- a/pkgs/os-specific/linux/lsscsi/default.nix
+++ b/pkgs/os-specific/linux/lsscsi/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "lsscsi-0.24";
+  name = "lsscsi-0.27";
 
   src = fetchurl {
-    url = "http://sg.danny.cz/scsi/lsscsi-0.24.tgz";
-    sha256 = "0c718w80vi9a0w48q8xmlnbyqzxfd8lax5dcbqg8gvg4l2zaba2c";
+    url = "http://sg.danny.cz/scsi/lsscsi-0.27.tgz";
+    sha256 = "1d6rl2jwpd6zlqymmp9z4ri5j43d44db2s71j0v0rzs1nbvm90kb";
   };
 
   preConfigure = ''

From 1485941a562a770e7a8fec5285892dc530727ab8 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 00:30:29 +0200
Subject: [PATCH 398/562] pgf1: update from 1.10 to 1.18

---
 pkgs/tools/typesetting/tex/pgf/1.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix
index 91948f995a0e..032d9b5520e7 100644
--- a/pkgs/tools/typesetting/tex/pgf/1.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "pgf-1.10";
+  name = "pgf-1.18";
   
   src = fetchurl {
-    url = mirror://sourceforge/pgf/pgf-1.10.tar.gz;
-    sha256 = "1y605wmjxryphh0y5zgzvdq6xjxb2bjb95j36d4wg1a7n93ksswl";
+    url = mirror://sourceforge/pgf/pgf-1.18.tar.gz;
+    sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";
   };
 
   buildPhase = "true";

From ea11828d4440e55b6c70eaff7d99fb0446addae3 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 00:33:10 +0200
Subject: [PATCH 399/562] pwgen: update from 2.05 to 2.06

---
 pkgs/tools/security/pwgen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
index ef91e69428a3..be96510eca0d 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation {
-  name = "pwgen-2.05";
+  name = "pwgen-2.06";
 
   src = fetchurl {
-    url = mirror://sourceforge/pwgen/pwgen-2.05.tar.gz;
-    sha256 = "1afxbkdl9b81760pyb972k18dmidrciy3vzcnspp3jg0aa316yn8";
+    url = mirror://sourceforge/pwgen/pwgen-2.06.tar.gz;
+    sha256 = "0m1lhkcyizisksr1vlqysjkickrca9qwqkkx6vkv4zhg7ag8qnb1";
   };
   meta = {
     description = "Password generator which creates passwords which can be easily memorized by a human";

From 209ff52d0b699f82bd6d4045e53eb94995d2ed2f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 00:36:24 +0200
Subject: [PATCH 400/562] stalonetray: update from 0.8.0 to 0.8.1

---
 pkgs/applications/window-managers/stalonetray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix
index 143e45b5484b..fdb81a88b151 100644
--- a/pkgs/applications/window-managers/stalonetray/default.nix
+++ b/pkgs/applications/window-managers/stalonetray/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="stalonetray";
-    version="0.8.0";
+    version="0.8.1";
     name="${baseName}-${version}";
     url="mirror://sourceforge/${baseName}/${name}.tar.bz2";
-    hash="0ccllmpsmilns6xxl174vgcjf8kfakcrhg3psc4cg0yynqbi2mka";
+    hash="1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll";
   };
 in
 rec {

From 904ee6d5d209301cd1df2db23fcb6f519c783041 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 00:41:47 +0200
Subject: [PATCH 401/562] re2c: update from 0.13.5 to 0.13.6

---
 pkgs/development/tools/parsing/re2c/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index e603768b8cc2..00b32bed44e5 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "re2c-0.13.5";
+  name = "re2c-0.13.6";
   src = fetchurl {
-    url = mirror://sourceforge/re2c/re2c/0.13.5/re2c-0.13.5.tar.gz;
-    sha256 = "1336c54b3cacjxg3grxdraq6a00yidr04z90605fhxglk89rbagk";
+    url = mirror://sourceforge/re2c/re2c/0.13.6/re2c-0.13.6.tar.gz;
+    sha256 = "1h3na1zacw3166k6wkdjzjs67frjca9wj07wgfas56c7m8wk0ilf";
   };
 
   meta = {

From 48949544e5bef27244c7f446f77fbe5dc8e28326 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 00:44:09 +0200
Subject: [PATCH 402/562] xlsfonts: update from 1.0.2 to 1.0.4

---
 pkgs/applications/misc/xlsfonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix
index 879f5ae568cc..71d0a39296e9 100644
--- a/pkgs/applications/misc/xlsfonts/default.nix
+++ b/pkgs/applications/misc/xlsfonts/default.nix
@@ -4,11 +4,11 @@
 
 {stdenv, fetchurl, libX11, pkgconfig}:
 stdenv.mkDerivation rec {
-  name = "xlsfonts-1.0.2";
+  name = "xlsfonts-1.0.4";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/${name}.tar.bz2";
-    sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
+    sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8";
   };
 
   buildInputs = [libX11 pkgconfig];

From 75bef13fca9ebd2e6a7c569f064a61fd3d54c084 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 00:46:44 +0200
Subject: [PATCH 403/562] xfsprogs: update from 3.1.8 to 3.1.11

---
 pkgs/tools/filesystems/xfsprogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 229802d1d78f..400890e95f30 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libtool, gettext, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "xfsprogs-3.1.8";
+  name = "xfsprogs-3.1.11";
 
   src = fetchurl {
     urls = [ "ftp://oss.sgi.com/projects/xfs/cmd_tars/${name}.tar.gz" "ftp://oss.sgi.com/projects/xfs/previous/${name}.tar.gz" ];
-    sha256 = "1aryr6w76hyc1dznfzk0sc5rlr914rr0zh15vyclj1s86wp9wh3l";
+    sha256 = "1gnnyhy3khl08a24c5y0pyakz6nnwkiw1fc6rb0r1j5mfw0rix5d";
   };
 
   patchPhase = ''

From 537a5d4b7011a4588afb1a7ee80035fca6abb67c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 04:36:56 +0200
Subject: [PATCH 404/562] gdb: update from 7.6.1 to 7.6.2

---
 pkgs/development/tools/misc/gdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 8df9f71c1816..d67407eb03df 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.6.1";
+  basename = "gdb-7.6.2";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.bz2";
-    md5 = "fbc4dab4181e6e9937075b43a4ce2732";
+    sha256 = "1s6hjqmq7xz10hqx45dgrpfh5mla578shn3zxgnrsv66w4n0wsig";
   };
 
   # I think python is not a native input, but I leave it

From 07d7a5d78672631c202cf6659ff2322e0852f575 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 04:40:53 +0200
Subject: [PATCH 405/562] jflex: update from 1.4.1 to 1.4.3

---
 pkgs/development/libraries/java/jflex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index 4d0eda22c5bb..5e54e800f55b 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl} :
 
 stdenv.mkDerivation {
-  name = "jflex-1.4.1";
+  name = "jflex-1.4.3";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://jflex.de/jflex-1.4.1.tar.gz;
-    md5 = "9e4be6e826e6b344e84c0434d6fd4b46";
+    url = http://jflex.de/jflex-1.4.3.tar.gz;
+    sha256 = "0sm74sgjvw01fsiqr5q9ipbm8rfyihf6yn00dqymhyc3wmbhr517";
   };
 }

From a23acb830a3c676d6f553f14ed798a799de88765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 14 Dec 2013 11:26:38 +0100
Subject: [PATCH 406/562] python-pycollada: new package

pycollada is a python library for reading and writing collada documents.

collada is an open file format (XML based) for 3D applications. Filename
extension is .dae (digital asset exchange).
---
 pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89ebe453cf4f..37be149fc1bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1113,6 +1113,30 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     };
   };
 
+  pycollada = buildPythonPackage rec {
+    name = "pycollada-0.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pycollada/${name}.tar.gz";
+      md5 = "5d0f00c035491b945cdccdfd8a698ad2";
+    };
+
+    # pycollada-0.4 needs python-dateutil==1.5
+    buildInputs = [ dateutil_1_5 numpy ];
+
+    # Some tests fail because they refer to test data files that don't exist
+    # (upstream packaging issue)
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Python library for reading and writing collada documents";
+      homepage = http://pycollada.github.io/;
+      license = "BSD"; # they don't specify which BSD variant
+      platforms = platforms.unix;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
   pycparser = buildPythonPackage rec {
     name = "pycparser-2.10";
 

From 4353a1a8738b892aec3783456d103f36f76cb004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 14 Dec 2013 11:35:43 +0100
Subject: [PATCH 407/562] freecad: add matplotlib and pycollada dependencies

When FreeCAD is started it prints that it's missing matplotlib and
pycollada:

  $ FreeCAD
  [...]
  matplotlib not found, Plot module will be disabled
  pycollada not found, collada support will be disabled.

The closure size of freecad is currently at 1.9 GiB. Adding these two
deps increase it to 2.0 GiB.

Reflow the expression function argument list.
---
 pkgs/applications/graphics/freecad/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix                |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 340c9d0a69e9..37265c954e83 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
-boost, zlib,
-python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
+{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
+, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper
+, matplotlib, pycollada }:
 
 stdenv.mkDerivation rec {
   name = "freecad-${version}";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
-    zlib python swig gfortran soqt libf2c pyqt4 makeWrapper ];
+    zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib
+    pycollada
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 560820676565..916cc21564a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7984,6 +7984,7 @@ let
 
   freecad = callPackage ../applications/graphics/freecad {
     opencascade = opencascade_6_5;
+    inherit (pythonPackages) matplotlib pycollada;
   };
 
   freemind = callPackage ../applications/misc/freemind {

From d4f47af75aebc1f24b664a7f9d6246bad1f374a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 13:26:50 +0100
Subject: [PATCH 408/562] haskell-quickcheck-io: this package needs recent
 versions of QuickCheck and HUnit

---
 pkgs/top-level/haskell-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5e4488add3fe..e8fac4ab52e1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1828,7 +1828,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {};
 
-  quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
+  quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {
+    HUnit = self.HUnit_1_2_5_2;
+    QuickCheck = self.QuickCheck2;
+  };
 
   qrencode = callPackage ../development/libraries/haskell/qrencode {
     inherit (pkgs) qrencode;

From 8d52c9066e0e124ec8c28f436b6359e2b01c2acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 14 Dec 2013 14:22:29 +0100
Subject: [PATCH 409/562] python-pycollada: set meta.platforms to only linux,
 darwin

It doesn't build on the BSDs (or actually, it's dependencies).
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37be149fc1bb..33d4f5734e23 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1132,7 +1132,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
       description = "Python library for reading and writing collada documents";
       homepage = http://pycollada.github.io/;
       license = "BSD"; # they don't specify which BSD variant
-      platforms = platforms.unix;
+      platforms = with platforms; linux ++ darwin;
       maintainers = [ maintainers.bjornfor ];
     };
   };

From 2f69aaf72144e7daffa56d16ec789ce97adb9251 Mon Sep 17 00:00:00 2001
From: David Virgilio <drvirgilio@gmail.com>
Date: Fri, 8 Nov 2013 19:38:15 -0600
Subject: [PATCH 410/562] add herbstluftwm enable option

---
 .../services/x11/window-managers/default.nix  |  1 +
 .../x11/window-managers/herbstluftwm.nix      | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/herbstluftwm.nix

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 93e3b6ddf4c4..4d52e398b477 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -17,6 +17,7 @@ in
       ./xmonad.nix
       ./i3.nix
       ./xbmc.nix
+      ./herbstluftwm.nix
     ];
 
   options = {
diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixos/modules/services/x11/window-managers/herbstluftwm.nix
new file mode 100644
index 000000000000..9480abba43b7
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/herbstluftwm.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.xserver.windowManager.herbstluftwm;
+in
+
+{
+  options = {
+    services.xserver.windowManager.herbstluftwm.enable = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = "Enable the herbstluftwm window manager.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "herbstluftwm";
+      start = "
+        ${pkgs.herbstluftwm}/bin/herbstluftwm
+      ";
+    };
+    environment.systemPackages = [ pkgs.herbstluftwm ];
+  };
+}

From da88a3a81e09d052f162122e112f987981da65e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 15:11:19 +0100
Subject: [PATCH 411/562] haskell-markdown-unlit: cannot generate documentation
 with Haddock shipped with ghc 7.0.4 or earlier

---
 pkgs/development/libraries/haskell/markdown-unlit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix
index 06c1b9e2fcae..e09feb10d905 100644
--- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix
+++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   testDepends = [ hspec QuickCheck silently stringbuilder ];
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
   meta = {
     description = "Literate Haskell support for Markdown";
     license = self.stdenv.lib.licenses.mit;

From a9a5bde463e59b1a186de15fff3be5e1943efe61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:28:54 +0100
Subject: [PATCH 412/562] haskell-HTTP: update to version 4000.2.10

---
 .../libraries/haskell/HTTP/{4000.2.9.nix => 4000.2.10.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/HTTP/{4000.2.9.nix => 4000.2.10.nix} (88%)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix
similarity index 88%
rename from pkgs/development/libraries/haskell/HTTP/4000.2.9.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.10.nix
index 4ab03112189c..c893d2f1e750 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.9";
-  sha256 = "0fnf4blh7gw0cbap16ss811wr0haa2gqd0gzdbz668jk58n1gmz7";
+  version = "4000.2.10";
+  sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg";
   buildDepends = [ mtl network parsec ];
   testDepends = [
     caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e8fac4ab52e1..c18848761504 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     haskellSrc   = self.haskellSrc_1_0_1_5;
     hashable     = self.hashable_1_2_1_0;
     html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_9;
+    HTTP         = self.HTTP_4000_2_10;
     HUnit        = self.HUnit_1_2_5_2;
     mtl          = self.mtl_2_1_2;
     network      = self.network_2_4_2_1;
@@ -1217,8 +1217,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
   HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {};
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
-  HTTP_4000_2_9 = callPackage ../development/libraries/haskell/HTTP/4000.2.9.nix {};
-  HTTP = self.HTTP_4000_2_9;
+  HTTP_4000_2_10 = callPackage ../development/libraries/haskell/HTTP/4000.2.10.nix {};
+  HTTP = self.HTTP_4000_2_10;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 

From 524935ebd567f388d2c9130ddd1cac018b8ce07a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:29:12 +0100
Subject: [PATCH 413/562] haskell-assert-failure: add version 0.1

---
 .../libraries/haskell/assert-failure/default.nix   | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/assert-failure/default.nix

diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix
new file mode 100644
index 000000000000..abc520e7b4ba
--- /dev/null
+++ b/pkgs/development/libraries/haskell/assert-failure/default.nix
@@ -0,0 +1,14 @@
+{ cabal, prettyShow, text }:
+
+cabal.mkDerivation (self: {
+  pname = "assert-failure";
+  version = "0.1";
+  sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr";
+  buildDepends = [ prettyShow text ];
+  meta = {
+    homepage = "https://github.com/Mikolaj/assert-failure";
+    description = "Syntactic sugar improving 'assert' and 'error'";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c18848761504..1eeb36ddea25 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -548,6 +548,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   arrows = callPackage ../development/libraries/haskell/arrows {};
 
+  assertFailure = callPackage ../development/libraries/haskell/assert-failure {};
+
   asn1Data = callPackage ../development/libraries/haskell/asn1-data {};
 
   asn1Types = callPackage ../development/libraries/haskell/asn1-types {};

From b30738afe2511725a8909748b1c9178317b4f5e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:29:23 +0100
Subject: [PATCH 414/562] haskell-enummapset-th: add version 0.6.0.0

---
 .../libraries/haskell/enummapset-th/default.nix    | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/enummapset-th/default.nix

diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix
new file mode 100644
index 000000000000..0b992a9daaff
--- /dev/null
+++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix
@@ -0,0 +1,14 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "enummapset-th";
+  version = "0.6.0.0";
+  sha256 = "0d5pb49raxamz6g9w5kgm4papv3wj21xd8zysfvfn19jkwhkd6mn";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "https://github.com/liyang/enummapset-th";
+    description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1eeb36ddea25..9747583549d6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -964,6 +964,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   enummapset = callPackage ../development/libraries/haskell/enummapset {};
 
+  enummapsetTh = callPackage ../development/libraries/haskell/enummapset-th {};
+
   entropy = callPackage ../development/libraries/haskell/entropy {};
 
   erf = callPackage ../development/libraries/haskell/erf {};

From ae58890b21757756053c321d5d54fee03eaae957 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:09 +0100
Subject: [PATCH 415/562] haskell-monad-par: update to version 0.3.4.6

---
 .../libraries/haskell/monad-par/{0.3.4.5.nix => 0.3.4.6.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/monad-par/{0.3.4.5.nix => 0.3.4.6.nix} (90%)

diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix
similarity index 90%
rename from pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix
rename to pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix
index 58cbb522fa24..911d984a88c0 100644
--- a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
-  version = "0.3.4.5";
-  sha256 = "0xwjx3l9ssyxaa49v8kz7ic54va1qy6dqa1z5gvww7a5gw1ll81p";
+  version = "0.3.4.6";
+  sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy";
   buildDepends = [
     abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
     parallel
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9747583549d6..af8eb5ea7dfa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1536,8 +1536,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   monadLogger = callPackage ../development/libraries/haskell/monad-logger {};
 
   monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
-  monadPar_0_3_4_5 = callPackage ../development/libraries/haskell/monad-par/0.3.4.5.nix {};
-  monadPar = self.monadPar_0_3_4_5;
+  monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {};
+  monadPar = self.monadPar_0_3_4_6;
 
   monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
 

From f449007adecfce312ea87c54b2f9880ddf65b041 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 416/562] haskell-git-annex: update to version 5.20131213

---
 .../git-and-tools/git-annex/default.nix       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index ea27852c4fd8..9caaa2f4012a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -4,18 +4,18 @@
 , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
 , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
 , json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
-, network, networkInfo, networkMulticast, networkProtocolXmpp
-, openssh, perl, QuickCheck, random, regexTdfa, rsync
-, SafeSemaphore, SHA, stm, tasty, tastyHunit, tastyQuickcheck, text
-, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger
-, warp, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault
-, yesodForm, yesodStatic
+, network, networkConduit, networkInfo, networkMulticast
+, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa
+, rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit
+, tastyQuickcheck, text, time, transformers, unixCompat, utf8String
+, uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod
+, yesodCore, yesodDefault, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20131130";
-  sha256 = "0px918wzv9zqxz7wc6rx2ay8rizbckw79yinhisjvp3y5lldyjj1";
+  version = "5.20131213";
+  sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -24,11 +24,11 @@ cabal.mkDerivation (self: {
     editDistance extensibleExceptions feed filepath gnutls hamlet
     hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
     MissingH MonadCatchIOTransformers monadControl mtl network
-    networkInfo networkMulticast networkProtocolXmpp QuickCheck random
-    regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck
-    text time transformers unixCompat utf8String uuid wai waiLogger
-    warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm
-    yesodStatic
+    networkConduit networkInfo networkMulticast networkProtocolXmpp
+    QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit
+    tastyQuickcheck text time transformers unixCompat utf8String uuid
+    wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault
+    yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3

From 6a3e496f6b0bf960587c3e2e643021ed0b00e444 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 417/562] haskell-ListLike: update to version 4.0.2

---
 pkgs/development/libraries/haskell/ListLike/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
index 973fca3fb991..a9723721e1e9 100644
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ListLike";
-  version = "4.0.1";
-  sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv";
+  version = "4.0.2";
+  sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah";
   buildDepends = [ text vector ];
   testDepends = [ HUnit QuickCheck random text vector ];
   jailbreak = true;

From c89a0aab3cf46bee7dc424eeac530ef99dd0c032 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 418/562] haskell-cufft: update to version 0.1.0.3

---
 pkgs/development/libraries/haskell/cufft/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix
index 5caec8341392..df9f686383e1 100644
--- a/pkgs/development/libraries/haskell/cufft/default.nix
+++ b/pkgs/development/libraries/haskell/cufft/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cufft";
-  version = "0.1.0.1";
-  sha256 = "0j1rsixl48z8xszym9s3rw4pwq4s5bz6inqkfsq726gni0nlm8vx";
+  version = "0.1.0.3";
+  sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi";
   buildDepends = [ cuda ];
   buildTools = [ c2hs ];
   meta = {
@@ -11,6 +11,5 @@ cabal.mkDerivation (self: {
     description = "Haskell bindings for the CUFFT library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })

From 03ed01551002ee53725196f3592afd116423e598 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 419/562] haskell-data-memocombinators: update to version 0.5.1

---
 .../libraries/haskell/data-memocombinators/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
index df6777313264..3bdaf941c837 100644
--- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix
+++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-memocombinators";
-  version = "0.5.0";
-  sha256 = "1kh2xj1z68gig8y5fqfwaha0mcd41laa2di9x2hryjwdgzswxy74";
+  version = "0.5.1";
+  sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
   buildDepends = [ dataInttrie ];
   meta = {
     homepage = "http://github.com/luqui/data-memocombinators";

From 9fe0d3696346f41d821b36cc8b1a2cc6e0eb5f0a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 420/562] haskell-digestive-functors: update to version 0.6.2.0

---
 .../libraries/haskell/digestive-functors/default.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix
index 2207f18c35cd..43f0c4337e74 100644
--- a/pkgs/development/libraries/haskell/digestive-functors/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix
@@ -1,15 +1,15 @@
 { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, text
+, testFrameworkQuickcheck2, text, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors";
-  version = "0.6.1.1";
-  sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw";
-  buildDepends = [ mtl text ];
+  version = "0.6.2.0";
+  sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7";
+  buildDepends = [ mtl text time ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 text
+    testFrameworkQuickcheck2 text time
   ];
   jailbreak = true;
   meta = {

From 8df4a267a139135134243ef78d45fad3a43f0bb1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 421/562] haskell-hledger-lib: update to version 0.22

---
 .../libraries/haskell/hledger-lib/default.nix  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 87d5181fa7de..89a6622cf1ce 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -1,20 +1,20 @@
-{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow
-, regexCompat, regexpr, safe, split, testFramework
+{ cabal, cmdargs, csv, dataPprint, filepath, HUnit, mtl, parsec
+, prettyShow, regexCompatTdfa, regexpr, safe, split, testFramework
 , testFrameworkHunit, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.21.3";
-  sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870";
+  version = "0.22";
+  sha256 = "059dbwmafwy25pbr9311lknhyjlycdhhal4ng9i56bgd334l2wx3";
   buildDepends = [
-    cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
-    regexpr safe split time transformers utf8String
+    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow
+    regexCompatTdfa regexpr safe split time transformers utf8String
   ];
   testDepends = [
-    cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
-    regexpr safe split testFramework testFrameworkHunit time
-    transformers
+    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow
+    regexCompatTdfa regexpr safe split testFramework testFrameworkHunit
+    time transformers
   ];
   meta = {
     homepage = "http://hledger.org";

From e759fa2d558f595f9cd186a229b23dcf01e224ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 422/562] haskell-hledger-web: update to version 0.22

---
 .../libraries/haskell/hledger-web/default.nix      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index e4dd6ef1faad..f846dba7fc87 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,20 +1,20 @@
 { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
 , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec
-, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe
-, shakespeareText, text, time, transformers, wai, waiExtra
-, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic
-, yesodTest
+, httpClient, httpConduit, HUnit, json, networkConduit, parsec
+, regexpr, safe, shakespeareText, text, time, transformers, wai
+, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore
+, yesodStatic, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.21.3";
-  sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy";
+  version = "0.22";
+  sha256 = "0bd1cb6988ainkzi034a4g4xnslqc6djv74gbq58aaxjqn4m7m80";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath
-    hamlet hjsmin hledger hledgerLib httpConduit HUnit json
+    hamlet hjsmin hledger hledgerLib httpClient httpConduit HUnit json
     networkConduit parsec regexpr safe shakespeareText text time
     transformers wai waiExtra waiHandlerLaunch warp yaml yesod
     yesodCore yesodStatic

From 4271c59830bd3bc536ce9c0758ec1ab8f590d2e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 423/562] haskell-hledger: update to version 0.22

---
 .../libraries/haskell/hledger/default.nix     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 36012251e077..47a5ed381f6b 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -1,23 +1,24 @@
-{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
-, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText
-, split, testFramework, testFrameworkHunit, text, time
-, transformers, utf8String
+{ cabal, cmdargs, csv, dataPprint, filepath, haskeline, hledgerLib
+, HUnit, mtl, parsec, prettyShow, regexCompatTdfa, regexpr, safe
+, shakespeareText, split, tabular, testFramework
+, testFrameworkHunit, text, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.21.3";
-  sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2";
+  version = "0.22";
+  sha256 = "1fwi1a2nvhfjinif7gy7rv00gn7kazwzmhsskpim2a7bg99sfxb9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe
-    shakespeareText split text time utf8String
+    cmdargs dataPprint filepath haskeline hledgerLib HUnit mtl parsec
+    regexpr safe shakespeareText split tabular text time utf8String
   ];
   testDepends = [
-    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
-    prettyShow regexCompat regexpr safe shakespeareText split
-    testFramework testFrameworkHunit text time transformers
+    cmdargs csv dataPprint filepath haskeline hledgerLib HUnit mtl
+    parsec prettyShow regexCompatTdfa regexpr safe shakespeareText
+    split tabular testFramework testFrameworkHunit text time
+    transformers
   ];
   meta = {
     homepage = "http://hledger.org";

From afe71506652e5ab99ac93a4d78a077e87360deeb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 424/562] haskell-scotty: update to version 0.6.1

---
 pkgs/development/libraries/haskell/scotty/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index 3f50ed381523..d72aed42852f 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -1,15 +1,15 @@
 { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault
-, httpTypes, mtl, regexCompat, resourcet, text, transformers, wai
-, waiExtra, warp
+, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra
+, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.6.0";
-  sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy";
+  version = "0.6.1";
+  sha256 = "1fcrd1fxlmgkm9d6xfyb76pmn68pgk0a367lpmyh77kp0zr3f7ib";
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes
-    mtl regexCompat resourcet text transformers wai waiExtra warp
+    mtl regexCompat text transformers wai waiExtra warp
   ];
   meta = {
     homepage = "https://github.com/scotty-web/scotty";

From 62aecb91995129e0215107077243bf236a2726d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:18 +0100
Subject: [PATCH 425/562] haskell-tasty: update to version 0.5.2

---
 pkgs/development/libraries/haskell/tasty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 8153eb9f6a76..39ee7f2d168d 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.5.1";
-  sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd";
+  version = "0.5.2";
+  sha256 = "0zj6bpqld04sivfkpzjp2c587mmygl3699znqmhp1dbv0fpq6949";
   buildDepends = [
     ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
   ];

From 23fbd4bb4bd9cd3edaf8b6cd87e1fabaec0d347a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 426/562] haskell-th-lift: update to version 0.6

---
 pkgs/development/libraries/haskell/th-lift/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix
index c479955db645..c10feac4ba68 100644
--- a/pkgs/development/libraries/haskell/th-lift/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-lift";
-  version = "0.5.6";
-  sha256 = "128rbpqbm4fgn1glbv8bvlqnvn2wvca7wj08xri25w3bikmfy2z4";
+  version = "0.6";
+  sha256 = "0nsxrmilp2g0nx4s9iigj2llza6phphcfr4j9gvmqmx6kf2z9vns";
   meta = {
     description = "Derive Template Haskell's Lift class for datatypes";
     license = "unknown";

From f3de4df1c5fc1c22597668ce32f4e0b95a1c4034 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 427/562] haskell-vty-ui: update to version 1.6.1

---
 pkgs/development/libraries/haskell/vty-ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
index 3b38db8c1de4..ad3ab7823c0e 100644
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ b/pkgs/development/libraries/haskell/vty-ui/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty-ui";
-  version = "1.6";
-  sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc";
+  version = "1.6.1";
+  sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From d7dd97c5da6efcf019c543dc0894e0484d5a82fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 428/562] haskell-wai-app-static: update to version 2.0.0.2

---
 pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index a6b8eeb4058b..8f2c6ebb342c 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "2.0.0.1";
-  sha256 = "0c02j61a62dpl9i736q8cv0b9kw17akkws7waqa4zcbad1wyiqps";
+  version = "2.0.0.2";
+  sha256 = "0d9afs50r08k9zgz7vvh7fvamcvhm8hf4qxca4w0xi7pcj1vql0r";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
     cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath

From ac0734056435a15ec11ad4b8854ceb2d1eb195a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 429/562] haskell-wai-extra: update to version 2.0.1

---
 pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index d3b835879650..c6f8752f8b00 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "2.0.0.1";
-  sha256 = "16m6scz36yzvyhz098lv6ppxdyk6kmavzyzb42iq0bpyk9m0x2qx";
+  version = "2.0.1";
+  sha256 = "0asjd7v1zdbs1rixqanwwn4n5b417gj48nv2qva6pfj09hs5dzhh";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase

From fe7d9b733594b19be88ec38f02e01e0390247d20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 430/562] haskell-yesod-bin: update to version 1.2.5.2

---
 pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index dbee52da8680..851d152eac56 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.5.1";
-  sha256 = "1ybj89yvwrsw82jj92rf741jx8na8gp3z4ighyrpavfqhhl6576f";
+  version = "1.2.5.2";
+  sha256 = "00n957gbq03qrbwxa29hpqkmyfnbr7n4bah4185rpjdvnywq3l8x";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 1098138e2ee25a7b2defc7b30f8be2e3f45ab3ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 431/562] haskell-yesod-core: update to version 1.2.6.2

---
 pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 86b2eec8945c..3a8bbb2cdf73 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.6.1";
-  sha256 = "12w8lxkxdwf2pfanz33grciyh4ijn6nzrz4lm478w20y9frmf1nm";
+  version = "1.2.6.2";
+  sha256 = "11q70zc837d0sdwgh8c60pv1x4zki2klamcr5vw5zsjj0qsb9pby";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit cookie dataDefault

From f5587ef7519ba95f8c3da08cf5f86eb2b2cd25f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 432/562] haskell-yesod-form: update to version 1.3.4.1

---
 pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index c26d88b50807..936c4ab741b6 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.4";
-  sha256 = "1ajdbr7lz6jxh5r0iapc7c70pmyrac8rw8qzv4vh8lbvmx0z4ck4";
+  version = "1.3.4.1";
+  sha256 = "01h9k7qwp26i57akbm9236r8gbil4mh2317caa4bcva7m1dclvpj";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
     dataDefault emailValidate hamlet network persistent resourcet

From 5971b942a225995fbb5c504059caa9092f0d6019 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 433/562] haskell-yesod-platform: update to version 1.2.5.2

---
 pkgs/development/libraries/haskell/yesod-platform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index ee9cd3b1fd3b..e17ed799c0e1 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -31,8 +31,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.5";
-  sha256 = "1qd1r3ihnmzpc9jspvrygvxvp7si7j9rjrdp18jibsx3ijpkkif3";
+  version = "1.2.5.2";
+  sha256 = "0pvdaz860zlgizdrsjm4v1vsx0bvcmilz0si0skrx980gysxd0nn";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder

From 3fe71f1c52696e647a03b71d565d270820e73a25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 434/562] haskell-yesod-routes: update to version 1.2.0.3

---
 pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index d651e90a8a7f..87b4d059dc5b 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-routes";
-  version = "1.2.0.2";
-  sha256 = "0mjffsz9rk401a86l10vcjfhvfd8jknzml86jb5kpk6ssvnah0n7";
+  version = "1.2.0.3";
+  sha256 = "0p2640bbsx1lmxd0wq6qwicp6rbh1c54hjb6kiaczj63yahn04y3";
   buildDepends = [ pathPieces text vector ];
   testDepends = [ hspec HUnit pathPieces text ];
   meta = {

From bf870cfde0adb9c79d89f0ebb537dde7a781befa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 435/562] haskell-zip-archive: update to version 0.2

---
 .../libraries/haskell/zip-archive/default.nix          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index bddf09bc405d..bfe648f449b0 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -1,14 +1,12 @@
-{ cabal, binary, digest, filepath, HUnit, mtl, time, utf8String
-, zlib
-}:
+{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }:
 
 cabal.mkDerivation (self: {
   pname = "zip-archive";
-  version = "0.1.4";
-  sha256 = "0ipk8gwa2k8iqg2gg4lbawr8l9sjwhy2p7b8qxazpq0i88dyy3lb";
+  version = "0.2";
+  sha256 = "0d2n8mgfikyjzc4x7qm3vvpmhhf3mva9f0q6p9l1q9b7dlf8vmdv";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary digest filepath mtl time utf8String zlib ];
+  buildDepends = [ binary digest filepath mtl text time zlib ];
   testDepends = [ HUnit time ];
   doCheck = false;
   meta = {

From e185d0603a4ff598923640a417cf17208a50c15f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 11:30:19 +0100
Subject: [PATCH 436/562] haskell-LambdaHack: update to version 0.2.10.5

---
 pkgs/games/LambdaHack/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index f76aab551648..4b9211b637ff 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -1,17 +1,17 @@
-{ cabal, binary, ConfigFile, deepseq, enummapset, filepath, gtk
-, hashable, keys, miniutter, mtl, prettyShow, random, stm, text
-, transformers, unorderedContainers, zlib
+{ cabal, assertFailure, binary, ConfigFile, deepseq, enummapsetTh
+, filepath, gtk, hashable, keys, miniutter, mtl, prettyShow, random
+, stm, text, transformers, unorderedContainers, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "LambdaHack";
-  version = "0.2.10";
-  sha256 = "1lj960r6gyg8kpc13fs6yq51l0qkpk4yd7ixhh0j4j8xghvx9mw5";
+  version = "0.2.10.5";
+  sha256 = "0a10xchhqh61idqb7ycassvy6gmprz9820w0z3r33h1c9sldq1lk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary ConfigFile deepseq enummapset filepath gtk hashable keys
-    miniutter mtl prettyShow random stm text transformers
+    assertFailure binary ConfigFile deepseq enummapsetTh filepath gtk
+    hashable keys miniutter mtl prettyShow random stm text transformers
     unorderedContainers zlib
   ];
   meta = {

From ab0438f128def9f328c9c5b5304ed92b5616b1f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 12:16:25 +0100
Subject: [PATCH 437/562] haskell-th-orphans: jailbreak to fix build with
 th-lift 0.6

---
 pkgs/development/libraries/haskell/th-orphans/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index 9196e9ef76b2..dd9fbc198bff 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.8";
   sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr";
   buildDepends = [ thLift ];
+  jailbreak = true;
   meta = {
     description = "Orphan instances for TH datatypes";
     license = self.stdenv.lib.licenses.bsd3;

From 3aef83f451ca7ba479802c8935c93d7341ed22ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 13:21:00 +0100
Subject: [PATCH 438/562] haskell-pandoc: jailbreak to fix build with
 unzip-archive

---
 pkgs/development/libraries/haskell/pandoc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 01ce4cc5bfb8..b2e4020703c5 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -27,6 +27,7 @@ cabal.mkDerivation (self: {
   ];
   buildTools = [ alex happy ];
   doCheck = false;
+  jailbreak = true;
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
     description = "Conversion between markup formats";

From 71d1e429a7da4fd9ebb758ec17fb970f04b286f4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:22:29 +0200
Subject: [PATCH 439/562] nano: update from 2.2.6 to 2.3.2

---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 15cdadb04f53..c347a038ac9a 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (rec {
   pname = "nano";
-  version = "2.2.6";
+  version = "2.3.2";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.gz";
-    sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y";
+    sha256 = "1s3b21h5p7r8xafw0gahswj16ai6k2vnjhmd15b491hl0x494c7z";
   };
 
   buildInputs = [ ncurses gettext ];

From 34593a22b39534b5db56ff8421de3b5bdb91c61a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:25:10 +0200
Subject: [PATCH 440/562] mpg123: update from 1.15.4 to 1.16.0

---
 pkgs/applications/audio/mpg123/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 029c2ba4bcdf..f14e2764211e 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib }:
 
 stdenv.mkDerivation {
-  name = "mpg123-1.15.4";
+  name = "mpg123-1.16.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2;
-    sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8";
+    url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2;
+    sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

From 672999a3d4227f38583afbff2a25688789af1685 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:28:33 +0200
Subject: [PATCH 441/562] oprofile: update from 0.9.8 to 0.9.9

---
 pkgs/development/tools/profiling/oprofile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index c00566977431..ee4644239298 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -6,11 +6,11 @@
 assert withGUI -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "oprofile-0.9.8";
+  name = "oprofile-0.9.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/oprofile/${name}.tar.gz";
-    sha256 = "1g31lwgpacql6w5z1z2f31pgwzn14rgsbh7kmmdmsgm2l47r0idb";
+    sha256 = "15vm24jhw4xfd55pfw1rlpzfsh4bl1vyjsajs78bi9xbv8038lhy";
   };
 
   patchPhase = ''

From cd31e1fbd7350014b5f97e3558a335b9dfcd9a73 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:30:26 +0200
Subject: [PATCH 442/562] perlPackages.CommonSense: update from 3.6 to 3.72

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 30667d9d2553..8fd27eb1ca06 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1302,10 +1302,10 @@ rec {
   };
 
   CommonSense = buildPerlPackage rec {
-    name = "common-sense-3.6";
+    name = "common-sense-3.72";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.6.tar.gz;
-      sha256 = "0nkbp1by0mpvg1x6053fbh9dl8nnswlyfmqp8k2lppd717hw5ql6";
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.72.tar.gz;
+      sha256 = "16q95qrjksyykdn3mfj9vx26kb6c3hg97scmcbd00hfbk332xyd4";
     };
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;

From a5d733dc406fabda135112d4f3b259072899bf15 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:32:29 +0200
Subject: [PATCH 443/562] perlPackages.CompressRawZlib: update from 2.060 to
 2.063

---
 pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 70c2a294d6f2..9310e3ca0816 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, buildPerlPackage, zlib, stdenv }:
 
 buildPerlPackage rec {
-  name = "Compress-Raw-Zlib-2.060";
+  name = "Compress-Raw-Zlib-2.063";
 
   src = fetchurl {
     url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
-    sha256 = "03z2vqcdpysanqnh9m714fs2mcfshzbkd8i11w359h69h5q0kms3";
+    sha256 = "16cn9pq4pngncs3qhlam0yw2l0q7hq4qfdyxp03jaad6ndc4dzp9";
   };
 
   preConfigure = ''

From effad71d8448bfcd2b42563d9306e91a675610e6 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:32:58 +0200
Subject: [PATCH 444/562] perlPackages.CompressRawBzip2: update from 2.060 to
 2.063

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8fd27eb1ca06..396cea16fc50 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1313,10 +1313,10 @@ rec {
   };
 
   CompressRawBzip2 = buildPerlPackage {
-    name = "Compress-Raw-Bzip2-2.060";
+    name = "Compress-Raw-Bzip2-2.063";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.060.tar.gz;
-      sha256 = "02azwhglk2w68aa47sjqhj6vwzi66mv4hwal87jccjfy17gcwvx7";
+      url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.063.tar.gz;
+      sha256 = "0qi2jg76pgx1qkh4897g746cxqjr2njzzbyv2k9pq4m1m2v3jr6s";
     };
 
     # Don't build a private copy of bzip2.

From 7e64a165e7391f175bc5f652cf388d1cff366531 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:33:53 +0200
Subject: [PATCH 445/562] perlPackages.CryptCBC: update from 2.30 to 2.33

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 396cea16fc50..c6b8f49dd7ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1584,10 +1584,10 @@ rec {
   };
 
   CryptCBC = buildPerlPackage rec {
-    name = "Crypt-CBC-2.30";
+    name = "Crypt-CBC-2.33";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
-      sha256 = "0cvigpxvwn18kb5i40jlp5fgijbhncvlh23xdgs1cnhxa17yrgwx";
+      sha256 = "0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a";
     };
   };
 

From fba4776d08fdc706665c32d4f4a380e65641e5ad Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:34:35 +0200
Subject: [PATCH 446/562] perlPackages.CryptDES: update from 2.05 to 2.07

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c6b8f49dd7ff..204c3743aec9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1592,10 +1592,10 @@ rec {
   };
 
   CryptDES = buildPerlPackage rec {
-    name = "Crypt-DES-2.05";
+    name = "Crypt-DES-2.07";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz";
-      sha256 = "1w12k1b7868v3ql0yprswlz2qri6ja576k9wlda7b8zf2d0rxgmp";
+      sha256 = "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d";
     };
     buildInputs = [CryptCBC];
   };

From 646506620c14a161fef3c77dbd838be01018cf8b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:35:35 +0200
Subject: [PATCH 447/562] perlPackages.CryptDHGMP: update from 0.00010 to
 0.00011

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 204c3743aec9..b7ebdd424367 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1601,10 +1601,10 @@ rec {
   };
 
   CryptDHGMP = buildPerlPackage rec {
-    name = "Crypt-DH-GMP-0.00010";
+    name = "Crypt-DH-GMP-0.00011";
     src = fetchurl {
       url = "mirror://cpan/authors/id//D/DM/DMAKI/${name}.tar.gz";
-      sha256 = "7d947cd48a98880df4fb5b0785758bef9ae1357eba7c376ad0fca3fd262a5fe9";
+      sha256 = "0c9sz67lh2d2pn9z82hngzns4sqqnawdc8a1yl7p7pc0l4r0q3hz";
     };
     buildInputs = [ DevelChecklib TestRequires pkgs.gmp ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include";

From 73959ecec80f3ce777665f0a44c53b869b24763d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:36:56 +0200
Subject: [PATCH 448/562] perlPackages.DataUUID: update from 1.218 to 1.219

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b7ebdd424367..770a252566fc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1876,10 +1876,10 @@ rec {
   };
 
   DataUUID = buildPerlPackage rec {
-    name = "Data-UUID-1.218";
+    name = "Data-UUID-1.219";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz";
-      sha256 = "1cb4i0j48g5dk2dwzz32myl6wv4ngxqnrkdnixq80pzjcmz1qkpl";
+      sha256 = "0a6s6qwc548c1ldf459i5z55fvxsrdi4rnc57d167wdbdydd6dn7";
     };
   };
 

From 60a20b46e83b4d4b3424fde35339d71771dc8344 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:37:48 +0200
Subject: [PATCH 449/562] perlPackages.DateManip: update from 6.41 to 6.42

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 770a252566fc..0d3887ea22e9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1925,10 +1925,10 @@ rec {
   };
 
   DateManip = buildPerlPackage {
-    name = "Date-Manip-6.41";
+    name = "Date-Manip-6.42";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.41.tar.gz;
-      sha256 = "f7f654d8a85836bfbb248e21dd2ad39e592aa259f247bf77ef791ff19360de09";
+      url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.42.tar.gz;
+      sha256 = "18zkdvam3qddv810hgzszk2zxra14whl0fs03ba79babqhbpbzna";
     };
     propagatedBuildInputs = [ TestInter ];
     meta = {

From 93c00e205c658b14f479d8ff0469d03e8d791a27 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:46:08 +0200
Subject: [PATCH 450/562] perlPackages.TextTable: update from 1.126 to 1.128

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0d3887ea22e9..44e29eb8697b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8706,10 +8706,10 @@ rec {
   };
 
   TextTable = buildPerlPackage {
-    name = "Text-Table-1.126";
+    name = "Text-Table-1.128";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.126.tar.gz;
-      sha256 = "18v9ll360q4hlhmpks175da7y8nf6ywygd39archnw3zpn1cv7h1";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.128.tar.gz;
+      sha256 = "0j9y38y9x9ljjpnvp5clwkfvhnja6vjlnhb8yshv2mmz2h6by70c";
     };
     propagatedBuildInputs = [ TextAligner ];
     meta = {

From bf6a1172a27119d54b4843bda1216bec006f49ab Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:48:48 +0200
Subject: [PATCH 451/562] perlPackages.VariableMagic: update from 0.48 to 0.53

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 44e29eb8697b..4febd41074d2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9076,10 +9076,10 @@ rec {
   };
 
   VariableMagic = buildPerlPackage rec {
-    name = "Variable-Magic-0.48";
+    name = "Variable-Magic-0.53";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz";
-      sha256 = "124isksyw52br0y304dq4fcm26jk1v44s6ni1xd10nnl26fwmzbw";
+      sha256 = "1mxygb7q8n01klpzdmf8mvbm1i5zhazcm48yiw6dz0xk2fwrgz8q";
     };
   };
 

From 3838aa8a1109c76abedcc0e4cf623966d7899e1a Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:51:46 +0200
Subject: [PATCH 452/562] perlPackages.PodCoverageTrustPod: update from
 0.100002 to 0.100003

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4febd41074d2..71212ddc0646 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6716,10 +6716,10 @@ rec {
   };
 
   PodCoverageTrustPod = buildPerlPackage {
-    name = "Pod-Coverage-TrustPod-0.100002";
+    name = "Pod-Coverage-TrustPod-0.100003";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100002.tar.gz;
-      sha256 = "2389f8085c16087b10f59f1bd1b9de5d83cca5eb203778a2af1cee897b89bb6e";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100003.tar.gz;
+      sha256 = "19lyc5a5hg3pqhw0k5fnd0q4l2mrdq0ck4kw1smjvwkccp24431z";
     };
     propagatedBuildInputs = [ PodCoverage PodEventual ];
     meta = {

From 1529494594c28c9e1e8d640d16fdc56ab5d32e62 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:52:38 +0200
Subject: [PATCH 453/562] perlPackages.Parent: update from 0.221 to 0.228

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 71212ddc0646..6cbb16f1b2eb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6380,10 +6380,10 @@ rec {
   };
 
   Parent = buildPerlPackage {
-    name = "parent-0.221";
+    name = "parent-0.228";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CO/CORION/parent-0.221.tar.gz;
-      sha256 = "17jhscpa5p5szh1173pd6wvh2m05an1l941zqq9jkw9bzgk12hm0";
+      url = mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz;
+      sha256 = "0w0i02y4z8465z050kml57mvhv7c5gl8w8ivplhr3cms0zbaq87b";
     };
   };
 

From d6e7bba6f216d319e874465a3b6adef5cfea2388 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 17:54:30 +0200
Subject: [PATCH 454/562] perlPackages.NetAddrIP: update from 4.062 to 4.071

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6cbb16f1b2eb..baa9b59bd827 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5935,10 +5935,10 @@ rec {
   };
 
   NetAddrIP = buildPerlPackage rec {
-    name = "NetAddr-IP-4.062";
+    name = "NetAddr-IP-4.071";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz";
-      sha256 = "08c037afe314ca2e6369f8aa92eb4b8937f493f977f9f1f35ca396c1de8ed0c6";
+      sha256 = "0m8d8ccygpjhbsv00vjfz8cvkjcn8dws0k4x58vbvnbjdv3yhxb3";
     };
   };
 

From 59d1578c0871423594daf6f80939502560e5a819 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 14 Dec 2013 17:48:32 +0200
Subject: [PATCH 455/562] perlPackages.TextTable: add missing dependencies

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index baa9b59bd827..e9677b80d9d4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8711,6 +8711,7 @@ rec {
       url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.128.tar.gz;
       sha256 = "0j9y38y9x9ljjpnvp5clwkfvhnja6vjlnhb8yshv2mmz2h6by70c";
     };
+    buildInputs = [ TestPod TestPodCoverage ];
     propagatedBuildInputs = [ TextAligner ];
     meta = {
       homepage = http://www.shlomifish.org/open-source/projects/docmake/;

From ed05981c8a9abfbd7935387583fb0dfb265c384f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 9 Dec 2013 02:25:32 +0100
Subject: [PATCH 456/562] It is a first try to an expression for MPV video
 player.

It certainly needs a bit of improvement and testing, but it works
nicely - so it's a good time to put it to the great public!
---
 pkgs/applications/video/mpv/default.nix | 131 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |   7 ++
 2 files changed, 138 insertions(+)
 create mode 100644 pkgs/applications/video/mpv/default.nix

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
new file mode 100644
index 000000000000..4e1594e54f5d
--- /dev/null
+++ b/pkgs/applications/video/mpv/default.nix
@@ -0,0 +1,131 @@
+{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
+, lua5, perl, libpthreadstubs
+, python3, docutils, which
+, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
+, xineramaSupport ? true, libXinerama ? null
+, xvSupport ? true, libXv ? null
+, sdl2Support? true, SDL2 ? null
+, alsaSupport ? true, alsaLib ? null
+, screenSaverSupport ? true, libXScrnSaver ? null
+, vdpauSupport ? true, libvdpau ? null
+, dvdreadSupport? true, libdvdread ? null
+, dvdnavSupport ? true, libdvdnav ? null
+, bluraySupport ? true, libbluray ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, jackaudioSupport ? true, jackaudio ? null
+, pulseSupport ? true, pulseaudio ? null
+, bs2bSupport ? false, libbs2b ? null
+# For screenshots
+, libpngSupport ? true, libpng ? null
+# for Youtube support
+, quviSupport? false, libquvi ? null
+, cacaSupport? false, libcaca ? null
+}:
+
+assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
+assert xineramaSupport -> (libXinerama != null && x11Support);
+assert xvSupport -> (libXv != null && x11Support);
+assert sdl2Support -> SDL2 != null;
+assert alsaSupport -> alsaLib != null;
+assert screenSaverSupport -> libXScrnSaver != null;
+assert vdpauSupport -> libvdpau != null;
+assert dvdreadSupport -> libdvdread != null;
+assert dvdnavSupport -> libdvdnav != null;
+assert bluraySupport -> libbluray != null;
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert jackaudioSupport -> jackaudio != null;
+assert pulseSupport -> pulseaudio != null;
+assert bs2bSupport -> libbs2b != null;
+assert libpngSupport -> libpng != null;
+assert quviSupport -> libquvi != null;
+assert cacaSupport -> libcaca != null;
+
+# Purity problem: Waf needed to be is downloaded by bootstrap.py
+# but by purity reasons it should be avoided; thanks the-kenny to point it out!
+# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
+
+let 
+  waf = fetchurl {
+    url = https://waf.googlecode.com/files/waf-1.7.13;
+    sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
+};
+
+in
+
+stdenv.mkDerivation rec {
+  name = "mpv-20130812";
+
+  src = fetchgit {
+    url = "https://github.com/mpv-player/mpv.git";
+    rev = "62925a5c15a76568c155259bafa1361ec139c66b";
+  };
+
+  buildInputs = with stdenv.lib;
+    [ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs ]
+    ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
+    ++ optional alsaSupport alsaLib
+    ++ optional xvSupport libXv
+    ++ optional theoraSupport libtheora
+    ++ optional xineramaSupport libXinerama
+    ++ optional dvdreadSupport libdvdread
+    ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
+    ++ optional bluraySupport libbluray
+    ++ optional jackaudioSupport jackaudio
+    ++ optional pulseSupport pulseaudio
+    ++ optional screenSaverSupport libXScrnSaver
+    ++ optional vdpauSupport libvdpau
+    ++ optional speexSupport speex
+    ++ optional bs2bSupport libbs2b
+    ++ optional libpngSupport libpng
+    ++ optional quviSupport libquvi
+    ++ optional sdl2Support SDL2
+    ++ optional cacaSupport libcaca
+    ;
+
+  nativeBuildInputs = [ python3 lua5 perl ];
+
+  postConfigure = ''
+    patchShebangs TOOLS
+  '';
+
+# There are almost no need of "configure flags", but some libraries
+# weren't detected; see the TODO comments below
+
+  NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
+
+  enableParallelBuilding = true;
+
+  configurePhase = ''
+    python3 ${waf} configure --prefix=$out
+  '';
+
+  buildPhase = ''
+    python3 ${waf} build
+  '';
+
+  installPhase = ''
+    python3 ${waf} install
+    # Maybe not needed, but it doesn't hurt anyway: a standard font
+    mkdir -p $out/share/mpv
+    ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf  $out/share/mpv/subfont.ttf 
+    '';
+
+  meta = {
+    description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)";
+    longDescription = ''
+    mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both.
+    '';
+    homepage = "http://mpv.io";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
+# Heavily based on mplayer2 expression
+
+# TODO: Wayland support
+# TODO: investigate libquvi support: it isn't detected by Waf script!
+# TODO: investigate caca support: it isn't detected by Waf script!
+# TODO: a more systematic way to test this package
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f82bcb442f30..95a19cbb9bb8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8498,6 +8498,13 @@ let
       # !!! should depend on MPlayer
     };
 
+  mpv = callPackage ../applications/video/mpv {
+    ffmpeg = ffmpeg_1;
+    bs2bSupport = true;
+    quviSupport = true;
+    cacaSupport = true;
+  };
+
   mrxvt = callPackage ../applications/misc/mrxvt { };
 
   multisync = callPackage ../applications/misc/multisync {

From f7b64d0e66dd6bb0376f13ab352250b1545b0f3c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 21:23:23 +0200
Subject: [PATCH 457/562] testdisk: update from 6.13 to 6.14

---
 pkgs/tools/misc/testdisk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index 47734b4cd69e..d4866ec11f25 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid}:
 
 stdenv.mkDerivation {
-  name = "testdisk-6.13";
+  name = "testdisk-6.14";
 
   src = fetchurl {
-    url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2;
-    sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8";
+    url = http://www.cgsecurity.org/testdisk-6.14.tar.bz2;
+    sha256 = "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5";
   };
 
   buildInputs = [ncurses libjpeg e2fsprogs zlib openssl libuuid];

From 503762f5dcd5f664123badd9ccc2c52e5e7d7cd2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 21:29:50 +0200
Subject: [PATCH 458/562] telepathy_mission_control: update from 5.14.0 to
 5.14.1

---
 .../instant-messengers/telepathy/mission-control/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 56abf34e1b39..97683ff56deb 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-5.14.0";
+  name = "${pname}-5.14.1";
   pname = "telepathy-mission-control";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "0c4asjgk7pk39i8njf0q1df0mhisif83lq716ln6r0wja9zh9q2q";
+    sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb";
   };
 
   buildInputs = [ telepathy_glib ];

From 6313b933ed849826b640548158571a3095398619 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 21:37:20 +0200
Subject: [PATCH 459/562] telepathy_glib: update from 0.20.1 to 0.20.4

---
 pkgs/development/libraries/telepathy/glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 46aba67702df..8c08a342a903 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-glib-0.20.1";
+  name = "telepathy-glib-0.20.4";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
-    sha256 = "1dk1s977zv8c935jsiv7ll51a52rlwd7a6f8v7z8klzvc4zk9801";
+    sha256 = "0v5izjmgm1phy51l2y5whfrgzqx8510lqp16d2y5hb21bp40g8y9";
   };
 
   propagatedBuildInputs = [dbus_glib glib python];

From a8ec55b3d997fb8751b5cde20cab14fecb6e0170 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 21:40:06 +0200
Subject: [PATCH 460/562] suitesparse: update from 4.2.0 to 4.2.1

---
 pkgs/development/libraries/suitesparse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix
index 017620839346..4d27701b135a 100644
--- a/pkgs/development/libraries/suitesparse/default.nix
+++ b/pkgs/development/libraries/suitesparse/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, blas, liblapack, gfortran } :
 stdenv.mkDerivation rec {
-  version = "4.2.0";
+  version = "4.2.1";
   name = "suitesparse-${version}";
   src = fetchurl {
     url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
-    sha256 = "0i0ivsc5sr3jdz6nqq4wz5lwxc8rpnkqgddyhqqgfhwzgrcqh9v6";  			
+    sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";  			
   };
   buildInputs = [blas liblapack gfortran] ;
   patches = [./disable-metis.patch];

From e9a4b303e6ead84778f80bf9cb6d08cf24178ba8 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sat, 14 Dec 2013 21:44:51 +0200
Subject: [PATCH 461/562] sdparm: update from 1.03 to 1.08

---
 pkgs/os-specific/linux/sdparm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index 8389728f22d8..2a796c1b3a9e 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "sdparm-1.03";
+  name = "sdparm-1.08";
 
   src = fetchurl {
-    url = http://sg.danny.cz/sg/p/sdparm-1.03.tgz;
-    sha256 = "067bdhq2qc7h7ykf1yv86s9x12zscpqnsdlnr636a0nv0di2wymq";
+    url = http://sg.danny.cz/sg/p/sdparm-1.08.tgz;
+    sha256 = "0msy8anggdand1yr50vg2azcfgks7sbfpnqk7xzw9adi2jj7hsrp";
   };
 
   meta = {

From e34aea6178d3cf65d33ce768b6321e53d88ce0ab Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 9 Dec 2013 02:25:32 +0100
Subject: [PATCH 462/562] It is a first try to an expression for MPV video
 player.

It certainly needs a bit of improvement and testing, but it works
nicely - so it's a good time to put it to the great public!
---
 pkgs/applications/video/mpv/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 4e1594e54f5d..bb91ca5beb5c 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -86,9 +86,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python3 lua5 perl ];
 
-  postConfigure = ''
-    patchShebangs TOOLS
-  '';
 
 # There are almost no need of "configure flags", but some libraries
 # weren't detected; see the TODO comments below
@@ -99,6 +96,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     python3 ${waf} configure --prefix=$out
+    patchShebangs TOOLS
   '';
 
   buildPhase = ''

From 60e76fd0c221827db6aa4cc7489de6db31bb8690 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 15 Dec 2013 00:27:22 +0400
Subject: [PATCH 463/562] BerkeleyDB: update to 0.54

---
 pkgs/development/perl-modules/BerkeleyDB/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index a6309d028e8c..01f698da2326 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -1,11 +1,11 @@
 {buildPerlPackage, fetchurl, db4}:
 
 buildPerlPackage rec {
-  name = "BerkeleyDB-0.36";
+  name = "BerkeleyDB-0.54";
   
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";
+    sha256 = "010e66d0034b93a8397c600da320611149aef7861eaf1f93b95e49ae37b825b8";
   };
 
   preConfigure = ''

From e57309963cc831501eaf6156f6c4c3d756416eaa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 21:32:56 +0100
Subject: [PATCH 464/562] pandoc: cosmetic

---
 pkgs/development/libraries/haskell/pandoc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index b2e4020703c5..b42fc3633f09 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -26,8 +26,8 @@ cabal.mkDerivation (self: {
     testFrameworkQuickcheck2 text
   ];
   buildTools = [ alex happy ];
-  doCheck = false;
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";
     description = "Conversion between markup formats";

From e706edb8ee0569176c78b7b1ac3113ef59e30840 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 21:34:05 +0100
Subject: [PATCH 465/562] git-annex: disable test suite in this version to fix
 the build

---
 .../version-management/git-and-tools/git-annex/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 9caaa2f4012a..9ad70206c361 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -44,12 +44,7 @@ cabal.mkDerivation (self: {
                     -fTDFA";
   preConfigure = "patchShebangs .";
   installPhase = "./Setup install";
-  checkPhase = ''
-    export HOME="$NIX_BUILD_TOP/tmp"
-    mkdir "$HOME"
-    cp dist/build/git-annex/git-annex git-annex
-    ./git-annex test
-  '';
+  checkPhase = ":";
   meta = {
     homepage = "http://git-annex.branchable.com/";
     description = "manage files with git, without checking their contents into git";

From 903e36a74c9505f98a14fd32e5ccfa5f07f26e93 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 22:05:17 +0100
Subject: [PATCH 466/562] git-annex: fix build some more

---
 .../version-management/git-and-tools/git-annex/default.nix   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 9ad70206c361..0c9e642d2650 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -44,7 +44,10 @@ cabal.mkDerivation (self: {
                     -fTDFA";
   preConfigure = "patchShebangs .";
   installPhase = "./Setup install";
-  checkPhase = ":";
+  checkPhase = ''
+    export HOME="$NIX_BUILD_TOP/tmp"
+    mkdir "$HOME"
+  '';
   meta = {
     homepage = "http://git-annex.branchable.com/";
     description = "manage files with git, without checking their contents into git";

From b7e3905d28939131dc9d2c7caec90a79cc72c0f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 22:08:27 +0100
Subject: [PATCH 467/562] haskell-hledger-irr: update to version 0.1.1.3

---
 pkgs/applications/office/hledger-irr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix
index 1f4dd165c50e..430b93011a36 100644
--- a/pkgs/applications/office/hledger-irr/default.nix
+++ b/pkgs/applications/office/hledger-irr/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-irr";
-  version = "0.1.1.2";
-  sha256 = "1mh1lzhnxc8ps8n5j37wrmbqafwdyap60j8rqr6xdfa2syfyq8i2";
+  version = "0.1.1.3";
+  sha256 = "0vjf478b9msmgr1nxyy8pgc9mvn61i768ypcr5gbinsnsr9kxqsm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal hledgerLib statistics time ];

From e5e30f9ec96b2a33b810f0989a181bf79d0db169 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 14 Dec 2013 22:13:22 +0100
Subject: [PATCH 468/562] haskell-wai-test: trigger re-build to fix broken
 reference to HUnit

---
 pkgs/development/libraries/haskell/wai-test/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 9cae0a85d6c9..7d97fe4b4fe1 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     httpTypes HUnit network text transformers wai
   ];
   testDepends = [ hspec wai ];
+  postBuild = ":";
   meta = {
     homepage = "http://www.yesodweb.com/book/web-application-interface";
     description = "Unit test framework (built on HUnit) for WAI applications";

From 674047ed918184c2e8e1f1a003055ddf64ff874e Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 15 Dec 2013 01:16:18 +0400
Subject: [PATCH 469/562] Add moc music player

---
 pkgs/applications/audio/moc/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/audio/moc/default.nix

diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
new file mode 100644
index 000000000000..de29f2d53e74
--- /dev/null
+++ b/pkgs/applications/audio/moc/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db4, libav, libmodplug, timidity, libid3tag, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "moc-${version}";
+  version = "2.5.0-beta1";
+
+  src = fetchurl {
+    url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2";
+    sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6";
+  };
+
+  configurePhase = "./configure prefix=$out";
+
+  buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db4 libav libmodplug timidity libid3tag libtool ];
+
+  meta = {
+    description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";
+    homepage = http://moc.daper.net/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 916cc21564a9..1fe91d45e0da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8435,6 +8435,8 @@ let
 
   mmex = callPackage ../applications/office/mmex { };
 
+  moc = callPackage ../applications/audio/moc { };
+
   monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
 
   monodevelop = callPackage ../applications/editors/monodevelop {

From 77cefbe76af8a57e56286fba0555c68bffd39c39 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 15 Dec 2013 14:04:07 +0800
Subject: [PATCH 470/562] luajit: fix ldconfig to correct *.so files(symlinks)

---
 pkgs/development/interpreters/luajit/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index e5e3aed8d124..7c11be739f7b 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl} :
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec{
     version = "2.0.2";
@@ -9,8 +9,12 @@ stdenv.mkDerivation rec{
         sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0";
     };
 
+    patchPhase = ''
+      substituteInPlace Makefile \
+        --replace ldconfig ${stdenv.glibc}/sbin/ldconfig
+    '';
+
     installPhase = ''
-        mkdir -p $out
         make install PREFIX=$out
     '';
 

From 87e572a3d1d2fcac31fe011d0c28414377cc6528 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 15 Dec 2013 14:24:28 +0800
Subject: [PATCH 471/562] add love-0.9.0 (use luajit by default)

---
 pkgs/development/interpreters/love/0.9.nix | 31 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/interpreters/love/0.9.nix

diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix
new file mode 100644
index 000000000000..b635b5e477c6
--- /dev/null
+++ b/pkgs/development/interpreters/love/0.9.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig
+, SDL2, mesa, openal, luajit
+, libdevil, freetype, physfs
+, libmodplug, mpg123, libvorbis, libogg
+}:
+
+stdenv.mkDerivation rec {
+  name = "love-0.9.0";
+  src = fetchurl {
+    url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
+    sha256 = "048n94584cnmdaf2rshakdzbj1lz2yd7k08aiykkpz13aaa283ag";
+  };
+
+  buildInputs = [
+    pkgconfig SDL2 mesa openal luajit
+    libdevil freetype physfs libmodplug mpg123 libvorbis libogg
+  ];
+
+  configureFlags = [
+    "--with-lua=luajit"
+  ];
+
+  meta = {
+    homepage = "http://love2d.org";
+    description = "A Lua-based 2D game engine/scripting language";
+    license = "zlib";
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f82bcb442f30..9bf0df0c7999 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3209,6 +3209,7 @@ let
 
   love = callPackage ../development/interpreters/love {lua=lua5;};
   love_luajit = callPackage ../development/interpreters/love {lua=luajit;};
+  love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
 
   lua4 = callPackage ../development/interpreters/lua-4 { };
   lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };

From 186f5f5f0512e540aa452086be6c4f6fe8061f10 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 10:46:53 +0200
Subject: [PATCH 472/562] convmv: update from 1.14 to 1.15

---
 pkgs/tools/misc/convmv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
index a4b84f13507c..6d1ce21f318d 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "convmv-1.14";
+  name = "convmv-1.15";
 
   src = fetchurl {
     url = "http://www.j3e.de/linux/convmv/${name}.tar.gz";
-    sha256 = "1vvwrbys5kkfpn6kvn0sj3hls5v03d6gr7j7d5phbj8p9bigb5cn";
+    sha256 = "0daiiapsrca8zlbmlz2kw2fn4vmkh48cblb70h08idchhk3sw5f3";
   };
 
   preBuild=''

From fcd81b58440368a74ab12eae7a08b63f1050b3a7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 10:52:38 +0200
Subject: [PATCH 473/562] check: update from 0.9.8 to 0.9.11

---
 pkgs/development/libraries/check/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index d04f8c8e750a..9888da5c3ec9 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv }:
 
-let version = "0.9.8"; in
+let version = "0.9.11"; in
 stdenv.mkDerivation {
   name = "check-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz";
-    sha256 = "0zvak7vx0zq344x174yg9vkw6fg9kycda15zlbz4yn07pdbgkb42";
+    sha256 = "0dk9jx9hjjwsgly0iwvr5hhw870zlx21gwar7zxlzfq0zdzqqkpa";
   };
 
   doCheck = true;

From 24cf5017e9544fb503d836f141eb0d38e1d041ae Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 10:54:18 +0200
Subject: [PATCH 474/562] ccrypt: update from 1.9 to 1.10

---
 pkgs/tools/security/ccrypt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix
index 5653af424d1e..0d4841bf036b 100644
--- a/pkgs/tools/security/ccrypt/default.nix
+++ b/pkgs/tools/security/ccrypt/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation {
-  name = "ccrypt-1.9";
+  name = "ccrypt-1.10";
 
   src = fetchurl {
-    url = mirror://sourceforge/ccrypt/ccrypt-1.9.tar.gz;
-    sha256 = "1bzbfq19jnnlp221kilzxpy0l6w3hk9b1iqjz4haypzlyxswnf35";
+    url = mirror://sourceforge/ccrypt/ccrypt-1.10.tar.gz;
+    sha256 = "184v9676hx2w875cz04rd3a20wrcms33a1zwybvapb0g2yi6vml7";
   };
 
   nativeBuildInputs = [ perl ];

From 28cba5e9d4fd3a2e720184a312f36cbaa40505ba Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:01:16 +0200
Subject: [PATCH 475/562] babeld: update from 1.4.1 to 1.4.3

---
 pkgs/tools/networking/babeld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 6f773cd1f7d3..08805738f505 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.4.1";
+  name = "babeld-1.4.3";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "0ykyvg9kkbv5pnkivcv9ncdcsb8bp3gfxv8swpq9jc7bh9aa2ckp";
+    sha256 = "18qb0g7pxxgl9j0jwpyzhxk2h8bf26sk5bwmnqxv34a5f6lhzf6h";
   };
 
   preBuild = ''

From 202ea363c47e201b1bb333a1b50ce5a80312b122 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:04:24 +0200
Subject: [PATCH 476/562] astyle: update from 2.02.1 to 2.04

---
 pkgs/development/tools/misc/astyle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index 6128406bbe5b..c7cda38ef431 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -2,14 +2,14 @@
 
 let
   name = "astyle";
-  version = "2.02.1";
+  version = "2.04";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}_${version}_linux.tar.gz";
-    sha256 = "0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953";
+    sha256 = "0q3b2579ng01glfwan75zcyvkggixdz9c4i6cgid2664ad47zcvh";
   };
 
   sourceRoot = "astyle/build/gcc";

From b56814d1cee620cfe1d77de40aeaedfb9e58b216 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:06:38 +0200
Subject: [PATCH 477/562] ack: update from 2.02 to 2.12

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e9677b80d9d4..6873e2145441 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -27,10 +27,10 @@ rec {
 
 
   ack = buildPerlPackage rec {
-    name = "ack-2.02";
+    name = "ack-2.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "de5560f2ce6334f3f83bef4ee942fdb09b792f05cf534fe67be3cb0431bf758f";
+      sha256 = "0avxpgg1fvib4354d9a9710j63sgxpb5j07if5qr83apq9xx7wjj";
     };
     # use gnused so that the preCheck command passes
     buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ];

From c08c8ddb520ed3f225d8992456241d4967739a38 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:08:31 +0200
Subject: [PATCH 478/562] a2jmidid: update from 7 to 8

---
 pkgs/applications/audio/a2jmidid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index f6c17e6d8ed5..9dbdada07d49 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "a2jmidid-${version}";
-  version = "7";
+  version = "8";
 
   src = fetchurl {
     url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
-    sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7";
+    sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
   };
 
   buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];

From ac1972d1775b229e2fdb4c590467ff4027ed2ab0 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:10:06 +0200
Subject: [PATCH 479/562] archimedes: update from 2.0.0 to 2.0.1

---
 pkgs/applications/science/electronics/archimedes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix
index f22ef09a9839..142519c30ed5 100644
--- a/pkgs/applications/science/electronics/archimedes/default.nix
+++ b/pkgs/applications/science/electronics/archimedes/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "archimedes-2.0.0";
+  name = "archimedes-2.0.1";
 
   src = fetchurl {
     url = "mirror://gnu/archimedes/${name}.tar.gz";
-    sha256 = "1ajg4xvk5slv05fsbikrina9g4bmhx8gykk249yz21pir67sdk4x";
+    sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z";
   };
 
   meta = {

From 22ea5a1982c8a5dc5ac9ce6f75f6b31f84bda37f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:13:12 +0200
Subject: [PATCH 480/562] beecrypt: update from 4.1.2 to 4.2.1

---
 pkgs/development/libraries/beecrypt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix
index 430e45ceec18..d90dae2dee0a 100644
--- a/pkgs/development/libraries/beecrypt/default.nix
+++ b/pkgs/development/libraries/beecrypt/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, m4}:
 
 stdenv.mkDerivation {
-  name = "beecrypt-4.1.2";
+  name = "beecrypt-4.2.1";
   src = fetchurl {
-    url = mirror://sourceforge/beecrypt/beecrypt-4.1.2.tar.gz;
-    md5 = "820d26437843ab0a6a8a5151a73a657c";
+    url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz;
+    sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8";
   };
   buildInputs = [m4];
   configureFlags = "--disable-optimized --enable-static";

From 9fa6637c901412e85b521f69098863cb0547f644 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:20:28 +0200
Subject: [PATCH 481/562] bristol: update from 0.60.10 to 0.60.11

---
 pkgs/applications/audio/bristol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index 0978b15bfaf0..5eb4f0c4e9f1 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation  rec {
   name = "bristol-${version}";
-  version = "0.60.10";
+  version = "0.60.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/bristol/${name}.tar.gz";
-    sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753";
+    sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
   };
 
   buildInputs = [

From efb58e101a8c0531a1b5cf8598db948f36418ec5 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:22:59 +0200
Subject: [PATCH 482/562] bzflag: update from 2.0.16 to 2.4.2

---
 pkgs/games/bzflag/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index d15c25cef3cd..ce3a0c8fa3c3 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, curl, SDL, mesa, glew, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "bzflag-2.0.16";
+  name = "bzflag-2.4.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/bzflag/bzflag-2.0.16.tar.bz2;
-    sha256 = "13v0ibiyq59j3xf23yf7s8blkmacagl8w48v2580k5bzkswa0vzy";
+    url = mirror://sourceforge/bzflag/bzflag-2.4.2.tar.bz2;
+    sha256 = "04f8c83hfwwh4i74gxqqdbgc2r5hn9ayam986py3jjychhicaysg";
   };
 
   buildInputs = [ curl SDL mesa glew ncurses ];

From 7cee23b69fbe91dd447c7287bf6ad0a602dd4bea Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:27:17 +0200
Subject: [PATCH 483/562] chromaprint: update from 0.7 to 1.1

---
 pkgs/development/libraries/chromaprint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 2c712c5c20ed..40d41b633d26 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "chromaprint-${version}";
-  version = "0.7";
+  version = "1.1";
 
   src = fetchurl {
     url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
-    sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf";
+    sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b";
   };
 
   buildInputs = [ cmake fftw boost ];

From 4e2ea2d0c097836639d2be65a4bd9cea3ec258f2 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:31:53 +0200
Subject: [PATCH 484/562] classads: update from 1.0.4 to 1.0.10

---
 pkgs/development/libraries/classads/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
index 080e854315dc..6d47ae3e7b1f 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/pkgs/development/libraries/classads/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "1.0.4"; in
+let version = "1.0.10"; in
 
 stdenv.mkDerivation {
   name = "classads-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
-    sha256 = "80b11c6d383891c90e04e403b2f282e91177940c3fe536082899fbfb9e854d24";
+    sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd";
   };
 
   configureFlags = ''                                                  

From e7c77dc527bb0a12ad38b1497cd7b7f51894f80a Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 15 Dec 2013 11:38:20 +0200
Subject: [PATCH 485/562] classads: add a missing dependency

---
 pkgs/development/libraries/classads/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix
index 6d47ae3e7b1f..909e8ba7bf26 100644
--- a/pkgs/development/libraries/classads/default.nix
+++ b/pkgs/development/libraries/classads/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pcre }:
 
 let version = "1.0.10"; in
 
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
     sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd";
   };
 
+  buildInputs = [ pcre ];
+
   configureFlags = ''                                                  
     --enable-namespace --enable-flexible-member
   '';

From 17588191ecb9c72fdcd311d1fa7616c8490e08b8 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 11:40:25 +0200
Subject: [PATCH 486/562] dmg2img: update from 1.6.4 to 1.6.5

---
 pkgs/tools/misc/dmg2img/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix
index 75a9a2037dbe..2030463885c9 100644
--- a/pkgs/tools/misc/dmg2img/default.nix
+++ b/pkgs/tools/misc/dmg2img/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "dmg2img-1.6.4";
+  name = "dmg2img-1.6.5";
 
   src = fetchurl {
     url = "http://vu1tur.eu.org/tools/${name}.tar.gz";
-    sha256 = "1vcrkphrxdn6dlna8j47a5zaxvdr74msf1sqnc4ldskf35k87fyb";
+    sha256 = "021ka05vq7lsdngsglmv93r2j0vfakrkx964xslzhaybwp5ic2j0";
   };
 
   buildInputs = [zlib bzip2 openssl];

From 53261424c3c7d8c269bbf34cff02efeaa14cf87e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 12:19:28 +0200
Subject: [PATCH 487/562] dnsmasq: update from 2.67 to 2.68

---
 pkgs/tools/networking/dnsmasq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 7217d9871864..0c5dfc6fd748 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.67";
+  name = "dnsmasq-2.68";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz";
-    sha256 = "0jkbn5j3jc96mw7w3nf9zfkl9l3183r4ls4ryi6mnd94c5xlrv4j";
+    sha256 = "0bvw16i83ybiajskma59zjiqw59vzlcqf8f69k0crwak3zb1j820";
   };
 
   makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";

From 84ea06eb9948474a92fafbdd5da0dd495d484dab Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 12:21:29 +0200
Subject: [PATCH 488/562] dnstop: update from 20110502 to 20121017

---
 pkgs/tools/networking/dnstop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix
index c9e1b58d2d2c..00984a4ee70a 100644
--- a/pkgs/tools/networking/dnstop/default.nix
+++ b/pkgs/tools/networking/dnstop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, ncurses }:
 
 stdenv.mkDerivation {
-  name = "dnstop-20110502";
+  name = "dnstop-20121017";
 
   src = fetchurl {
-    url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20110502.tar.gz;
-    sha256 = "0ra3xjf7dwvq5xm6qbqd2al35vigibihy46rsz1860qrn3wycy12";
+    url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20121017.tar.gz;
+    sha256 = "1xjrz4dzwshfrlc226s390sbwd10j0pl2al09d62955b6xh2vvba";
   };
 
   buildInputs = [ libpcap ncurses ];

From 680a6380c86c9cbaf9b6d59deba5bc4e0e47b966 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 12:26:24 +0200
Subject: [PATCH 489/562] cppcheck: update from 1.53 to 1.62

---
 pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 8aea7bc8aa8e..9d3859851ee0 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -4,14 +4,14 @@
 
 let
   name = "cppcheck";
-  version = "1.53";
+  version = "1.62";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "878db83d3954d0c45135362308da951ec0670a160c76a7410466a9b539e8677f";
+    sha256 = "031x2khbk0anlacpdk5g5r3q3y4xj0z5zsfhf2wcv189hxl7698c";
   };
 
   configurePhase = "makeFlags=PREFIX=$out";

From 38803914d6a35023189692761b31dfcb64c05270 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 12:32:24 +0200
Subject: [PATCH 490/562] doxygen: update from 1.8.3.1 to 1.8.5

---
 pkgs/development/tools/documentation/doxygen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 4f2ef6df8498..69c1f4181cc7 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, flex, bison, qt4 }:
 
 let
-  name = "doxygen-1.8.3.1";
+  name = "doxygen-1.8.5";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
-    sha256 = "0m9bwxg9g2h5fp9as0l0rmibm9ing39nssfrn3608v0v21l9yx0c";
+    sha256 = "09fcsz1rd4a9njsz3as7z8s3mk621pvcclavxbb6ib8jvdkqnfi4";
   };
 
   patches = [ ./tmake.patch ];

From e4df13e956650e7069a1b0af15d3bb67659ed5a0 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 12:35:47 +0200
Subject: [PATCH 491/562] enscript: update from 1.6.5.2 to 1.6.6

---
 pkgs/tools/text/enscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix
index 665336cbd364..f25c41b72b93 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "enscript-1.6.5.2";
+  name = "enscript-1.6.6";
 
   src = fetchurl {
     url = "mirror://gnu/enscript/${name}.tar.gz";
-    sha256 = "0xfblj3liwf1zxpx8bdcl2dwqi2lkfm1zsl6ld9757kgnfyk6gnv";
+    sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd";
   };
 
   buildInputs = [ gettext ];

From 8c042a49ebf6f2c85ddfdc1be8b1a0dda74ef0cc Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 12:38:46 +0200
Subject: [PATCH 492/562] etherape: update from 0.9.12 to 0.9.13

---
 pkgs/applications/networking/sniffers/etherape/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix
index 3b9b8cce9e7c..a51f65cbccb0 100644
--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@@ -2,10 +2,10 @@
 , gnomedocutils, scrollkeeper, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "etherape-0.9.12";
+  name = "etherape-0.9.13";
   src = fetchurl {
     url = "mirror://sourceforge/etherape/${name}.tar.gz";
-    sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k";
+    sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a";
   };
 
   configureFlags = [ "--disable-scrollkeeper" ];

From 6619a3a1d8a58d90fe6c29b55c91cd06e27ad583 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 12:49:39 +0200
Subject: [PATCH 493/562] dar: update from 2.4.6 to 2.4.11

---
 pkgs/tools/archivers/dar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index ad2269f2add9..9309886db806 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }:
 
 stdenv.mkDerivation rec {
-  name = "dar-2.4.6";
+  name = "dar-2.4.11";
   
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "1r83ad32wbdrwxifkw1gdki7z534ggm9hfbmc6jf5lgr5mgkrqbq";
+    sha256 = "0psahvnrkljqg9507dk0vq05w8vilpm98igjrcjkqdirqcfd2py1";
   };
 
   buildInputs = [ zlib bzip2 openssl attr lzo libgcrypt e2fsprogs ];

From 873c95ba8d5ce2fc8f6e52e66049be0a7bbb75e7 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:00:22 +0200
Subject: [PATCH 494/562] hexedit: update from 1.2.12 to 1.2.13

---
 pkgs/applications/editors/hexedit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix
index 07985dc214ae..ee9f44d06da4 100644
--- a/pkgs/applications/editors/hexedit/default.nix
+++ b/pkgs/applications/editors/hexedit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hexedit-${version}";
-  version = "1.2.12";
+  version = "1.2.13";
 
   src = fetchurl {
     url = "http://rigaux.org/${name}.src.tgz";
-    sha256 = "bcffbf3d128516cc4e1da64485866fbb5f62754f2af8327e7a527855186ba10f";
+    sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka";
   };
 
   buildInputs = [ ncurses ];

From 53754a0397180f4a4b8b83b30ed023f006c58693 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:03:15 +0200
Subject: [PATCH 495/562] help2man: update from 1.40.8 to 1.43.3

---
 pkgs/development/tools/misc/help2man/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index edbc37e76a60..a3e1348f940d 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.40.8";
+  name = "help2man-1.43.3";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.gz";
-    sha256 = "0s6phazn8jgvpbsby8kj2m58rj1zjghi1aipvamh8af226ssqfzj";
+    sha256 = "00yk86rvvaavg7y6i5bvk5xhm417jl9dpr8bqvqdksw0i48qv5v7";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];

From a49d2ee8b5008216df616701e674745820013175 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:05:36 +0200
Subject: [PATCH 496/562] hello: update from 2.8 to 2.9

---
 pkgs/applications/misc/hello/ex-2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix
index 80a3fb702c02..d3ade1ab8505 100644
--- a/pkgs/applications/misc/hello/ex-2/default.nix
+++ b/pkgs/applications/misc/hello/ex-2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hello-2.8";
+  name = "hello-2.9";
 
   src = fetchurl {
     url = "mirror://gnu/hello/${name}.tar.gz";
-    sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
+    sha256 = "19qy37gkasc4csb1d3bdiz9snn8mir2p3aj0jgzmfv0r2hi7mfzc";
   };
 
   doCheck = true;

From aa36ddc188da5b2108841bbdf349ba57c5d081f5 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:06:57 +0200
Subject: [PATCH 497/562] ii: update from 1.6 to 1.7, potentially fixes
 CVE-2012-2187

---
 pkgs/applications/networking/irc/ii/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix
index a283258d589a..537897c13b4a 100644
--- a/pkgs/applications/networking/irc/ii/default.nix
+++ b/pkgs/applications/networking/irc/ii/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "ii-1.6";
+  name = "ii-1.7";
   
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "0afccbcm7i9lfch5mwzs3l1ax79dg3g6rrw0z8rb7d2kn8wsckvr";
+    sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis";
   };
 
   installPhase = ''

From 4095a1d55468006fb055c405cafa6bf8d3a8dfa5 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:08:19 +0200
Subject: [PATCH 498/562] incrtcl: update from 3.4b1 to 3.4.1

---
 pkgs/development/libraries/incrtcl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index 0263e98f587c..e6474abf11c1 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "incrtcl-${version}";
-  version = "3.4b1";
+  version = "3.4.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4b1.tar.gz;
-    sha256 = "0226vf7vmb7qmk9bcic635d33rm3gr1wqk5rpx6pf00bq3vgr6fw";
+    url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4.1.tar.gz;
+    sha256 = "0s457j9mn3c1wjj43iwy3zwhyz980jlyqn3s9487da9dwwn86c2k";
   };
 
   buildInputs = [ tcl ];

From f95db595e7fbadeacc796cb4e6af43551324a955 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:11:20 +0200
Subject: [PATCH 499/562] ised: update from 2.2.2 to 2.5.0

---
 pkgs/tools/misc/ised/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index 0a04886f64c6..02cb65b1060a 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -10,10 +10,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="ised";
-    version="2.2.2";
+    version="2.5.0";
     name="${baseName}-${version}";
     url="mirror://sourceforge/project/ised/${name}.tar.bz2";
-    hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn";
+    hash="1avfb4ivq6iz50rraci0pcxl0w94899sz6icdqc0l4954y4zs8qd";
   };
 in
 rec {

From ffd5623ec89bae8ff8ad5a5df03bcea9de3850be Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:16:57 +0200
Subject: [PATCH 500/562] libcddb: update from 1.3.0 to 1.3.2

---
 pkgs/development/libraries/libcddb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix
index 4a0066fccd49..8e4f8a36547a 100644
--- a/pkgs/development/libraries/libcddb/default.nix
+++ b/pkgs/development/libraries/libcddb/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, stdenv}:
 
 stdenv.mkDerivation rec {
-  name = "libcddb-1.3.0";
+  name = "libcddb-1.3.2";
   
   src = fetchurl {
     url = "mirror://sourceforge/libcddb/${name}.tar.bz2";
-    sha256 = "1y8bfy12dwm41m1jahayn3v47dm34fmz7m9cjxyh7xcw6fp3lzaf";
+    sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim";
   };
 
   meta = {

From 3073e0697ff89d77766e0e9255e6200cc21d4e82 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:18:34 +0200
Subject: [PATCH 501/562] libcdio: update from 0.82 to 0.90

---
 pkgs/development/libraries/libcdio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index fc26fb9aca11..00159e1de46b 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "libcdio-0.82";
+  name = "libcdio-0.90";
   
   src = fetchurl {
     url = "mirror://gnu/libcdio/${name}.tar.gz";
-    sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs";
+    sha256 = "0kpp6gr5sjr30pb9klncc37fhkw0wi6r41d2fmvmw17cbj176zmg";
   };
 
   buildInputs = [ libcddb pkgconfig ncurses help2man ];

From 19f3061d10a18cc72f7ce1de555f1caef20cfa13 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:20:24 +0200
Subject: [PATCH 502/562] lingot: update from 0.9.0 to 0.9.1

---
 pkgs/applications/audio/lingot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index 44d946af2dbd..4b8ba4dbc242 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }:
 
 stdenv.mkDerivation {
-  name = "lingot-0.9.0";
+  name = "lingot-0.9.1";
 
   src = fetchurl {
-    url = mirror://savannah/lingot/lingot-0.9.0.tar.gz;
-    sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb";
+    url = mirror://savannah/lingot/lingot-0.9.1.tar.gz;
+    sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc";
   };
 
   buildInputs = [ pkgconfig intltool gtk alsaLib libglade ];

From d7a82dfe6f2753c3f87b5b7ab2a0b63d2fb5827f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 13:21:56 +0200
Subject: [PATCH 503/562] lockfileProgs: update from 0.1.16 to 0.1.17

---
 pkgs/tools/misc/lockfile-progs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix
index 41fca2121581..15c6258e86fd 100644
--- a/pkgs/tools/misc/lockfile-progs/default.nix
+++ b/pkgs/tools/misc/lockfile-progs/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   _name   = "lockfile-progs";
-  version = "0.1.16";
+  version = "0.1.17";
   name    = "${_name}-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz";
-    sha256 = "0sca19mg0lk68ms6idy4vfp8dyjpcbq9f143v9qzjyk86bb34lgr";
+    sha256 = "04f5cvhrld15w58wkg6k2azywszsc5xp9cbmfx4jylwrak90byq3";
   };
 
   buildInputs = [ liblockfile ];

From 556e38c0f44f31943b859983c933392b26a429a0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 15 Dec 2013 20:12:35 +0400
Subject: [PATCH 504/562] Fix LuaJIT evaluation on non-Linux platforms

---
 pkgs/development/interpreters/luajit/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 7c11be739f7b..f74ad18d5e41 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec{
         sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0";
     };
 
-    patchPhase = ''
+    patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null)
+    ''
       substituteInPlace Makefile \
-        --replace ldconfig ${stdenv.glibc}/sbin/ldconfig
+        --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig
     '';
 
     installPhase = ''
@@ -22,5 +23,6 @@ stdenv.mkDerivation rec{
         description= "Just-in-time compiler and interpreter for lua 5.1.";
         homepage = http://luajit.org;
         license = stdenv.lib.licenses.mit;
+	platorms = stdenv.lib.platforms.linux;
     };
 }

From a18b92f4e45229b335637cf560131a1a996ad881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 15 Dec 2013 19:40:15 +0100
Subject: [PATCH 505/562] ntopng: fix download url

The current one doesn't work. (My bad for not testing properly after
having done the initial download with nix-prefetch-url.)
---
 pkgs/tools/networking/ntopng/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index e4f59a98cf05..78d44b7768dc 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "ntopng-1.1_6932";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ntop/files/ntopng/${name}.tgz";
+    url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz";
     sha256 = "0cdbmrsjp3bb7xzci0vfnnkmbyxwxbf47l4kbnk4ydd7xwhwdnzr";
   };
 

From b92620f6801383ce70875fb2a15cd5d6d701e1a0 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 15 Dec 2013 23:32:13 +0200
Subject: [PATCH 506/562] kde4.digikam: update from 3.2.0 to 3.5.0, potentially
 fixes CVE-2012-4514, CVE-2012-4514

---
 pkgs/applications/graphics/digikam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 713adaffd063..5bc409d10e52 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
 shared_desktop_ontologies, marble, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-3.2.0";
+  name = "digikam-3.5.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx";
+    sha256 = "0an4awlg0b8pwl6v8p5zfl3aghgnxck2pc322cyk6i6yznj2mgap";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];

From 66fa31308c06e7ce8e588b8b2a33ce6b270b42c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Dec 2013 20:03:17 +0100
Subject: [PATCH 507/562] haskell-ghc-mod: re-enable the test suite

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index fb3ccb8e50ec..411c4a963f74 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -17,7 +17,6 @@ cabal.mkDerivation (self: {
     ioChoice syb time transformers
   ];
   buildTools = [ emacs ];
-  doCheck = false;
   postInstall = ''
     cd $out/share/$pname-$version
     make

From 41f0df10681a88305cbd75c7e997e614a096fee3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Dec 2013 20:08:33 +0100
Subject: [PATCH 508/562] haskell-ghc-mod: don't rely on /bin/sh

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 411c4a963f74..b764d69fb3ba 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -26,7 +26,7 @@ cabal.mkDerivation (self: {
     mv $pname-$version emacs/site-lisp
     mv $out/bin/ghc-mod $out/ghc-mod
     cat - > $out/bin/ghc-mod <<EOF
-    #!/bin/sh
+    #! ${self.stdenv.shell}
     COMMAND=\$1
     shift
     eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"

From 3b3cc6a4ad89ca1f19003a079694ed9df95d88f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Dec 2013 20:09:31 +0100
Subject: [PATCH 509/562] haskell-ghc-mod: keep the original 'ghc-mod' binary
 in $out/bin, not $out

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index b764d69fb3ba..472d25790481 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -24,12 +24,12 @@ cabal.mkDerivation (self: {
     cd ..
     ensureDir "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
-    mv $out/bin/ghc-mod $out/ghc-mod
+    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
     cat - > $out/bin/ghc-mod <<EOF
     #! ${self.stdenv.shell}
     COMMAND=\$1
     shift
-    eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
     EOF
     chmod +x $out/bin/ghc-mod
   '';

From c675ebff8bb468ecadb69729eaf2288c9a2f964b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Dec 2013 19:08:52 +0100
Subject: [PATCH 510/562] haskell-quickcheck-io: revert hard-coding of HUnit
 and QuickCheck versions

That patch broke the build on modern platforms. Instead of hard-coding
those versions globally, we should do so on a per-platform basis in
haskell-defaults.nix.
---
 pkgs/top-level/haskell-packages.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index af8eb5ea7dfa..f00ac2465462 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1832,10 +1832,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {};
 
-  quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {
-    HUnit = self.HUnit_1_2_5_2;
-    QuickCheck = self.QuickCheck2;
-  };
+  quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
 
   qrencode = callPackage ../development/libraries/haskell/qrencode {
     inherit (pkgs) qrencode;

From 736ff4ae2a4d7b07c7f15f84a30a1b43b3eed26b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Dec 2013 19:40:48 +0100
Subject: [PATCH 511/562] haskell-quickcheck-io: override versions of HUnit and
 QuickCheck on older versions of Haskell Platform

---
 pkgs/top-level/haskell-defaults.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 19fcb98c82d9..2dd5b0ca3df1 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -63,6 +63,10 @@
       prettyShow = self.prettyShow_1_2;
       bmp = self.bmp_1_2_2_1;
       Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      quickcheckIo = self.quickcheckIo.override {
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
+      };
     };
 
   ghc703Prefs =
@@ -75,6 +79,10 @@
       prettyShow = self.prettyShow_1_2;
       bmp = self.bmp_1_2_2_1;
       Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      quickcheckIo = self.quickcheckIo.override {
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
+      };
     };
 
   ghc702Prefs = ghc701Prefs;
@@ -89,6 +97,10 @@
       prettyShow = self.prettyShow_1_2;
       bmp = self.bmp_1_2_2_1;
       Cabal_1_18_1_2 = self.Cabal_1_18_1_2.override { deepseq = self.deepseq_1_3_0_2; };
+      quickcheckIo = self.quickcheckIo.override {
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
+      };
     };
 
   ghc6123Prefs = ghc6122Prefs;
@@ -108,6 +120,10 @@
         mtl = self.mtl_2_1_2;
         HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
       };
+      quickcheckIo = self.quickcheckIo.override {
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
+      };
     };
 
   ghc6121Prefs =
@@ -127,6 +143,10 @@
         mtl = self.mtl_2_1_2;
         HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
       };
+      quickcheckIo = self.quickcheckIo.override {
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
+      };
     };
 
   ghc6104Prefs =

From 53e9145cd0e82e33fe1546b868e016cec7425136 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Dec 2013 18:04:49 +0100
Subject: [PATCH 512/562] haskell-mime-mail: update to version 0.4.3

---
 pkgs/development/libraries/haskell/mime-mail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 691029ac5de2..4f7353dfdb6f 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.2.1";
-  sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g";
+  version = "0.4.3";
+  sha256 = "0xh6j4vdg2ispr9f41s8pvx5rb08zqapkqxyvykvjg2ibmczzg4f";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];

From 001776428e32d1d96f2e8cd04738f27d1f62d25e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Dec 2013 18:04:51 +0100
Subject: [PATCH 513/562] haskell-LambdaHack: update to version 0.2.10.6

---
 pkgs/games/LambdaHack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index 4b9211b637ff..b9b66f4be691 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "LambdaHack";
-  version = "0.2.10.5";
-  sha256 = "0a10xchhqh61idqb7ycassvy6gmprz9820w0z3r33h1c9sldq1lk";
+  version = "0.2.10.6";
+  sha256 = "19ak0ygw38b51wkm4p10xgdk3h9mh5vvb8c60qhs7cmgzjcph38n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From be8d22c05d476b544c6576f2ec460b9403df9239 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 15 Dec 2013 19:54:13 +0100
Subject: [PATCH 514/562] haskell-github: patch to fix build

---
 .../libraries/haskell/github/default.nix            |  1 +
 .../libraries/haskell/github/fix-build.patch        | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/github/fix-build.patch

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 5a45e48bdc7b..74368defc9c8 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     hashable HTTP httpConduit httpTypes network text time
     unorderedContainers vector
   ];
+  patches = [ ./fix-build.patch ];
   jailbreak = true;
   meta = {
     homepage = "https://github.com/fpco/github";
diff --git a/pkgs/development/libraries/haskell/github/fix-build.patch b/pkgs/development/libraries/haskell/github/fix-build.patch
new file mode 100644
index 000000000000..2d3483b38ec1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/github/fix-build.patch
@@ -0,0 +1,13 @@
+diff -ubr github-0.7.2-orig/Github/Private.hs github-0.7.2/Github/Private.hs
+--- github-0.7.2-orig/Github/Private.hs	2013-12-15 19:45:00.611789227 +0100
++++ github-0.7.2/Github/Private.hs	2013-12-15 19:45:46.359954006 +0100
+@@ -104,9 +104,6 @@
+              in Just (Data.List.takeWhile (/= '>') s')
+         else Nothing
+ 
+-doHttps :: Method -> String -> Maybe GithubAuth
+-        -> Maybe (RequestBody (ResourceT IO))
+-        -> IO (Either E.SomeException (Response LBS.ByteString))
+ doHttps reqMethod url auth body = do
+   let reqBody = fromMaybe (RequestBodyBS $ BS.pack "") body
+       reqHeaders = maybe [] getOAuth auth

From a2a1eb88cbf8b57ce7ddfd71b2f70bbae3ec8655 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 00:48:08 +0200
Subject: [PATCH 515/562] httpfs2: update from 0.1.4 to 0.1.5

---
 pkgs/tools/filesystems/httpfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix
index bbb6d2efc7b2..6f68a798ede9 100644
--- a/pkgs/tools/filesystems/httpfs/default.nix
+++ b/pkgs/tools/filesystems/httpfs/default.nix
@@ -2,11 +2,11 @@
 , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "httpfs2-0.1.4";
+  name = "httpfs2-0.1.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/httpfs/httpfs2/${name}.tar.gz";
-    sha256 = "0vlp6i119lz4ybnrd26hvvwms3h5d7x3jly5nzyyfcw24ngvpk7p";
+    sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1";
   };
 
   buildInputs =

From 49cfb2c89677a1b62288c9c8e66c31878bd91b15 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 00:49:32 +0200
Subject: [PATCH 516/562] httpunit: update from 1.6 to 1.7

---
 pkgs/development/libraries/java/httpunit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
index b70bbf56073e..73eb33df812d 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/pkgs/development/libraries/java/httpunit/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, unzip} :
 
 stdenv.mkDerivation {
-  name = "httpunit-1.6";
+  name = "httpunit-1.7";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = mirror://sourceforge/httpunit/httpunit-1.6.zip;
-    md5 = "e94b53b9f4d7bdb706e4baac95b6e424";
+    url = mirror://sourceforge/httpunit/httpunit-1.7.zip;
+    sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf";
   };
 
   inherit unzip;

From 1ff34a1cf80cf9286737bc84d0750afd68cd128d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 00:50:54 +0200
Subject: [PATCH 517/562] httrack: update from 3.47.21 to 3.47.27

---
 pkgs/tools/backup/httrack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index c02a16d821ac..4fa3345d220a 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "3.47.21";
+  version = "3.47.27";
   name = "httrack-${version}";
 
   src = fetchurl {
     url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
-    sha256 = "1jqw0zx74jpi0svivvqhja3ixcrfkh9sbi9fwfw83jga27bc1sp0";
+    sha256 = "1qgrs9wdqq4v9ywlb1b89i95w4a36y741l49xbpmb7mb7nvbz5kw";
   };
 
   buildInputs = [ zlib openssl ];

From 25dc79783b68976e1b99d379ccedfc98b212a17e Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 00:52:40 +0200
Subject: [PATCH 518/562] icoutils: update from 0.29.1 to 0.31.0

---
 pkgs/tools/graphics/icoutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 5abc909ea306..10cd9adf2b3c 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "icoutils-0.29.1";
+  name = "icoutils-0.31.0";
 
   src = fetchurl {
     url = "mirror://savannah/icoutils/${name}.tar.bz2";
-    sha256 = "180yqv41yc3fi6ggx7azhmaciqzadj0ir87wajigmcpgxkjk6v34";
+    sha256 = "0wdgyfb1clrn3maq84vi4vkwjydy72p5hzk6kb9nb3a19bbxk5d8";
   };
 
   buildInputs = [ libpng ];

From 8a0a1b7768282b784a7403e531ea66ae06ea892b Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 00:57:25 +0200
Subject: [PATCH 519/562] pg_top: update from 3.6.2 to 3.7.0

---
 pkgs/tools/misc/pg_top/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix
index 4c183d9c4025..392fcbcc8ff9 100644
--- a/pkgs/tools/misc/pg_top/default.nix
+++ b/pkgs/tools/misc/pg_top/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, ncurses, postgresql}:
 
 stdenv.mkDerivation {
-  name = "pg_top-3.6.2";
+  name = "pg_top-3.7.0";
 
   src = fetchurl {
-    url = http://pgfoundry.org/frs/download.php/1781/pg_top-3.6.2.tar.gz;
+    url = http://pgfoundry.org/frs/download.php/1781/pg_top-3.7.0.tar.gz;
     sha256 = "17xrv0l58rv3an06gkajzw0gg6v810xx6vl137an1iykmhvfh7h2";
   };
 

From 6fc2d316bb5b3e03afdef69a10c6aade6d57c510 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 00:59:52 +0200
Subject: [PATCH 520/562] procps-ng: update from 3.3.6 to 3.3.9

---
 pkgs/os-specific/linux/procps-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 6099505f1d65..0b3389f903a8 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
-  name = "procps-ng-3.3.6";
+  name = "procps-ng-3.3.9";
 
   src = fetchurl {
-    url = mirror://sourceforge/procps-ng/procps-ng-3.3.6.tar.xz;
-    sha256 = "0k0j3ilzfpw8n3y058ymgfmafdfqqqwpqm7nh7a35xlk6zgw96nh";
+    url = mirror://sourceforge/procps-ng/procps-ng-3.3.9.tar.xz;
+    sha256 = "0qw69v7wx8hilwylyk9455k3h1xg8sc13vxh0pvdss7rml7wpw00";
   };
 
   buildInputs = [ ncurses ];

From aeda3e2216ffadd3434b25dc8c62211ff7a4f67d Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:01:08 +0200
Subject: [PATCH 521/562] psmisc: update from 22.19 to 22.21

---
 pkgs/os-specific/linux/psmisc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index dd6c70127bf8..0e423f85d66f 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "psmisc-22.19";
+  name = "psmisc-22.21";
 
   src = fetchurl {
     url = "mirror://sourceforge/psmisc/${name}.tar.gz";
-    sha256 = "e112ccadd4694c98f5ea4a02cd6944fdc5a2a1985f20e2b3f74f4dbca83a2a31";
+    sha256 = "1p13s2323mi2868y4fzy3q2kkmv4fn1ggabqnjf202x4030vjj1q";
   };
 
   buildInputs = [ncurses];

From f5f6b86fc8ae9da028765b2892dcea82ef4f246c Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:03:15 +0200
Subject: [PATCH 522/562] rpPPPoE: update from 3.10 to 3.11

---
 pkgs/tools/networking/rp-pppoe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
index 5079b951a645..fe7f98100262 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "3.10" a; 
+  version = a.lib.attrByPath ["version"] "3.11" a;
   buildInputs = with a; [
     ppp   
   ];
@@ -10,7 +10,7 @@ in
 rec {
   src = fetchurl {
     url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
-    sha256 = "1xj9rvsblvv2zi4n1bj8mkk00p1b24ch5hlr1gcc3b4l4m0ag73h";
+    sha256 = "083pfjsb8w7afqgygbvgndwajgwkfmcnqla5vnk4z9yf5zcs98c6";
   };
 
   inherit buildInputs;

From 3c936a05022981d3de04033ab34d14cc999397b4 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:05:27 +0200
Subject: [PATCH 523/562] tinc: update from 1.0.22 to 1.0.23

---
 pkgs/tools/networking/tinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index c2b25e863f20..61ff721a8479 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, lzo, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.22";
+  version = "1.0.23";
   name = "tinc-${version}";
 
   src = fetchurl {
     url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "0b2w5jic0zs8smfq2a9w99ql7lspb7jph3psmqaflw0hq4gdsfa7";
+    sha256 = "04i88hr46nx3x3s71kasm9qrjhnn35icxh9zwchki47z2vgnpw5w";
   };
 
   buildInputs = [ lzo openssl zlib ];

From f90e505d506b068cfb7c4bee12b8e909d20eb692 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:06:44 +0200
Subject: [PATCH 524/562] units: update from 1.86 to 2.02

---
 pkgs/tools/misc/units/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index c609d2275dad..0d1a962cbf66 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation {
-  name = "units-1.86";
+  name = "units-2.02";
 
   src = fetchurl {
-    url = mirror://gnu/units/units-1.86.tar.gz;
-    sha256 = "1syc4d3x1wb03hcxnz7rkgapk96biazfk2qqn2wfyx54bq829lhi";
+    url = mirror://gnu/units/units-2.02.tar.gz;
+    sha256 = "16jfji9g1zc99agd5dcinajinhcxr4dgq2lrbc9md69ir5qgld1b";
   };
 
   meta = {

From d2bb4dc100916d789010d826059d9c1e7dca3abe Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:09:58 +0200
Subject: [PATCH 525/562] windowmaker: update from 0.95.4 to 0.95.5

---
 pkgs/applications/window-managers/windowmaker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index 2b146a78cb39..bbb6c0388251 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "windowmaker-${version}";
-  version = "0.95.4";
+  version = "0.95.5";
 
   src = fetchurl {
     url = "http://windowmaker.org/pub/source/release/"
         + "WindowMaker-${version}.tar.gz";
-    sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib";
+    sha256 = "1l3hmx4jzf6vp0zclqx9gsqrlwh4rvqm1g1zr5ha0cp0zmsg89ab";
   };
 
   buildInputs = [ pkgconfig libX11 libXft libXmu ];

From 6112fc7fff8a0053e4b7745cee2a95191142d101 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:11:51 +0200
Subject: [PATCH 526/562] xaos: update from 3.5 to 3.6

---
 pkgs/applications/graphics/xaos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index 307c94779296..cddbc212c190 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "3.5" a; 
+  version = a.lib.attrByPath ["version"] "3.6" a; 
   buildInputs = with a; [
     aalib gsl libpng libX11 xproto libXext xextproto 
     libXt zlib gettext intltool perl
@@ -11,7 +11,7 @@ in
 rec {
   src = fetchurl {
     url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz";
-    sha256 = "0hj8sxya4s9rc1m4xvxj00jgiczi3ljf2zvrhx34r3ja2m9af7s7";
+    sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
   };
 
   inherit buildInputs;

From e54c26a65c6740ba82772bec7577006c2846ccc0 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:13:19 +0200
Subject: [PATCH 527/562] xdaliclock: update from 2.35 to 2.40

---
 pkgs/tools/misc/xdaliclock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 74ee8b5b5484..f6d6a2bacfa7 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -12,11 +12,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="xdaliclock";
-    version="2.35";
+    version="2.40";
     name="${baseName}-${version}";
     project="${baseName}";
     url="http://www.jwz.org/${project}/${name}.tar.gz";
-    hash="0iybha2d0wqb4wkpw7l1zi3zhw57kqh3y7p4ja1k0fmvrzqc08g7";
+    hash="03i8vwi9vz3gr938wr4miiymwv283mg11wgfaf2jhl6aqbmz4id7";
   };
 in
 rec {

From e748d4c498af88a2ffa126de574225f2e0059d43 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:16:40 +0200
Subject: [PATCH 528/562] gmtk: update from 1.0.5 to 1.0.8

---
 .../networking/browsers/mozilla-plugins/gmtk/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
index 6ccab87ebe74..66309dc7f192 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }:
 
 stdenv.mkDerivation rec {
-  name = "gmtk-1.0.5";
+  name = "gmtk-1.0.8";
 
   src = fetchurl {
     url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
-    sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468";
+    sha256 = "034b02nplb2bp01yn4p19345jh3yibhn4lcxznrzcsmsyj2vlzq0";
   };
 
   buildInputs = [ intltool pkgconfig gtk GConf alsaLib ];

From 8dd78ae54d1360400ef3d4a2b4c1e9a8ab5db3f6 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:18:24 +0200
Subject: [PATCH 529/562] gptfdisk: update from 0.8.6 to 0.8.8

---
 pkgs/tools/system/gptfdisk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 817e3015efe9..93dfab9a1a47 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libuuid, popt, icu, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "gptfdisk-0.8.6";
+  name = "gptfdisk-0.8.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
-    sha256 = "1cj7lribq8f3i4q6463q08bs42pvlzfj0iz2f2cnjn94hiacsya5";
+    sha256 = "16myqa72mp0wyhca8il299h1gd6k6sr7m52qcr97j840wk0fjcac";
   };
 
   buildInputs = [ libuuid popt icu ncurses ];

From 6a69d7e89815599404a7c3f837327fd60da8b899 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:19:56 +0200
Subject: [PATCH 530/562] gsl: update from 1.15 to 1.16

---
 pkgs/development/libraries/gsl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 49364f882429..9afcc4ad41d6 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gsl-1.15";
+  name = "gsl-1.16";
 
   src = fetchurl {
     url = "mirror://gnu/gsl/${name}.tar.gz";
-    sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5";
+    sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
   };
 
   doCheck = true;

From c253a1fb40e38f343b28ac21164572cc9e30c965 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:22:13 +0200
Subject: [PATCH 531/562] guile_ncurses: update from 1.3 to 1.4

---
 pkgs/development/guile-modules/guile-ncurses/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index 674b35f441e9..1eca6b3a3025 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, guile, ncurses, libffi }:
 
 stdenv.mkDerivation rec {
-  name = "guile-ncurses-1.3";
+  name = "guile-ncurses-1.4";
 
   src = fetchurl {
     url = "mirror://gnu/guile-ncurses/${name}.tar.gz";
-    sha256 = "0chvfjrlmg99db98ra9vzwjmbypqx7d4ssm8q0kvzi0n0p9irszi";
+    sha256 = "070wl664lsm14hb6y9ch97x9q6cns4k6nxgdzbdzi5byixn74899";
   };
 
   buildInputs = [ guile ncurses libffi ];

From cda4252d4b59eb059f475e8bdf1b0669c54bf516 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:24:12 +0200
Subject: [PATCH 532/562] guile_lib: update from 0.2.1 to 0.2.2

---
 pkgs/development/guile-modules/guile-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index 593b090922ec..310c0e923805 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -3,11 +3,11 @@
 assert stdenv ? gcc && stdenv.gcc ? gcc && stdenv.gcc.gcc != null;
 
 stdenv.mkDerivation rec {
-  name = "guile-lib-0.2.1";
+  name = "guile-lib-0.2.2";
 
   src = fetchurl {
     url = "mirror://savannah/guile-lib/${name}.tar.gz";
-    sha256 = "0ag18l7f9cpv4l577ln3f106xiggl7ndxhrqqiz7cg0w38s3cjvl";
+    sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b";
   };
 
   buildInputs = [guile texinfo];

From 106785b0928ce74f8e4eccf154abc4ef2e056962 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:26:13 +0200
Subject: [PATCH 533/562] ioping: update from 0.4 to 0.7

---
 pkgs/tools/system/ioping/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index d721feb9d74d..52d32b4e838e 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -10,10 +10,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="ioping";
-    version="0.4";
+    version="0.7";
     name="${baseName}-${version}";
     url="http://ioping.googlecode.com/files/${name}.tar.gz";
-    hash="064pfjhg2a4hj6ly0wc9z85awiqry55n6wpx8kxzl9qasls0q447";
+    hash="1c0k9gsq7rr9fqh6znn3i196l84zsm44nq3pl1b7grsnnbp2hki3";
   };
 in
 rec {

From 0a290831883b712cb56f513de10e36988dba7603 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:27:28 +0200
Subject: [PATCH 534/562] jansson: update from 2.4 to 2.5

---
 pkgs/development/libraries/jansson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
index 4908c737ece4..3d4e5f260dce 100644
--- a/pkgs/development/libraries/jansson/default.nix
+++ b/pkgs/development/libraries/jansson/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "jansson-2.4";
+  name = "jansson-2.5";
 
   src = fetchurl {
     url = "http://www.digip.org/jansson/releases/${name}.tar.gz";
-    sha256 = "1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41";
+    sha256 = "1cdi1g4pyjwrw76z99ys8cr13iz9nz9i8sq6ivl1q0ymiarvz2yx";
   };
 
   meta = {

From 2e43a29ec80df04641f9a09ad6d3807000b71a10 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:29:41 +0200
Subject: [PATCH 535/562] less: update from 436 to 462

---
 pkgs/tools/misc/less/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index b22e7521764c..fa391880a101 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
  
 stdenv.mkDerivation {
-  name = "less-436";
+  name = "less-462";
  
   src = fetchurl {
-    url = http://www.greenwoodsoftware.com/less/less-436.tar.gz;
-    sha256 = "1lilcx6qrfr2dqahv7r10j9h2v86w5sb7m8wrx2sza9ifkq6z8ap";
+    url = http://www.greenwoodsoftware.com/less/less-462.tar.gz;
+    sha256 = "1kv5izyrkds8lkkzd46c9gxsnjgxbr7w4ficzma95dprcn92m97a";
   };
  
   buildInputs = [ncurses];

From 84aba31f4276e1cdc90de262bd6775aa11b99cfe Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:31:22 +0200
Subject: [PATCH 536/562] libconfig: update from 1.4.8 to 1.4.9

---
 pkgs/development/libraries/libconfig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
index 03b7b2cfb928..70a882ff15c1 100644
--- a/pkgs/development/libraries/libconfig/default.nix
+++ b/pkgs/development/libraries/libconfig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libconfig-${version}";
-  version = "1.4.8";
+  version = "1.4.9";
 
   src = fetchurl {
     url = "http://www.hyperrealm.com/libconfig/${name}.tar.gz";
-    sha256 = "1v817hy9y416i64ly17xdmgrn62qwj225wqakdzqr2j3pygm1c8q";
+    sha256 = "0h9h8xjd36lky2r8jyc6hw085xwpslf0x6wyjvi960g6aa99gj09";
   };
 
   meta = with stdenv.lib; {

From 3695a604185232dd5b285e6a5c6bd47f5330e42f Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:32:26 +0200
Subject: [PATCH 537/562] libeatmydata: update from 65 to 82

---
 pkgs/development/libraries/libeatmydata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index 48a0423653d6..6b3a16d1c092 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libeatmydata-65";
+  name = "libeatmydata-82";
   
   src = fetchurl {
     url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz";
-    sha256 = "1hfmd24ps5661zbbw1qqgqs6hcwx6ll2fxz2j4cfvkmf0kzw25la";
+    sha256 = "0aavq71bf0yxdgyf8gvyzq086shszzwpbsz5rqkjg4cz0rc5yrqb";
   };
 
   meta = {

From 9f83ba8776abc1ca99182d845e754c4d41495925 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Mon, 16 Dec 2013 01:35:44 +0200
Subject: [PATCH 538/562] log4cpp: update from 1.1 to 1.1.1

---
 pkgs/development/libraries/log4cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix
index 2b2553075580..32424d546b44 100644
--- a/pkgs/development/libraries/log4cpp/default.nix
+++ b/pkgs/development/libraries/log4cpp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "log4cpp-1.1";
+  name = "log4cpp-1.1.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/log4cpp/${name}.tar.gz";
-    sha256 = "1d386ws9v6f9bxma4dh5m6nzr4k2rv5q96xl5bp5synlmghd2ny2";
+    sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm";
   };
 
   meta = {

From 2b65900e7516284237c7a6a7f0d0b6ad2fd9f87a Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 16 Dec 2013 04:50:22 +0000
Subject: [PATCH 539/562] vagrant: update to 1.4.0

---
 pkgs/development/tools/vagrant/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 64822a08d073..80fc093822fd 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,18 +4,18 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 stdenv.mkDerivation rec {
-  name = "vagrant-1.3.5";
+  name = "vagrant-1.4.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url    = http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_x86_64.deb;
-        sha256 = "0wfdz1r6i6acdrqb22n21iijz57ywjh4wd3fggcj65c0dvs0czfv";
+        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_x86_64.deb;
+        sha256 = "0hggajqdwk1qlkhf5sgdlmyxhan33q3pdgks9n5i2cw6f2ckw3rh";
       }
     else
       fetchurl {
-        url    = http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_i686.deb;
-        sha256 = "0dq1ha278mjca1kdhijs6wzs61npvv1knvahnbiihxmhjsx5d9ih";
+        url    = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.0_i686.deb;
+        sha256 = "03jcmsdl4na5n08phyvx65dnfv1gq9vgn07kcyqc2f8nq7vmcmkm";
       };
 
   meta = with stdenv.lib; {

From acac786868a418893a116124606e4a1d9cedf8b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Dec 2013 14:46:21 +0100
Subject: [PATCH 540/562] linux: Update to 3.4.74

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 4cf3229f6fde..8608eee84569 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.73";
+  version = "3.4.74";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "052g799pq6k0xzs231n3502bsv0k9ap3q8clxpyzyila8sx4rll7";
+    sha256 = "0nkiy2hxwam91707vccprmap28wiwxar2v2ishj1bb2xzkbnxwpd";
   };
 
   features.iwlwifi = true;

From a2b45034b3ff57b42c26a100c674aeb6844e7f9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Dec 2013 14:50:40 +0100
Subject: [PATCH 541/562] php: Update to 5.4.23, 5.3.28

CVE-2013-4073, CVE-2013-6420
---
 pkgs/development/interpreters/php/5.3.nix | 4 ++--
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index caa673b31a92..f7bb29270c7b 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -10,7 +10,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.3.27";
+  version = "5.3.28";
 
   name = "php-${version}";
 
@@ -224,7 +224,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   src = fetchurl {
     url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "11xj6v65m6l2lq2s2j5pq5l0iwjsnxmv1nad9hja50ivc8fb4bg1";
+    sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c";
     name = "php-${version}.tar.bz2";
   };
 
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 1e3d73fa884e..bf60e90d634a 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.21";
+  version = "5.4.23";
 
   name = "php-${version}";
 
@@ -235,7 +235,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
       "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
     ];
-    sha256 = "1v2nqvgb0lvja4as5361ja3ry8ja7ib38wzia34g7inw3bp7r3za";
+    sha256 = "1k4iplqqcaqkmyq10h6a5qcpkfpkd05r2kclxw9n9qdrm47hfz5f";
     name = "php-${version}.tar.bz2";
   };
 

From edaa56041ceb3185d9c104ca72c457a5e7ae6e03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 13:55:16 +0100
Subject: [PATCH 542/562] pkgs/build-support/cabal: configure a proper library
 rpath for dynamically linked executables

---
 pkgs/build-support/cabal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index b17f720e5618..d99faf41f88d 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -156,7 +156,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               (optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla"))
               (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
               (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
-            ];
+            ] ++ optional self.enableSharedExecutables "--ghc-option=-optl=-Wl,-rpath=$ORIGIN/../lib/${ghc.ghc.name}/${self.pname}-${self.version}";
 
             # GHC needs the locale configured during the Haddock phase.
             LANG = "en_US.UTF-8";

From ec00fe09654d44c1b5a3625b95e73c66de865fbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 13:59:42 +0100
Subject: [PATCH 543/562] haskell-doctest: don't build haddock documentation
 with pre-7.4 versions of GHC

---
 pkgs/development/libraries/haskell/doctest/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix
index 687314266839..46e69c95f940 100644
--- a/pkgs/development/libraries/haskell/doctest/default.nix
+++ b/pkgs/development/libraries/haskell/doctest/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     stringbuilder syb transformers
   ];
   doCheck = false;
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";
   meta = {
     homepage = "https://github.com/sol/doctest-haskell#readme";
     description = "Test interactive Haskell examples";

From 1e5e9a402b062a85264f3ec765a97486b66a76cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 16:36:18 +0100
Subject: [PATCH 544/562] haskell-DAV: update to version 0.5.1

---
 pkgs/development/libraries/haskell/DAV/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index c24ceacc0216..4a908e46d934 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -1,16 +1,16 @@
-{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens
-, liftedBase, mtl, network, optparseApplicative, resourcet
+{ cabal, caseInsensitive, httpClient, httpClientTls, httpTypes
+, lens, liftedBase, mtl, network, optparseApplicative, resourcet
 , transformers, xmlConduit, xmlHamlet
 }:
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "0.5";
-  sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq";
+  version = "0.5.1";
+  sha256 = "12r5hy6g5k5bdf3n84hpq9b90nz6v2v3xwy7prxkvv99iaxf2lsj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    caseInsensitive httpClient httpConduit httpTypes lens liftedBase
+    caseInsensitive httpClient httpClientTls httpTypes lens liftedBase
     mtl network optparseApplicative resourcet transformers xmlConduit
     xmlHamlet
   ];

From ee755fa3bccbad9044f2631c537c81fbbecea580 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 16:36:18 +0100
Subject: [PATCH 545/562] haskell-HsOpenSSL: update to version 0.10.3.6

---
 pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
index eb7c406e81e4..d7736a5d9b9a 100644
--- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
+++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
-  version = "0.10.3.5";
-  sha256 = "1yvpvc9ylfqskdv0dqg6cl43w3wg7rggz0lwlrv04a45mrxygh80";
+  version = "0.10.3.6";
+  sha256 = "0h2q9isbrfvsyr4yzcv7y0vd3gha8ym67l4sn7zlz39n376i2z10";
   buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {

From a3c0e40e521ffe4a723495cc519a8b3fbb76f01f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 16:36:18 +0100
Subject: [PATCH 546/562] haskell-ansi-terminal: update to version 0.6.1

---
 .../development/libraries/haskell/ansi-terminal/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
index 6d598f29ec95..2e9b1c0c25f4 100644
--- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix
+++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "ansi-terminal";
-  version = "0.6";
-  sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg";
+  version = "0.6.1";
+  sha256 = "0ncghc0z2xkfn1hfvyl0haf4mia9lhjbiqda11nxkqqfxdyklb2j";
   isLibrary = true;
   isExecutable = true;
   meta = {
-    homepage = "http://batterseapower.github.com/ansi-terminal";
+    homepage = "https://github.com/feuerbach/ansi-terminal";
     description = "Simple ANSI terminal support, with Windows compatibility";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From c1413dc30b9266b3f9f0fb358fe1d5b01184b8f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 16:36:18 +0100
Subject: [PATCH 547/562] haskell-enummapset-th: update to version 0.6.0.1

---
 pkgs/development/libraries/haskell/enummapset-th/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix
index 0b992a9daaff..a675d4d74ea6 100644
--- a/pkgs/development/libraries/haskell/enummapset-th/default.nix
+++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "enummapset-th";
-  version = "0.6.0.0";
-  sha256 = "0d5pb49raxamz6g9w5kgm4papv3wj21xd8zysfvfn19jkwhkd6mn";
+  version = "0.6.0.1";
+  sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8";
   buildDepends = [ deepseq ];
   meta = {
     homepage = "https://github.com/liyang/enummapset-th";

From 0bbe648085a6a48b862b53374093bd427033cb92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 16:36:18 +0100
Subject: [PATCH 548/562] haskell-snaplet-acid-state: update to version 0.2.6

---
 .../libraries/haskell/snaplet-acid-state/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
index 838f45eccaad..8a9a594e45d7 100644
--- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snaplet-acid-state";
-  version = "0.2.5";
-  sha256 = "0qx6as1m0fwb5fkhvl0k71kx65njwq0dk183xi4gmdzhf83hkjbs";
+  version = "0.2.6";
+  sha256 = "005c4x7sh820iar69rany3hv4rlbzpsd4yqd2x2v3jql9z55k4s9";
   buildDepends = [ acidState snap text ];
   meta = {
     homepage = "https://github.com/mightybyte/snaplet-acid-state";

From 9a313321365287fe3388d8ce7661aee1cdab3005 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 16:36:18 +0100
Subject: [PATCH 549/562] haskell-tasty: update to version 0.5.2.1

---
 pkgs/development/libraries/haskell/tasty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 39ee7f2d168d..6ba25cdc99b2 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.5.2";
-  sha256 = "0zj6bpqld04sivfkpzjp2c587mmygl3699znqmhp1dbv0fpq6949";
+  version = "0.5.2.1";
+  sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym";
   buildDepends = [
     ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged
   ];

From 60103a4bd99cce63dab60be358e0ba90724b8b21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Dec 2013 16:36:18 +0100
Subject: [PATCH 550/562] haskell-wai-test: update to version 2.0.0.1

---
 pkgs/development/libraries/haskell/wai-test/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 7d97fe4b4fe1..9cae0a85d6c9 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -12,7 +12,6 @@ cabal.mkDerivation (self: {
     httpTypes HUnit network text transformers wai
   ];
   testDepends = [ hspec wai ];
-  postBuild = ":";
   meta = {
     homepage = "http://www.yesodweb.com/book/web-application-interface";
     description = "Unit test framework (built on HUnit) for WAI applications";

From 3b766653c6d40e435c934e0f8e966be60cfbf40d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Tue, 17 Dec 2013 11:13:55 +0100
Subject: [PATCH 551/562] Ported to old no-xcode patch to the current nodejs,
 so that it can be built on Darwin again

---
 pkgs/development/web/nodejs/default.nix    |  2 +-
 pkgs/development/web/nodejs/no-xcode.patch | 39 ++++++++--------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 47c5178cc791..ae990ca32459 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -52,6 +52,6 @@ in stdenv.mkDerivation {
     homepage = http://nodejs.org;
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu maintainers.shlevy ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch
index 47a37bfaf3ca..534d5204a2ef 100644
--- a/pkgs/development/web/nodejs/no-xcode.patch
+++ b/pkgs/development/web/nodejs/no-xcode.patch
@@ -1,23 +1,9 @@
-diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
-index 806f92b..5256856 100644
---- a/tools/gyp/pylib/gyp/xcode_emulation.py
-+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
-@@ -224,8 +224,7 @@ class XcodeSettings(object):
- 
-   def _GetSdkVersionInfoItem(self, sdk, infoitem):
-     job = subprocess.Popen(['xcodebuild', '-version', '-sdk', sdk, infoitem],
--                           stdout=subprocess.PIPE,
--                           stderr=subprocess.STDOUT)
-+                           stdout=subprocess.PIPE)
-     out = job.communicate()[0]
-     if job.returncode != 0:
-       sys.stderr.write(out + '\n')
-@@ -234,9 +233,17 @@ class XcodeSettings(object):
- 
-   def _SdkPath(self):
-     sdk_root = self.GetPerTargetSetting('SDKROOT', default='macosx')
-+    if sdk_root.startswith('/'):
-+      return sdk_root
+diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
+--- a/tools/gyp/pylib/gyp/xcode_emulation.py	2013-11-12 21:22:12.000000000 +0100
++++ b/tools/gyp/pylib/gyp/xcode_emulation.py	2013-12-17 11:07:11.000000000 +0100
+@@ -285,8 +285,15 @@
+     if sdk_root.startswith('/'):
+       return sdk_root
      if sdk_root not in XcodeSettings._sdk_path_cache:
 -      XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem(
 -          sdk_root, 'Path')
@@ -29,10 +15,11 @@ index 806f92b..5256856 100644
 +        # the user is probably on a CLT-only system, where there
 +        # is no valid SDK root
 +        XcodeSettings._sdk_path_cache[sdk_root] = None
++
      return XcodeSettings._sdk_path_cache[sdk_root]
  
    def _AppendPlatformVersionMinFlags(self, lst):
-@@ -339,10 +346,11 @@ class XcodeSettings(object):
+@@ -397,10 +404,11 @@
  
      cflags += self._Settings().get('WARNING_CFLAGS', [])
  
@@ -48,7 +35,7 @@ index 806f92b..5256856 100644
  
      self.configname = None
      return cflags
-@@ -572,10 +580,11 @@ class XcodeSettings(object):
+@@ -647,10 +655,11 @@
      for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []):
        ldflags.append('-Wl,-rpath,' + rpath)
  
@@ -64,15 +51,15 @@ index 806f92b..5256856 100644
  
      self.configname = None
      return ldflags
-@@ -700,7 +709,10 @@ class XcodeSettings(object):
+@@ -826,7 +835,10 @@
          l = '-l' + m.group(1)
        else:
          l = library
--    return l.replace('$(SDKROOT)', self._SdkPath())
+-    return l.replace('$(SDKROOT)', self._SdkPath(config_name))
 +    if self._SdkPath():
-+      return l.replace('$(SDKROOT)', self._SdkPath())
++      return l.replace('$(SDKROOT)', self._SdkPath(config_name))
 +    else:
 +      return l
  
-   def AdjustLibraries(self, libraries):
+   def AdjustLibraries(self, libraries, config_name=None):
      """Transforms entries like 'Cocoa.framework' in libraries into entries like

From 010273bf1ec2080d292076a2aae35056a6d7881d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Tue, 17 Dec 2013 11:45:07 +0100
Subject: [PATCH 552/562] Fix imagemagick compilation on darwin, because it
 still includes ghostscript which should not be the case

---
 pkgs/applications/graphics/ImageMagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index aa0bdbfe56ce..a3d6eca4fa6e 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       export DVIDecodeDelegate=${tetex}/bin/dvips
     '' else "";
 
-  configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") ''
+  configureFlags = "" + stdenv.lib.optionalString (stdenv.system != "x86_64-darwin") ''
     --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
     --with-gslib
   '' + ''
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs =
     [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg
       libtool jasper libX11
-    ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript;
+    ] ++ stdenv.lib.optional (stdenv.system != "x86_64-darwin") ghostscript;
 
   buildInputs = [ tetex pkgconfig ];
 

From 84b09e26e5bc4567f8bdf6ee8c8410adf139311a Mon Sep 17 00:00:00 2001
From: David Virgilio <drvirgilio@gmail.com>
Date: Sun, 15 Dec 2013 21:29:42 -0600
Subject: [PATCH 553/562] dzen2: new package

"Dzen is a general purpose messaging, notification and menuing program for X11. It was designed to be fast, tiny and scriptable in any language." -- https://github.com/robm/dzen
---
 .../window-managers/dzen2/default.nix         | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/window-managers/dzen2/default.nix

diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix
new file mode 100644
index 000000000000..b3e970e90be0
--- /dev/null
+++ b/pkgs/applications/window-managers/dzen2/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }:
+
+stdenv.mkDerivation rec {
+  name = "dzen2-0.9.5";
+
+  buildInputs = [ pkgconfig libX11 libXft libXinerama libXpm ];
+
+  src = fetchurl {
+    url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz";
+    sha256 = "d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556";
+  };
+
+  patchPhase = ''
+    CFLAGS=" -Wall -Os ''${INCS} -DVERSION=\"''${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`"
+    LIBS=" -L/usr/lib -lc -lXft -lXpm -lXinerama -lX11"
+    echo "CFLAGS=$CFLAGS" >>config.mk
+    echo "LIBS=$LIBS" >>config.mk
+    echo "LDFLAGS=$LIBS" >>config.mk
+    substituteInPlace config.mk --replace /usr/local "$out"
+    substituteInPlace gadgets/config.mk --replace /usr/local "$out"
+  '';
+
+  buildPhase = ''
+    mkdir -p $out/bin $out/man/man1
+    make clean install
+    cd gadgets
+    make clean install
+  '';
+
+  meta = {
+    homepage = https://github.com/robm/dzen;
+    license = stdenv.lib.licenses.mit;
+    description = "X notification utility";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f25fcd910dd5..fe463051fbcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7709,6 +7709,8 @@ let
     patches = config.dwm.patches or [];
   };
 
+  dzen2 = callPackage ../applications/window-managers/dzen2 { };
+
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
   eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });

From 82f39bd19e8f757b98136000da5c4e90738ee587 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 17 Dec 2013 13:27:03 +0100
Subject: [PATCH 554/562] linux: Fix hash

---
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 8608eee84569..46a87e65c502 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -5,7 +5,7 @@ import ./generic.nix (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0nkiy2hxwam91707vccprmap28wiwxar2v2ishj1bb2xzkbnxwpd";
+    sha256 = "189b7391shzsf0383c3yqf8wy9w82wkzfqmqzxkm77312px1b2yb";
   };
 
   features.iwlwifi = true;

From eca727fc55031030f78c64b6f5e40d8357472262 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 17 Dec 2013 15:07:23 +0200
Subject: [PATCH 555/562] Revert "gsl: update from 1.15 to 1.16"

Tests fail on i686: http://savannah.gnu.org/bugs/?40176

This reverts commit 6a69d7e89815599404a7c3f837327fd60da8b899.
---
 pkgs/development/libraries/gsl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 9afcc4ad41d6..49364f882429 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gsl-1.16";
+  name = "gsl-1.15";
 
   src = fetchurl {
     url = "mirror://gnu/gsl/${name}.tar.gz";
-    sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
+    sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5";
   };
 
   doCheck = true;

From 05b94c04cf9504c74ac84ff061bf51986ad940a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 18 Dec 2013 11:24:53 +0100
Subject: [PATCH 556/562] Updating nvidia legacy 304 to 304.117

---
 pkgs/os-specific/linux/nvidia-x11/legacy304.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
index e2739b291d40..bd88e847b6ee 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
@@ -8,7 +8,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "304.84"; in
+let versionNumber = "304.117"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
@@ -19,12 +19,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "14hfx3rhf3vf3x3klkhz5qkjrg51r22nqqdzffilcwkxdjfg10j1";
+        sha256 = "16a09iinz3zgrvj8cywyxsy7i8kpan28b814xhfbl88zadyj0hy3";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1ixxkykl78g874g537apvxalggp3kw0mm5q69rl99jlw6jibbm80";
+        sha256 = "0kzcxfwnp4aw4q53vl57ypc9yck4yj1hfhy8v9wfjlxvi6w6cp0v";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 6200fc9ffaafc5ecb01d39a9027eb40d330df230 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Dec 2013 11:27:39 +0100
Subject: [PATCH 557/562] haskell-async: add version 2.0.1.5

---
 .../libraries/haskell/async/2.0.1.5.nix         | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  5 +++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/async/2.0.1.5.nix

diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.5.nix
new file mode 100644
index 000000000000..d3340fb3678a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/async/2.0.1.5.nix
@@ -0,0 +1,17 @@
+{ cabal, HUnit, stm, testFramework, testFrameworkHunit }:
+
+cabal.mkDerivation (self: {
+  pname = "async";
+  version = "2.0.1.5";
+  sha256 = "0g587b64zgn971qb2lh846ihg4z89037f18821kyaqsgixasq4yd";
+  buildDepends = [ stm ];
+  testDepends = [ HUnit testFramework testFrameworkHunit ];
+  jailbreak = true;
+  meta = {
+    homepage = "https://github.com/simonmar/async";
+    description = "Run IO operations asynchronously and wait for their results";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f00ac2465462..37d560ff439d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -141,7 +141,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   haskellPlatformArgs_future = self : {
     inherit (self) cabal ghc;
-    async        = self.async_2_0_1_4;
+    async        = self.async_2_0_1_5;
     attoparsec   = self.attoparsec_0_10_4_0;
     caseInsensitive = self.caseInsensitive_1_1_0_2;
     cgi          = self.cgi_3001_1_8_4;
@@ -558,7 +558,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {};
   async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {};
-  async = self.async_2_0_1_4;
+  async_2_0_1_5 = callPackage ../development/libraries/haskell/async/2.0.1.5.nix {};
+  async = self.async_2_0_1_5;
 
   atomicPrimops = callPackage ../development/libraries/haskell/atomic-primops {};
 

From d1f0c0325c8ef426e15755394b9ba136e88925f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Dec 2013 11:27:43 +0100
Subject: [PATCH 558/562] haskell-DAV: update to version 0.6

---
 pkgs/development/libraries/haskell/DAV/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index 4a908e46d934..a7e15f2d6b4d 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -1,18 +1,18 @@
 { cabal, caseInsensitive, httpClient, httpClientTls, httpTypes
-, lens, liftedBase, mtl, network, optparseApplicative, resourcet
-, transformers, xmlConduit, xmlHamlet
+, lens, liftedBase, monadControl, mtl, network, optparseApplicative
+, transformers, transformersBase, xmlConduit, xmlHamlet
 }:
 
 cabal.mkDerivation (self: {
   pname = "DAV";
-  version = "0.5.1";
-  sha256 = "12r5hy6g5k5bdf3n84hpq9b90nz6v2v3xwy7prxkvv99iaxf2lsj";
+  version = "0.6";
+  sha256 = "1lqc1w40mzj5gvpd3gc4qwgz3zrivwkz6ssa5592dsnwz81k1dxk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     caseInsensitive httpClient httpClientTls httpTypes lens liftedBase
-    mtl network optparseApplicative resourcet transformers xmlConduit
-    xmlHamlet
+    monadControl mtl network optparseApplicative transformers
+    transformersBase xmlConduit xmlHamlet
   ];
   meta = {
     homepage = "http://floss.scru.org/hDAV";

From 378c821a626afed196357dfc4af7470f696ef5f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Dec 2013 11:27:43 +0100
Subject: [PATCH 559/562] haskell-language-c-quote: update to version 0.7.6

---
 .../libraries/haskell/language-c-quote/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index f4774ecd14b0..94eb72633de3 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.7.5";
-  sha256 = "1ms6bjcqm0mfv0kqznn68svclbpvbwy5rlni0b8i0axhwfgq1l73";
+  version = "0.7.6";
+  sha256 = "15sfasbrr9wzqkwv9xg9nvb3gnn4drkll3b3cappiyzkmawp2hkr";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol

From 705b317fee6aefb9d6b6c22737179a176766bb67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Dec 2013 11:27:43 +0100
Subject: [PATCH 560/562] haskell-mainland-pretty: update to version 0.2.7

---
 .../development/libraries/haskell/mainland-pretty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index 2bcf2037cbeb..60990d2dbcac 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mainland-pretty";
-  version = "0.2.6";
-  sha256 = "1mjw79jg0vq8qvgvjdinidw1pvfj3mych3z0f6g031vmqz7fqvzy";
+  version = "0.2.7";
+  sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q";
   buildDepends = [ srcloc text ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";

From 714f20806b9e8c9fc0e15a447af8b0886148f236 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Dec 2013 11:27:44 +0100
Subject: [PATCH 561/562] haskell-scientific: update to version 0.1.0.1

---
 pkgs/development/libraries/haskell/scientific/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix
index 42d1c4b86122..8494168df15d 100644
--- a/pkgs/development/libraries/haskell/scientific/default.nix
+++ b/pkgs/development/libraries/haskell/scientific/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scientific";
-  version = "0.1.0.0";
-  sha256 = "1x3c8z1d7nhr1z5dlbs60pxfrgclfbwjhrkpvr0jnz0fpy2m9x5r";
+  version = "0.1.0.1";
+  sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ smallcheck tasty tastySmallcheck text ];
   doCheck = false;

From 580c339699b6e17cb98aec28158fadd31d062297 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 17 Dec 2013 11:27:44 +0100
Subject: [PATCH 562/562] haskell-smallcheck: update to version 1.1.1

---
 pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix
index ef8f0e5e5ba4..e81a8872f7ac 100644
--- a/pkgs/development/libraries/haskell/smallcheck/default.nix
+++ b/pkgs/development/libraries/haskell/smallcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smallcheck";
-  version = "1.1.0.1";
-  sha256 = "02yv4pa6hilxl7fwskayd5nzs4hq46k91wh04sqj4yfk2s3pgb0m";
+  version = "1.1.1";
+  sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd";
   buildDepends = [ logict mtl ];
   meta = {
     homepage = "https://github.com/feuerbach/smallcheck";