Merge master into x-updates

author: Vladimír Čunát <vcunat@gmail.com> 2014-02-02 10:05:25 +0100
committer: Vladimír Čunát <vcunat@gmail.com> 2014-02-02 10:05:25 +0100
commit: 6e2d3b98473523672b06ff5c90b5b387a029e566 (patch)
tree: 4f53d0adf17553b40031d35fae3e6f263933fd93 /pkgs
parent: fcaa782b6ab7cd18b8ccca82cc6615b0b3c36b18 (diff)
parent: 14a6a059f5863bfd9e7c69336baa8a918b41a86a (diff)
download: nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar
nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.gz
nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.bz2
nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.lz
nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.xz
nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.zst
nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.zip
135 files changed, 1351 insertions, 583 deletions
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 0383a1ce0ad..1c8dc56de61 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true; # takes lots of time but will be run rarely (small build-time closure)
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xiph.org/flac/;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 48b0b52c5ea..08aa7e017b2 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -11,4 +11,9 @@ stdenv.mkDerivation rec {
     url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
     sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz";
   };
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 74dbaf78dac..93e95c8d87d 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -61,43 +61,23 @@ let
 
 in {
 
-  idea_community_1301 = buildIdea {
-    name = "idea-IC-133.331";
+  idea_community_1302 = buildIdea {
+    name = "idea-IC-133.696";
     description = "IntelliJ IDEA 13 Community Edition";
     license = stdenv.lib.licenses.asl20.shortName;
     src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.1.tar.gz;
-      sha256 = "6f268bb1dbe61ed0274fd2ea9b4b7403f50da11bdde208bcfc8c391d235d7c02";
+      url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.2.tar.gz;
+      sha256 = "a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53";
     };
   };
 
-  idea_ultimate_1301 = buildIdea {
-    name = "idea-IU-133.331";
+  idea_ultimate_1302 = buildIdea {
+    name = "idea-IU-133.696";
     description = "IntelliJ IDEA 13 Ultimate Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.1.tar.gz;
-      sha256 = "d3638d97b719773459d5027ba096b52695325b241cbf5e31e535165a5f19849d";
-    };
-  };
-
-  idea_community_13 = buildIdea {
-    name = "idea-IC-133.193";
-    description = "IntelliJ IDEA 13 Community Edition";
-    license = stdenv.lib.licenses.asl20.shortName;
-    src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIC-13.tar.gz;
-      sha256 = "5cd88b8effc5e4e55d999df1cec6f54c53b5adf0b88e49400b3a185bef7db13a";
-    };
-  };
-
-  idea_ultimate_13 = buildIdea {
-    name = "idea-IU-133.193";
-    description = "IntelliJ IDEA 13 Ultimate Edition";
-    license = stdenv.lib.licenses.unfree;
-    src = fetchurl {
-      url = http://download-ln.jetbrains.com/idea/ideaIU-13.tar.gz;
-      sha256 = "211a782654d04f2fe5fce9084043edfb8355a7bc4dc41fee7dc79cfe604d4654";
+      url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.2.tar.gz;
+      sha256 = "7ba9499ecc82029470712d6ead520db1e2cf520e4f86d382cbdea1d0052712d0";
     };
   };
 
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index af7d9e3399b..423b9f3ce22 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
+, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }:
 
 stdenv.mkDerivation rec {
   name = "gimp-2.8.10";
@@ -16,8 +16,13 @@ stdenv.mkDerivation rec {
       freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
       python pygtk libart_lgpl libexif gettext xlibs.libXpm
+      wrapPython
     ];
 
+  pythonPath = [ pygtk ];
+
+  postInstall = ''wrapPythonPrograms'';
+
   passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
 
   #configureFlags = [ "--disable-print" ];
diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix
index 3b5077a14e2..3d95dcd81ee 100644
--- a/pkgs/applications/graphics/sane/backends.nix
+++ b/pkgs/applications/graphics/sane/backends.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
   name = "sane-backends-${version}";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.24.tar.gz/1ca68e536cd7c1852322822f5f6ac3a4/${name}.tar.gz"
+      "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz"
+    ];
     curlOpts = "--insecure";
     sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7";
   };
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 7925e865b4a..686e327e2f7 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.20.0";
+  name = "calibre-1.21.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1i7sybl6in0js8an1zp3mzqv394xnwx79rmv1hj7g6abpsqhjpj7";
+    sha256 = "05hwny9zi32gkk3hadvigrqrnbgzw53vhjkjp60dq0lb545pscih";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 54650d395c2..3247cb609fa 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -1,5 +1,5 @@
-{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake,
-  curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
+{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
+, curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
 
 stdenv.mkDerivation rec {
   version = "3.7.2";
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ckolivas/cgminer";
     license = licenses.gpl3;
     maintainers = [ maintainers.offline ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 6d10cbb8c21..e6636415b5e 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, qt4, boost}:
+{stdenv, fetchurl, qt4, boost, proj, gdal}:
 
 stdenv.mkDerivation rec {
-  name = "merkaartor-0.17.2";
+  name = "merkaartor-0.18.1";
   src = fetchurl {
-    url = "http://merkaartor.be/attachments/download/253/merkaartor-0.17.2.tar.bz2";
-    sha256 = "0akhp9czzn39132mgj9h38nlh4l9ibzn3vh93bfs685zxyn4yps2";
+    url = "http://merkaartor.be/attachments/download/301/merkaartor-0.18.1.tar.bz2";
+    sha256 = "17qk45pmlxqigla1915dvn9pp91y85d2bkcaap4g3m8mk1crcsix";
   };
 
   configurePhase = ''
     qmake -makefile PREFIX=$out
   '';
 
-  buildInputs = [ qt4 boost ];
+  buildInputs = [ qt4 boost proj gdal ];
 
   meta = {
     description = "An openstreetmap editor";
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index 0d61d3d74cf..d4ffe2a4afd 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Show the set of running processes as a tree";
     license = "GPL";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index ae983aedc67..88d6e7a7cf9 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
     homepage = "http://jonls.dk/redshift";
     platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   }; 
 }
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 640ace40277..e5d0ae95f99 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -41,5 +41,6 @@ stdenv.mkDerivation (rec {
   meta = {
     description = "A clone of the well-known terminal emulator rxvt";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 })
diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix
new file mode 100644
index 00000000000..e7bfa8ded50
--- /dev/null
+++ b/pkgs/applications/misc/ykpers/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, pkgconfig, libusb1, libyubikey}:
+
+stdenv.mkDerivation rec
+{
+  version = "1.15.0";
+  name = "ykpers-${version}";
+
+  src = fetchurl
+  {
+    url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz";
+    sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd";
+  };
+
+  buildInputs = [pkgconfig libusb1 libyubikey];
+
+  meta =
+  {
+    homepage = "http://opensource.yubico.com/yubikey-personalization/";
+    description = "YubiKey Personalization cross-platform library and tool";
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.calrama ];
+  };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 908e54f3e43..eba32738e0b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -51,15 +51,18 @@ let
     patches = singleton ./sandbox_userns_31.patch;
 
     postPatch = ''
-      sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
-    '' + (if versionOlder version "32.0.0.0" then ''
-      sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi
-    '' else ''
+      sed -i -r \
+        -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
+        -e 's|/bin/echo|echo|' \
+        build/common.gypi
+      sed -i '/not RunGN/,+1d' build/gyp_chromium
       sed -i -e 's|/usr/bin/gcc|gcc|' \
         third_party/WebKit/Source/build/scripts/scripts.gypi \
         third_party/WebKit/Source/build/scripts/preprocessor.pm
-    '') + optionalString useOpenSSL ''
+    '' + optionalString useOpenSSL ''
       cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+    '' + optionalString (!versionOlder version "34.0.0.0") ''
+      sed -i '/import.*depot/d' build/gyp_chromium
     '';
 
     outputs = [ "out" "sandbox" "bundled" "main" ];
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index b7a30ef63f7..6ad9d9090d5 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "33.0.1712.4";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1712.4.tar.xz";
-    sha256 = "1c1m0y3nnz2lclqi21j6hgqmb46p1hv7c22zz9fn7dax7jkimydk";
+    version = "34.0.1809.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1809.0.tar.xz";
+    sha256 = "0hyqqqq2hzbzk325pk9bc70lsh0al2nqf1mlahybp5vigy5jzy88";
   };
   beta = {
-    version = "32.0.1700.19";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.19.tar.xz";
-    sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425";
+    version = "33.0.1750.46";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.46.tar.xz";
+    sha256 = "04n43c4vn8i7qhlybqb19c2c8kri8nc1wpa2l83vin4sqxkq519h";
   };
   stable = {
-    version = "32.0.1700.77";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.77.tar.xz";
-    sha256 = "1mwqa5k32d168swpw0bdcnhglxwcqdsx766fq0iz22h3hd4ccdwa";
+    version = "32.0.1700.102";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.102.tar.xz";
+    sha256 = "0jxwhd7cd60ivisrnzcglqqnmy99np1vvjqa27y42d852xjx84ys";
   };
 }
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 0421a8a6c6a..e10acf294bf 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -2,12 +2,12 @@
   m4, glib_networking, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation {
-  name = "dwb-0.1";
+  name = "dwb-2014-01-29";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "84a8621787baded72e84afdd5cdda278cb81e007";
-    sha256 = "5a32f3c21ad59b43935a16108244f84d260fafaea9b93d41e8de9ba9089ee7b0";
+    rev = "eaf090af9ad63341a846377cb9ce473feee8f032";
+    sha256 = "1wqa5dry9p3x3y07zpq3km8ycr8wvz8c11754vf99pv1kzk8gq0n";
   };
 
   buildInputs = [ pkgconfig makeWrapper libsoup webkit gtk3 gnutls json_c m4  ];
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index c0f76602b2b..c7ea2d135d5 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -1,21 +1,12 @@
-{ stdenv
-, fetchurl
-, libtool
-, libXext
-, libSM
-, libICE
-, libX11
-, libXft
-, libXau
-, libXdmcp
-, libXrender
-, freetype
-, fontconfig
-, openssl
+{ stdenv, fetchurl, libtool, libXext, libSM, libICE, libX11, libXft, libXau, libXdmcp, libXrender
+, libxcb, libXfixes, libXcomposite, libXi, dbus, freetype, fontconfig, openssl, zlib, mesa
+, libxslt, libxml2
 }:
 
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; 
+
 let
-  version = "1.94.407";
+  version = "2.1.982";
 
   rpath = stdenv.lib.makeSearchPath "lib" [
     stdenv.glibc
@@ -29,15 +20,29 @@ let
     libXau
     libXdmcp
     libXrender
+    libxcb
+    libXfixes
+    libXcomposite
+    libXi
+    dbus
     freetype
     fontconfig
     openssl
+    zlib
+    mesa
+    libxslt
+    libxml2
   ];
 
-  src = fetchurl {
-    url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
-    sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
-  };
+  src = 
+    if stdenv.system == "i686-linux" then fetchurl {
+      url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
+      sha256 = "1i60fkl5hdx2p2yfsx9w8qkzn6hl8fajvfls0r0gc2bqc9whg6vn";
+    } else fetchurl {
+      url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
+      sha256 = "12bn4la9z1grkbcnixjwhadgxa2g6qkd5x7r3l3vn1sdalgal4ks";
+    };
+
 in stdenv.mkDerivation {
   name = "hipchat-${version}";
 
@@ -49,8 +54,8 @@ in stdenv.mkDerivation {
     mv usr/share $out
     patchShebangs $out/bin
     for file in $(find $out/lib -type f); do
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
-        patchelf --set-rpath ${rpath}:$out/lib $file || true
+        patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $file || true
+        patchelf --set-rpath ${rpath}:${stdenv.lib.optionalString stdenv.is64bit "${stdenv.gcc.gcc}/lib64:"}$out/lib $file || true
     done
     substituteInPlace $out/share/applications/hipchat.desktop \
       --replace /opt/HipChat/bin $out/bin
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index d0652adcb0d..53790cd2b8b 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -21,10 +21,10 @@
 } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-2.10.7";
+  name = "pidgin-2.10.8";
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "14piyx4xpc3l8286x4nh5pna2wfyn9cv0qa29br1q3d2xja2k8zb";
+    sha256 = "09w2gbnplyw21lmf9jwk6vkk5gpx5lq15s38bmhkxzw86mz3ccxn";
   };
 
   inherit nss ncurses;
@@ -51,8 +51,10 @@ stdenv.mkDerivation rec {
   configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl"
   + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
   ;
-  meta = {
+  meta = with stdenv.lib; {
     description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client";
     homepage = http://pidgin.im;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix
deleted file mode 100644
index b46133e433e..00000000000
--- a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "tkabber-plugins-${version}";
-  version = "0.11.1";
-
-  src = fetchurl {
-    url = "http://files.jabber.ru/tkabber/tkabber-plugins-${version}.tar.gz";
-    sha256 = "0jxriqvsckbih5a4lpisxy6wjw022wsz5j5n171gz0q3xw19dbgz";
-  };
-
-  configurePhase = ''
-    sed -e "s@/usr/local@$out@" -i Makefile
-  '';
-
-  meta = {
-    homepage = "http://tkabber.jabber.ru/tkabber-plugins";
-    description = "Plugins for the Tkabber instant messenger";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
index fd989739c94..8b6b3893311 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
@@ -1,7 +1,24 @@
 { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
-, bwidget, makeWrapper, x11 }:
+, bwidget, makeWrapper, x11
+, withSitePlugins ? true
+, theme ? null
+}:
+
+with stdenv.lib;
 
 let
+  version = "1.0";
+
+  main = {
+    name = "tkabber";
+    sha256 = "49ee6e897dfe52ebac256531b54955e6b39223f606a9b8ad63a52475389db206";
+  };
+
+  plugins = {
+    name = "tkabber-plugins";
+    sha256 = "d61251dc664f0bfa8534e578096dede9a7bb7d4f2620489f8d2c43d36cd61ba9";
+  };
+
   tclLibraries = [ bwidget tcllib tcltls tclgpg ];
 
   getTclLibPath = p: "${p}/lib/${p.libPrefix}";
@@ -9,43 +26,47 @@ let
   tclLibPaths = stdenv.lib.concatStringsSep " "
     (map getTclLibPath tclLibraries);
 
-in stdenv.mkDerivation rec {
-  name = "tkabber-0.11.1";
+  mkTkabber = attrs: stdenv.mkDerivation (rec {
+    name = "${attrs.name}-${version}";
 
-  src = fetchurl {
-    url = "http://files.jabber.ru/tkabber/tkabber-0.11.1.tar.gz";
-    sha256 = "19xv555cm7a2gczdalf9srxm39hmsh0fbidhwxa74a89nqkbf4lv";
-  };
+    src = fetchurl {
+      url = "http://files.jabber.ru/tkabber/${name}.tar.xz";
+      inherit (attrs) sha256;
+    };
 
-  defaultTheme = "ocean-deep";
+    prePatch = ''
+      sed -e "s@/usr/local@$out@" -i Makefile
+    '';
+  } // removeAttrs attrs [ "name" "sha256" ]);
 
-  patchPhase = ''
+in mkTkabber (main // {
+  postPatch = ''
     substituteInPlace login.tcl --replace \
       "custom::defvar loginconf(sslcacertstore) \"\"" \
       "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)"
-
+  '' + optionalString (theme != null) ''
+    themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
     sed -i '/^if.*load_default_xrdb/,/^}$/ {
-        s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@
+      s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@
     }' tkabber.tcl
   '';
 
-  configurePhase = ''
-    mkdir -p $out/bin
-    sed -e "s@/usr/local@$out@" -i Makefile
-  '';
-
   postInstall = ''
-    wrapProgram $out/bin/tkabber \
-      --prefix PATH : "${tk}/bin" \
-      --set TCLLIBPATH '"${tclLibPaths}"' \
-      --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins'
+    for prog in $out/bin/*; do
+      wrapProgram "$prog" \
+        --prefix PATH : "${tk}/bin" \
+        --set TCLLIBPATH '"${tclLibPaths}"' \
+        ${optionalString withSitePlugins ''
+        --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins'
+        ''}
+    done
   '';
 
   buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries;
 
   meta = {
     homepage = "http://tkabber.jabber.ru/";
-    description = "A GUI client for the XMPP (Jabber) instant messaging protocol";
+    description = "A GUI XMPP (Jabber) client written in Tcl/Tk";
     license = stdenv.lib.licenses.gpl2;
   };
-}
+})
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index bc38defe06c..1e68d2e90b8 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -5,8 +5,8 @@ buildPythonPackage rec {
 
   src = fetchgit {
     url = "https://github.com/pagekite/Mailpile.git";
-    rev = "695a25061a5220d4f0fd6ec3de4ccd9ae4c05a92";
-    sha256 = "0il9idfpnzb1a5cg3p9zrd6fnw2dhrqr6c3gzq1m06snw8jx9fpc";
+    rev = "6e19c1942541dbdefb5155db5f2583bf3ed22aeb";
+    sha256 = "04idlbjkasigq3vslcv33kg21rjyklm2yl8pyrf5h94lzabbl1fs";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 8ed7c8d64d4..43fbe952b18 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,9 +1,18 @@
-{ stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
- speex, libopus, avahi, pkgconfig,
-jackSupport ? false, 
-jackaudio ? null }:
-
-
+{ stdenv, fetchurl, qt4, boost, protobuf, libsndfile
+, speex, libopus, avahi, pkgconfig
+, jackSupport ? false
+, jackaudio ? null
+, speechdSupport ? false
+, speechd ? null
+}:
+
+assert jackSupport -> jackaudio != null;
+assert speechdSupport -> speechd != null;
+
+let
+  optional = stdenv.lib.optional;
+  optionalString = stdenv.lib.optionalString;
+in
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
   version = "1.2.4";
@@ -13,35 +22,33 @@ stdenv.mkDerivation rec {
     sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
   };
 
-  patchPhase = ''
-    patch -p1 < ${ ./mumble-jack-support.patch }
-  '';
+  patches = optional jackSupport ./mumble-jack-support.patch;
 
   configurePhase = ''
     qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
       CONFIG+=no-embed-qt-translations CONFIG+=packaged \
       CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
+      ${optionalString (!speechdSupport) "CONFIG+=no-speechd"} \
+      ${optionalString jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"} \
       CONFIG+=no-bundled-speex
-  '' 
-  + stdenv.lib.optionalString jackSupport ''
-    CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio
   '';
 
 
-  buildInputs = [ qt4 boost speechd protobuf libsndfile speex
+  buildInputs = [ qt4 boost protobuf libsndfile speex
     libopus avahi pkgconfig ]
-    ++ (stdenv.lib.optional jackSupport jackaudio);
+    ++ (optional jackSupport jackaudio)
+    ++ (optional speechdSupport speechd);
 
   installPhase = ''
     mkdir -p $out
     cp -r ./release $out/bin
   '';
 
-  meta = { 
-    homepage = http://mumble.sourceforge.net/;
+  meta = with stdenv.lib; { 
+    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];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ viric ];
   };
 }
diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index b40632384c2..4b074b0708e 100644
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }:
+{ stdenv, fetchurl, qt4, boost, protobuf
+, avahi, libcap, pkgconfig
+, iceSupport ? false
+, zeroc_ice ? null
+}:
 
+assert iceSupport -> zeroc_ice != null;
+
+let
+  optional = stdenv.lib.optional;
+  optionalString = stdenv.lib.optionalString;
+in
 stdenv.mkDerivation rec {
   name = "murmur-" + version;
   version = "1.2.4";
@@ -9,22 +19,28 @@ stdenv.mkDerivation rec {
     sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
   };
 
+  patchPhase = optional iceSupport ''
+    sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
+  '';
+
   configurePhase = ''
-    qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt
+    qmake CONFIG+=no-client CONFIG+=no-embed-qt \
+    ${optionalString (!iceSupport) "CONFIG+=no-ice"}
   '';
 
-  buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ];
+  buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ]
+    ++ optional iceSupport [ zeroc_ice ];
 
   installPhase = ''
     mkdir -p $out
     cp -r ./release $out/bin
   '';
 
-  meta = { 
-    homepage = http://mumble.sourceforge.net/;
+  meta = with stdenv.lib; {
+    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];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ viric ];
   };
 }
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 6a4272101b3..7a8d6995265 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
@@ -7,16 +7,16 @@
 , network, networkConduit, networkInfo, networkMulticast
 , networkProtocolXmpp, openssh, optparseApplicative, 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
+, tasty, tastyHunit, tastyQuickcheck, tastyRerun, 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.20140127";
-  sha256 = "0aqqnv0faiva9vf0nb0d8xsd659y8cyrnyy6mfjdqjqdw8wha3yr";
+  version = "5.20140129";
+  sha256 = "0m1n3m16gvd0693i5xq5adki0hd0wdn7p5vqjxkqnc3imx9f11ng";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -27,9 +27,10 @@ cabal.mkDerivation (self: {
     MissingH MonadCatchIOTransformers monadControl mtl network
     networkConduit networkInfo networkMulticast networkProtocolXmpp
     optparseApplicative 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
+    stm tasty tastyHunit tastyQuickcheck tastyRerun 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
diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix
index 5dde88076a1..1058243c0e0 100644
--- a/pkgs/applications/video/bangarang/default.nix
+++ b/pkgs/applications/video/bangarang/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ];
   nativeBuildInputs = [ cmake ];
 
+  patches = [ ./gcc-4.7.patch ];
+
   meta = with stdenv.lib; {
     description = "A media player for KDE based on Nepomuk and Phonon";
     longDescription = ''
diff --git a/pkgs/applications/video/bangarang/gcc-4.7.patch b/pkgs/applications/video/bangarang/gcc-4.7.patch
new file mode 100644
index 00000000000..d4f650b9caf
--- /dev/null
+++ b/pkgs/applications/video/bangarang/gcc-4.7.patch
@@ -0,0 +1,45 @@
+commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1
+Author: Alex Fiestas <afiestas@kde.org>
+Date:   Thu Mar 29 10:09:22 2012 +0200
+
+    Build fix: Add unistd.h include since sleep is defined there
+
+diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp
+index 0c49d69..fcc4cd3 100644
+--- a/src/platform/infofetchers/lastfminfofetcher.cpp
++++ b/src/platform/infofetchers/lastfminfofetcher.cpp
+@@ -32,6 +32,8 @@
+ #include <QFile>
+ #include <QTextEdit>
+ 
++#include <unistd.h>
++
+ LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {
+diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp
+index 7801644..3c01960 100644
+--- a/src/platform/infofetchers/tmdbinfofetcher.cpp
++++ b/src/platform/infofetchers/tmdbinfofetcher.cpp
+@@ -30,6 +30,8 @@
+ #include <QDomDocument>
+ #include <QFile>
+ 
++#include <unistd.h>
++
+ TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {
+diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp
+index ff351b0..670ed18 100644
+--- a/src/platform/infofetchers/tvdbinfofetcher.cpp
++++ b/src/platform/infofetchers/tvdbinfofetcher.cpp
+@@ -30,6 +30,8 @@
+ #include <QDomDocument>
+ #include <QFile>
+ 
++#include <unistd.h>
++
+ TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) :
+         InfoFetcher(parent)
+ {
diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix
index 49207ad0661..0fdd78fe106 100644
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts}:
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt}:
 
 stdenv.mkDerivation rec {
   name = "libquvi-${version}";
-  version="0.4.0";
+  version="0.9.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.gz";
-    sha256 = "15cm9j8dssn2zhplqvlw49piwfw511lia6b635byiwfniqf6dnwp";
+    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.xz";
+    sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd";
   };
 
-  buildInputs = [ pkgconfig lua5 curl quvi_scripts ];
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libproxy libgcrypt ];
 
   meta = { 
     description = "Web video downloader";
diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix
index cc82158ae82..68b61fc453d 100644
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "quvi-scripts-${version}";
-  version="0.4.0";
+  version="0.9.20131130";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.gz";
-    sha256 = "14p1sn7id4n35isaw3i3h8vsgfqlym09fih9k5xfqwsg6n7xdvq5";
+    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.xz";
+    sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix
index f8b6aad4310..807e3954d6f 100644
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -1,22 +1,25 @@
-{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi}:
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}:
 
 stdenv.mkDerivation rec {
   name = "quvi-${version}";
-  version="0.4.0";
+  version="0.9.5";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quvi/quvi-${version}.tar.gz";
-    sha256 = "0qzyj55py4z7pg97794jjycq8nvrlr02072rgjzg8jgknw49hgfv";
+    url = "mirror://sourceforge/quvi/quvi-${version}.tar.xz";
+    sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb";
   };
 
-  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi ];
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi glib makeWrapper ];
+  postInstall = ''
+      wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua"
+  '';
 
-  meta = { 
+  meta = {
     description = "Web video downloader";
     homepage = http://quvi.sf.net;
     license = "LGPLv2.1+";
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
 }
 
diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix
index 296ba982b8a..4cd5a5b8297 100644
--- a/pkgs/data/documentation/pthread-man-pages/default.nix
+++ b/pkgs/data/documentation/pthread-man-pages/default.nix
@@ -43,5 +43,6 @@ in
     meta = {
       description = "POSIX threads (pthreads) manual pages from LinuxThreads";
       homepage = http://www.gnu.org/software/libc/;
+      maintainers = stdenv.lib.maintainers.mornfall;
     };
   }
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 772aaf54e0a..56d38bf1d90 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -6,11 +6,7 @@ rec {
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
   inherit (pkgs.gnome2) gnome_common ORBit2;
   orbit = ORBit2;
-
-
-#### Overrides of libraries
-
-  libsoup = pkgs.libsoup_2_44;
+  inherit (pkgs) libsoup;
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index f68f918d585..af93cb13d37 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
       }
     else throw "cudatoolkit does not support platform ${stdenv.system}";
 
+  outputs = [ "out" "sdk" ];
+
   buildInputs = [ perl ];
 
   runtimeDependencies = [
@@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
     sh $src --keep --noexec
     cd pkg/run_files
     sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
+    sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec
     cd pkg
   '';
 
@@ -44,8 +47,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir $out
+    mkdir $out $sdk
     perl ./install-linux.pl --prefix="$out"
+    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index c0933b2a961..1839c982e99 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index df0bae3218d..1638a132718 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -52,6 +52,6 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms   = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix
new file mode 100644
index 00000000000..34cb63e783e
--- /dev/null
+++ b/pkgs/development/compilers/mcpp/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, mcpp }:
+
+stdenv.mkDerivation rec {
+  name = "mcpp-2.7.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mcpp/${name}.tar.gz";
+    sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv";
+  };
+
+  configureFlags = [ "--enable-mcpplib" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://mcpp.sourceforge.net/";
+    description = "A portable c preprocessor";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/2/default.nix
index 34bd63c29ab..5b3cfd588c9 100644
--- a/pkgs/development/interpreters/cython/default.nix
+++ b/pkgs/development/interpreters/cython/2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "cython-0.16";
+  name = "cython-0.20";
 
   src = fetchurl {
-    url = http://www.cython.org/release/Cython-0.16.tar.gz;
-    sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp";
+    url = http://www.cython.org/release/Cython-0.20.tar.gz;
+    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
   };
 
   buildPhase = "python setup.py build --build-base $out";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ python pkgconfig ];
 
   meta = {
-    description = "An interpreter to help writing C extensions for Python";
+    description = "An interpreter to help writing C extensions for Python 2";
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/interpreters/cython/3/default.nix b/pkgs/development/interpreters/cython/3/default.nix
new file mode 100644
index 00000000000..d977ea87b3e
--- /dev/null
+++ b/pkgs/development/interpreters/cython/3/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, python3, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "cython3-0.20";
+
+  src = fetchurl {
+    url = http://www.cython.org/release/Cython-0.20.tar.gz;
+    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
+  };
+
+  buildPhase = "python3 setup.py build --build-base $out";
+
+  installPhase = "python3 setup.py install --prefix=$out";
+
+  buildInputs = [ python3 pkgconfig ];
+
+  meta = {
+    description = "An interpreter to help writing C extensions for Python3";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/interpreters/hiphopvm/default.nix b/pkgs/development/interpreters/hiphopvm/default.nix
index c18c81caff0..ae30d169b50 100644
--- a/pkgs/development/interpreters/hiphopvm/default.nix
+++ b/pkgs/development/interpreters/hiphopvm/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
-, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools
-, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam
+, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools, glog
+, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
 }:
 assert stdenv.system == "x86_64-linux";
 let
   src = fetchgit {
     url = "git://github.com/facebook/hiphop-php.git";
-    rev = "73f1c0ebd9b313f6b3baecd8c8046e0b595b1157";
-    sha256 = "104133c6054bc9ab0288eaa0cea168b6699e537b3ea76ecdc38ee833d93dca09";
+    rev = "1e23dec9f0b1ce8aaa5833d0527a369c8e254ffd";
+    sha256 = "0fblwgq8c3hmamw0m5d1mn8qhyqf14v2zf62cgrkvmbiz6jlrbr6";
   };
 
   libxml2_280 = stdenv.lib.overrideDerivation libxml2 (args: rec { 
@@ -21,37 +21,35 @@ let
 
     patches = [];
   });
- 
-  curlFB = stdenv.lib.overrideDerivation curl (args: { patches = [ "${src}/src/third_party/libcurl-7.22.1.fb-changes.diff" ]; });
 
-  fbPatch = "${src}/src/third_party/libevent-1.4.14.fb-changes.diff";
+  fbPatch = "${src}/hphp/third_party/libevent-1.4.14.fb-changes.diff";
+
   libeventFB = stdenv.lib.overrideDerivation libevent (args: { patches = [fbPatch]; });
 in
 stdenv.mkDerivation {
-  name = "hiphop-php-73f1c0ebd9";
+  name = "hiphop-php-1e23dec9f0";
   inherit src;
   dontUseCmakeBuildDir = true;
   dontUseCmakeConfigure = true;
   USE_HHVM=1;
   preConfigure = ''
-    export HPHP_HOME=$PWD
     export HPHP_LIB=$PWD/bin
     export TBB_INSTALL_DIR=${inteltbb}
     export TBB_ARCH_PLATFORM="intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
-    sed -i 's| DEPRECATED | DEPRECATED_ |' src/runtime/base/runtime_error.h
+    sed 's=/bin/bash=/${stdenv.shell}=g' -i hphp/util/generate-buildinfo.sh
   '';
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
+  MYSQL_INCLUDE_DIR="${mysql}/include/mysql";
   MYSQL_DIR=mysql;
   buildInputs = [ 
-    cmake boost libunwind mysql libmemcached pcre libeventFB gd curlFB
+    cmake boost libunwind mysql libmemcached pcre libeventFB gd curl
     libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma
     libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline
-    libelf uwimap binutils cyrus_sasl pam
+    libelf uwimap binutils cyrus_sasl pam glog libpng
   ];
   installPhase = ''
     mkdir -p $out/bin
-    cp src/hhvm/hhvm $out/bin
-    cp bin/systemlib.php $out/bin
+    cp hphp/hhvm/hhvm $out/bin
   '';
   patches = [./tbb.patch];
 
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 2923a8f960d..27b1589d27f 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -9,6 +9,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "lua-5.1.5";
+  luaversion = "5.1";
 
   src = fetchurl {
     url = "http://www.lua.org/ftp/${name}.tar.gz";
diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix
new file mode 100644
index 00000000000..a3f9adb0901
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/sockets.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, lua5}:
+
+stdenv.mkDerivation rec {
+  name    = "lua-sockets-${version}";
+  version = "2.0.2";
+  src = fetchurl {
+      url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
+      sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
+  };
+
+  luaver = "5.1"; # TODO
+  patchPhase = ''
+      sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \
+          -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \
+          -i config
+  '';
+
+  buildInputs = [ lua5 ];
+
+  meta = {
+    homepage = "http://w3.impa.br/~diego/software/luasocket/";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 36cb8158506..84cb9dd141a 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -69,8 +69,8 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://python.org";
-    description = "a high-level dynamically-typed programming language";
+    homepage = http://python.org;
+    description = "A high-level dynamically-typed programming language";
     longDescription = ''
       Python is a remarkably powerful dynamic programming language that
       is used in a wide variety of application domains. Some of its key
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
       high level dynamic data types.
     '';
     license = stdenv.lib.licenses.psfl;
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index c5ab0f5e5e2..10cbf1ecfe5 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -10,10 +10,29 @@ let
     find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
     find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
   '';
-  
+
 in
 
 {
+  buildr = {
+    # Many Buildfiles rely on RUBYLIB containing the current directory
+    # (as was the default in Ruby < 1.9.2).
+    extraWrapperFlags = "--prefix RUBYLIB : .";
+  };
+
+  fakes3 = {
+    postInstall = ''
+      cd $out/${ruby.gemPath}/gems/*
+      patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch}
+    '';
+  };
+
+  ffi = {
+    postUnpack = "onetuh";
+    buildFlags = ["--with-ffi-dir=${libffi}"];
+    NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
+  };
+
   iconv = { buildInputs = [ libiconvOrEmpty ]; };
 
   libv8 = {
@@ -26,16 +45,16 @@ in
     #
     # Finally, we must set CC and AR explicitly to allow scons to find the
     # compiler and archiver
-    
+
     preBuild = ''
       cat > $TMPDIR/g++ <<EOF
       #! ${stdenv.shell}
       $(export)
-      
+
       g++ \$(echo \$@ | sed 's/-Werror//g')
       EOF
       chmod +x $TMPDIR/g++
-      
+
       export CXX=$TMPDIR/g++
       export AR=$(type -p ar)
     '';
@@ -48,22 +67,18 @@ in
       done
     '';
   };
-  
-  sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
-  
-  rails = { gemFlags = "--no-ri --no-rdoc"; };
-  
+
   ncurses = { propagatedBuildInputs = [ ncurses ]; };
 
+  ncursesw = { propagatedBuildInputs = [ ncurses ]; };
+
   nix = {
     postInstall = ''
       cd $out/${ruby.gemPath}/gems/nix*
       patch -Np1 -i ${./fix-gem-nix-versions.patch}
     '';
   };
-  
-  ncursesw = { propagatedBuildInputs = [ ncurses ]; };
-  
+
   nokogiri = {
     buildFlags =
       [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
@@ -71,10 +86,13 @@ in
       ];
   };
 
-  ffi = {
-    postUnpack = "onetuh";
-    buildFlags = ["--with-ffi-dir=${libffi}"];
-    NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
+  pry = { gemFlags = "--no-ri --no-rdoc"; };
+
+  rails = { gemFlags = "--no-ri --no-rdoc"; };
+
+  rjb = {
+    buildInputs = [ jdk ];
+    JAVA_HOME = jdk;
   };
 
   rmagick = {
@@ -83,21 +101,7 @@ in
     NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick-6";
   };
 
-  xrefresh_server =
-    let
-      patch = fetchurl {
-        url = "http://mawercer.de/~nix/xrefresh.diff.gz";
-        sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
-      };
-    in {
-      propagatedBuildInputs = [ gems.rb_inotify ];
-
-      # monitor implementation for Linux
-      postInstall = ''
-        cd $out/${ruby.gemPath}/gems/*
-        zcat ${patch} | patch -p 1
-      ''; # */
-    };
+  sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
 
   xapian_full = {
     buildInputs = [ gems.rake zlib libuuid ];
@@ -112,23 +116,19 @@ in
     buildInputs = [ zlib libuuid ];
   };
 
-  rjb = {
-    buildInputs = [ jdk ];
-    JAVA_HOME = jdk;
-  };
-
-  buildr = {
-    # Many Buildfiles rely on RUBYLIB containing the current directory
-    # (as was the default in Ruby < 1.9.2).
-    extraWrapperFlags = "--prefix RUBYLIB : .";
-  };
-  
-  pry = { gemFlags = "--no-ri --no-rdoc"; };
+  xrefresh_server =
+    let
+      patch = fetchurl {
+        url = "http://mawercer.de/~nix/xrefresh.diff.gz";
+        sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
+      };
+    in {
+      propagatedBuildInputs = [ gems.rb_inotify ];
 
-  fakes3 = {
-    postInstall = ''
-      cd $out/${ruby.gemPath}/gems/*
-      patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch}
-    '';
-  };
+      # monitor implementation for Linux
+      postInstall = ''
+        cd $out/${ruby.gemPath}/gems/*
+        zcat ${patch} | patch -p 1
+      ''; # */
+    };
 }
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
new file mode 100644
index 00000000000..a59d28ba963
--- /dev/null
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+, cxxSupport ? true
+}:
+
+stdenv.mkDerivation rec {
+  name = "db-5.3.28";
+
+  src = fetchurl {
+    url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+    sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
+  };
+
+  configureFlags = [
+    (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+  ];
+
+  preConfigure = ''
+    cd build_unix
+    configureScript=../dist/configure
+  '';
+
+  postInstall = ''
+    rm -rf $out/docs
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
+    description = "Berkeley DB";
+    license = "Berkeley Database License";
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix
index cdc54ef6691..6326efe1adb 100644
--- a/pkgs/development/libraries/directfb/default.nix
+++ b/pkgs/development/libraries/directfb/default.nix
@@ -35,4 +35,22 @@ stdenv.mkDerivation {
     ] ++ stdenv.lib.optionals enableX11 [
       "--enable-x11"
     ];
+
+  meta = with stdenv.lib; {
+    description = "Graphics and input library designed with embedded systems in mind";
+    longDescription = ''
+      DirectFB is a thin library that provides hardware graphics acceleration,
+      input device handling and abstraction, integrated windowing system with
+      support for translucent windows and multiple display layers, not only on
+      top of the Linux Framebuffer Device. It is a complete hardware
+      abstraction layer with software fallbacks for every graphics operation
+      that is not supported by the underlying hardware. DirectFB adds graphical
+      power to embedded systems and sets a new standard for graphics under
+      Linux.
+    '';
+    homepage = http://directfb.org/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }
diff --git a/pkgs/development/libraries/directfb/src-for-default.nix b/pkgs/development/libraries/directfb/src-for-default.nix
index a9c8c16a9d3..be583e08b6b 100644
--- a/pkgs/development/libraries/directfb/src-for-default.nix
+++ b/pkgs/development/libraries/directfb/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.6.2";
-   name="directfb-1.6.2";
-   hash="0k9x8lnjvlyalsd07a8z4iv2rfmpiz6j7aj0y4m4sybxhc8c86xr";
+   version="1.6.3";
+   name="directfb-1.6.3";
+   hash="0w2yyx6l2wn8jj9y14ymknqyc88wwrl314p9204frck91znsr5ks";
    url="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${version}.tar.gz";
-   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.2.tar.gz";
+   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.3.tar.gz";
   
   
 }
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
new file mode 100644
index 00000000000..098643ae70f
--- /dev/null
+++ b/pkgs/development/libraries/glog/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "glog-0.3.3";
+  
+  src = fetchurl {
+    url = "http://google-glog.googlecode.com/files/${name}.tar.gz";
+    sha1 = "ed40c26ecffc5ad47c618684415799ebaaa30d65";
+  };
+
+  meta = {
+    homepage = http://code.google.com/p/google-glog/;
+    license = "BSD";
+    description = "The glog library implements application-level logging.";
+  };
+}
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 2c14451ba78..466406fbe79 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "gssdp-0.12.2.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz;
-    sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj";
+    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz;
+    sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws";
   };
 
   buildInputs = [pkgconfig libsoup glib libxml2];
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
new file mode 100644
index 00000000000..3cbb13972d3
--- /dev/null
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, gupnp, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "gupnp-av-${version}";
+  majorVersion = "0.12";
+  version = "${majorVersion}.4";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz";
+    sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
+  };
+  
+  buildInputs = [ gupnp pkgconfig ];
+
+  meta = {
+    homepage = http://gupnp.org/;
+    description = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP.";
+    longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index ca92bb82a73..bae0639a61c 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
-stdenv.mkDerivation {
-  name = "gupnp-0.18.4";
-
+stdenv.mkDerivation rec {
+  name = "gupnp-${version}";
+  majorVersion = "0.20";
+  version = "${majorVersion}.9";
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz;
-    sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb";
+    url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
+    sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
   };
 
   propagatedBuildInputs = [ libxml2 libsoup gssdp ];
@@ -13,7 +14,16 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  postInstall = '' 
+    cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include
+    cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include
+    cp -r ${libxml2}/include/libxml2/libxml $out/include
+    '';
+
   meta = {
     homepage = http://www.gupnp.org/;
+    description = "GUPnP is an implementation of the UPnP specification.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix
index 4a413e2e7b8..ac8ab3d7728 100644
--- a/pkgs/development/libraries/haskell/CouchDB/default.nix
+++ b/pkgs/development/libraries/haskell/CouchDB/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
   buildDepends = [ HTTP json mtl network utf8String ];
   testDepends = [ HTTP HUnit json mtl network utf8String ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/arjunguha/haskell-couchdb/";
     description = "CouchDB interface";
diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index 99cb73dcf1f..ae6f8e435f7 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HList";
-  version = "0.3.0.1";
-  sha256 = "03mp99pb8whh3whyffyj8wbld8lv8i930dyjdpyfwiaj13x05iy4";
+  version = "0.3.1.0";
+  sha256 = "1cq7l7cv62jf47s75ycsgxg75kkrgnnrpb6y22cskc97hkfsnjmk";
   buildDepends = [ mtl ];
   testDepends = [ cmdargs doctest filepath hspec lens mtl syb ];
   buildTools = [ diffutils ];
diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix
new file mode 100644
index 00000000000..bdfec2f01d4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/adjunctions/default.nix
@@ -0,0 +1,19 @@
+{ cabal, comonad, contravariant, distributive, free, mtl
+, semigroupoids, semigroups, tagged, transformers, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "adjunctions";
+  version = "4.0.1";
+  sha256 = "0z13rmh9yp8jg2jzj3bmysqc4h2nblshx125h2sx51wllnvxzh5l";
+  buildDepends = [
+    comonad contravariant distributive free mtl semigroupoids
+    semigroups tagged transformers void
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/adjunctions/";
+    description = "Adjunctions and representable functors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
new file mode 100644
index 00000000000..f084fda35c5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "annotated-wl-pprint";
+  version = "0.5.3";
+  sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis";
+  meta = {
+    homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
+    description = "The Wadler/Leijen Pretty Printer, with annotation support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix
index 186557d81b0..69083520c18 100644
--- a/pkgs/development/libraries/haskell/connection/default.nix
+++ b/pkgs/development/libraries/haskell/connection/default.nix
@@ -1,13 +1,14 @@
-{ cabal, certificate, cprngAes, dataDefault, network, socks, tls
-, tlsExtra
+{ cabal, cprngAes, dataDefaultClass, network, socks, tls, x509
+, x509Store, x509System, x509Validation
 }:
 
 cabal.mkDerivation (self: {
   pname = "connection";
-  version = "0.1.3.1";
-  sha256 = "1z9vb20466lg7l8z4abfbsdzpix18hswpqcl7s2gv838s2wvd16w";
+  version = "0.2.0";
+  sha256 = "17fzkgrjavmcxhdjj7agkx16jwpf6ql31nw1ni8gczkbp7azd0kp";
   buildDepends = [
-    certificate cprngAes dataDefault network socks tls tlsExtra
+    cprngAes dataDefaultClass network socks tls x509 x509Store
+    x509System x509Validation
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-connection";
diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix
index dd3c40a7d2c..28ef546163a 100644
--- a/pkgs/development/libraries/haskell/ekg/default.nix
+++ b/pkgs/development/libraries/haskell/ekg/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg";
-  version = "0.3.1.3";
-  sha256 = "1d8ly1lc92gh26bdqg3ql6n2iai3nyvwic6sj8pani58iv0p4ppc";
+  version = "0.3.1.4";
+  sha256 = "0hr9962yx463rq53xfqfm7vlv9izn47v3css3m6n4v694qlyz95i";
   buildDepends = [
     aeson filepath network snapCore snapServer text time transformers
     unorderedContainers
diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix
index 8e1212f5e5a..53f6fdce41c 100644
--- a/pkgs/development/libraries/haskell/fay-base/default.nix
+++ b/pkgs/development/libraries/haskell/fay-base/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay-base";
-  version = "0.18.0.0";
-  sha256 = "010zjcs4y0zdb4gijrw10sjc56i271s35bkwg5c0lblyr62nml0s";
+  version = "0.19";
+  sha256 = "03jf1ig3s2dcdd26j3d3iwm9hbiq5f5q5hyg22jdvl7lmvigw36j";
   buildDepends = [ fay ];
   meta = {
     homepage = "https://github.com/faylang/fay-base";
diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index d7c8ba5a447..adc29231d62 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -1,22 +1,22 @@
 { cabal, aeson, attoparsec, Cabal, cpphs, dataDefault, filepath
 , ghcPaths, haskellNames, haskellPackages, haskellSrcExts, HUnit
 , languageEcmascript, mtl, optparseApplicative, prettyShow, safe
-, sourcemap, split, syb, testFramework, testFrameworkHunit
-, testFrameworkTh, text, time, uniplate, unorderedContainers
-, utf8String, vector
+, scientific, sourcemap, split, syb, testFramework
+, testFrameworkHunit, testFrameworkTh, text, time, uniplate
+, unorderedContainers, utf8String, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.18.1.3";
-  sha256 = "1m747l2555w1jkdwh8b851mxvngiy7l7sbkwvm2il6k5ygcz5gbv";
+  version = "0.19.0.1";
+  sha256 = "036z4wz7vziaczhx1ysbm7d2302n2sb6l1z48py8spai5awkbvh0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson attoparsec Cabal cpphs dataDefault filepath ghcPaths
     haskellNames haskellPackages haskellSrcExts HUnit
     languageEcmascript mtl optparseApplicative prettyShow safe
-    sourcemap split syb testFramework testFrameworkHunit
+    scientific sourcemap split syb testFramework testFrameworkHunit
     testFrameworkTh text time uniplate unorderedContainers utf8String
     vector
   ];
diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index a481d451973..4e679da1bdb 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.2";
-  sha256 = "0g2k36xqma8r6shrih40w5xv0pgs5ldr9lhc5hjpwmh4n3hgdhfb";
+  version = "4.4";
+  sha256 = "19c6zy7gxsd121g1kny9y8rv33gsxv3kfsi37iyn6q0p8r38wbcy";
   buildDepends = [
     bifunctors comonad distributive mtl profunctors semigroupoids
     semigroups transformers
diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index 0c4020f746c..4dc73996cd1 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.3";
-  sha256 = "0s6nfjdasf62x28vzks809slnh0p6j3g101jzqlfh7nrnj5k6q1d";
+  version = "0.5.4";
+  sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
index 82866abe9c3..201e1e11564 100644
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client-tls";
-  version = "0.2.0.2";
-  sha256 = "0v5730rssddc28f1q6ndkcjrfz8r5a1wmxk1azpmdxlq6nh4i9q9";
+  version = "0.2.0.3";
+  sha256 = "0v8zbwlvdmkap5qbw9aw75krvw8j4q90fn301al13azzgjp71gmb";
   buildDepends = [ connection dataDefault httpClient network tls ];
   testDepends = [ hspec httpClient httpTypes ];
   doCheck = false;
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 704ec8db48e..819902d6139 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.1";
-  sha256 = "0xjjld1ra1a0a739ia8swgbpw7r72hv0bs9akbqr9wyw8qdzibnh";
+  version = "3.10.2";
+  sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw";
   buildDepends = [
     bifunctors comonad contravariant distributive filepath
     genericDeriving hashable MonadCatchIOTransformers mtl parallel
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
     transformers unorderedContainers vector
   ];
+  patchPhase = ''
+    sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|'
+  '';
   doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/lens/";
diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
index a358528ee28..a0d1e67ee6f 100644
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ b/pkgs/development/libraries/haskell/linear/default.nix
@@ -1,16 +1,17 @@
-{ cabal, binary, distributive, doctest, filepath, hashable, HUnit
-, lens, reflection, semigroupoids, semigroups, simpleReflect
-, tagged, testFramework, testFrameworkHunit, transformers
-, unorderedContainers, vector
+{ cabal, adjunctions, binary, distributive, doctest, filepath
+, hashable, HUnit, lens, reflection, semigroupoids, semigroups
+, simpleReflect, tagged, testFramework, testFrameworkHunit
+, transformers, unorderedContainers, vector, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "linear";
-  version = "1.4";
-  sha256 = "1a2l68q0l2vlp4wpf5wqvpnag326s38k2ifh8hcfczjhsg9cq45a";
+  version = "1.6";
+  sha256 = "1aka0da4mwv9cdj76armlava0d4c5f8s2pv10fk6b5glyb0c1a7x";
   buildDepends = [
-    binary distributive hashable reflection semigroupoids semigroups
-    tagged transformers unorderedContainers vector
+    adjunctions binary distributive hashable lens reflection
+    semigroupoids semigroups tagged transformers unorderedContainers
+    vector void
   ];
   testDepends = [
     binary doctest filepath HUnit lens simpleReflect testFramework
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index bd9261f901e..87bd36503e1 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadcryptorandom";
-  version = "0.6";
-  sha256 = "0gms6xsnr6g5lk36z92yygwmyrl568y1h76ww676wb3qph42xx3x";
+  version = "0.6.1";
+  sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2";
   buildDepends = [ cryptoApi mtl tagged transformers ];
   meta = {
     homepage = "https://github.com/TomMD/monadcryptorandom";
diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
index 2cb5e5a5cfc..28cf920cf28 100644
--- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix
@@ -1,17 +1,17 @@
 { cabal, aeson, certificate, conduit, connection, cprngAes
 , cryptoApi, cryptoRandomApi, dataDefault, HUnit, monadControl, mtl
 , network, networkConduit, pem, systemFileio, systemFilepath, tls
-, tlsExtra, transformers
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "network-conduit-tls";
-  version = "1.0.3";
-  sha256 = "0l8h9pfrrqzkf45cp5r8kxpzc2fi6m01s4zkrh0d226rbps3gmvc";
+  version = "1.0.4.1";
+  sha256 = "1l79v4ippyfw6pl4h3vqswh79vcif80phf6kq5fr4xmv3b6nbc06";
   buildDepends = [
     aeson certificate conduit connection cprngAes cryptoApi
     cryptoRandomApi dataDefault monadControl network networkConduit pem
-    systemFileio systemFilepath tls tlsExtra transformers
+    systemFileio systemFilepath tls transformers
   ];
   testDepends = [ conduit connection HUnit mtl networkConduit ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/pqueue/default.nix b/pkgs/development/libraries/haskell/pqueue/default.nix
new file mode 100644
index 00000000000..8634c414318
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pqueue/default.nix
@@ -0,0 +1,13 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "pqueue";
+  version = "1.2.1";
+  sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6";
+  buildDepends = [ deepseq ];
+  meta = {
+    description = "Reliable, persistent, fast priority queues";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
index ee408fea480..c224da3a339 100644
--- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana-wx";
-  version = "0.7.1.0";
-  sha256 = "06hkb8v6rjpw95vf16xh547igxxzddr6wpjiwhqwpwhz2alavk2v";
+  version = "0.8.0.0";
+  sha256 = "0qfd839nm2ppjhhhnn6s1hbx1mnrzjqx450p4jadsrs1y2403c9n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ cabalMacosx reactiveBanana wx wxcore ];
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 0bf7747d46b..535b289a389 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -1,19 +1,21 @@
-{ cabal, hashable, HUnit, testFramework, testFrameworkHunit
+{ cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit
 , transformers, unorderedContainers, vault
 }:
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.7.1.3";
-  sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb";
-  buildDepends = [ hashable transformers unorderedContainers vault ];
+  version = "0.8.0.0";
+  sha256 = "15dzvn7cbs9kg410lyd1kj6kf2r7ap2n9bc59byzkb0r8wzn9ra1";
+  buildDepends = [
+    hashable pqueue transformers unorderedContainers vault
+  ];
   testDepends = [
-    hashable HUnit testFramework testFrameworkHunit transformers
+    hashable HUnit pqueue testFramework testFrameworkHunit transformers
     unorderedContainers vault
   ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/Reactive-banana";
-    description = "Practical library for functional reactive programming (FRP)";
+    description = "Library for functional reactive programming (FRP)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix
index 5f227d60ca8..a02a7ec6907 100644
--- a/pkgs/development/libraries/haskell/reflection/default.nix
+++ b/pkgs/development/libraries/haskell/reflection/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reflection";
-  version = "1.3.2";
-  sha256 = "0jmdygvmvhw20aqjk7k0jah93ggfgf2bgq5zpwnz9bwgi9gs17x6";
+  version = "1.4";
+  sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7";
   buildDepends = [ tagged ];
   meta = {
     homepage = "http://github.com/ekmett/reflection";
diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix
index 602654b0a01..ce0c89d4596 100644
--- a/pkgs/development/libraries/haskell/sourcemap/default.nix
+++ b/pkgs/development/libraries/haskell/sourcemap/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sourcemap";
-  version = "0.1.2.0";
-  sha256 = "040j2k1cwzlq5pybs6cg7wmf0x5i22zdidv2xvzdvgi5v7gf6kp1";
+  version = "0.1.3.0";
+  sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5";
   buildDepends = [
     aeson attoparsec text unorderedContainers utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
deleted file mode 100644
index 6d63c267c61..00000000000
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, certificate, cipherAes, cipherRc4, cryptohash
-, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
-}:
-
-cabal.mkDerivation (self: {
-  pname = "tls-extra";
-  version = "0.6.6";
-  sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    certificate cipherAes cipherRc4 cryptohash cryptoPubkey
-    cryptoRandom mtl network pem time tls vector
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://github.com/vincenthz/hs-tls";
-    description = "TLS extra default values and helpers";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 0f354d8b77e..638299d4a42 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -1,18 +1,23 @@
-{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
-, cryptoRandom, mtl, network, QuickCheck, testFramework
-, testFrameworkQuickcheck2, time
+{ cabal, asn1Encoding, asn1Types, cereal, cipherAes, cipherRc4
+, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey
+, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network
+, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509
+, x509Store, x509Validation
 }:
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.1.5";
-  sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
+  version = "1.2.2";
+  sha256 = "156l859mfpdax5rg1frwa5ms5bzggaja0mi795hh8i5c3ah7hfcp";
   buildDepends = [
-    cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
+    asn1Encoding asn1Types cereal cipherAes cipherRc4 cryptohash
+    cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
+    dataDefaultClass mtl network x509 x509Store x509Validation
   ];
   testDepends = [
-    cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
-    QuickCheck testFramework testFrameworkQuickcheck2 time
+    cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl
+    QuickCheck testFramework testFrameworkQuickcheck2 time x509
+    x509Validation
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index df57bbbdac7..4667ed956f0 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -1,10 +1,10 @@
-{ cabal, mtl, RepLib, transformers }:
+{ cabal, binary, mtl, RepLib, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4.2";
-  sha256 = "1bnnnv4rmzb0pw7i56nzr7k7pahr9rcmlfi4xkpsjhrxmizcfml9";
-  buildDepends = [ mtl RepLib transformers ];
+  version = "0.4.3";
+  sha256 = "1lv60zpsvjfp9qnckwbphkfv0x9pz2qvaab3p4kj38fnlq2y20i4";
+  buildDepends = [ binary mtl RepLib transformers ];
   meta = {
     homepage = "http://code.google.com/p/replib/";
     description = "Generic support for programming with names and binders";
diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
index 8f5ec4b52bf..db328836616 100644
--- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
+++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
@@ -1,10 +1,11 @@
-{ cabal, vector }:
+{ cabal, dataDefault, vector }:
 
 cabal.mkDerivation (self: {
   pname = "vector-th-unbox";
-  version = "0.2.0.1";
-  sha256 = "1q01yk6cyjxbdnmq31d5mfac09hbql43d7xiw1snc96nmkklfpjv";
+  version = "0.2.0.2";
+  sha256 = "1c8xy0rcl8il9ssclqshwi8dd2xx6bl1rfhrfm9h7wklw64db9xp";
   buildDepends = [ vector ];
+  testDepends = [ dataDefault vector ];
   meta = {
     description = "Deriver for Data.Vector.Unboxed using Template Haskell";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 3022b0565de..f3d2dfbd0cd 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.3.2";
-  sha256 = "0zhwk78ny7ak6sf974gqg3zjrrmivgb7dvxs5jbqghq0a6xs97zi";
+  version = "2.0.3.3";
+  sha256 = "11ma8pazvysvpiy8y7xfh7kpmsfiw94bd6vyyi3ji8q71rzjlf62";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
index 88e50b2488e..c93352cf65c 100644
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -1,15 +1,14 @@
-{ cabal, certificate, conduit, cprngAes, cryptocipher
-, cryptoRandomApi, network, networkConduit, pem, tls, tlsExtra
-, transformers, wai, warp
+{ cabal, conduit, cprngAes, dataDefaultClass, network
+, networkConduit, tls, transformers, wai, warp
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "2.0.1";
-  sha256 = "0qz02awxrfqmmckias21dh0irmf44vamv24jjjrbb6bjxbr4ldd0";
+  version = "2.0.2";
+  sha256 = "02wj9hwxd0x49g7kl68h3r4b9hc29yqfjagyybnr42xzwl6bdpyg";
   buildDepends = [
-    certificate conduit cprngAes cryptocipher cryptoRandomApi network
-    networkConduit pem tls tlsExtra transformers wai warp
+    conduit cprngAes dataDefaultClass network networkConduit tls
+    transformers wai warp
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";
diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix
index bc1c0c47dc9..100b5ca2835 100644
--- a/pkgs/development/libraries/haskell/x509-store/default.nix
+++ b/pkgs/development/libraries/haskell/x509-store/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "x509-store";
-  version = "1.4.3";
-  sha256 = "1px5r5y4vaxx479d4av333g1sc03mz1aalpvwwkbi5bwnxydvf01";
+  version = "1.4.4";
+  sha256 = "0i3hfrddr0wpfl75a76a1j24az08z4x7ya8l5qcdk7c1lr2c2bw8";
   buildDepends = [
     asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509
   ];
diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
deleted file mode 100644
index ee9fa20c8de..00000000000
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec
-, attoparsecConduit, authenticate, base64Bytestring
-, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
-, blazeMarkup, byteable, byteorder, caseInsensitive, cereal
-, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes
-, cipherRc4, clientsession, conduit, connection, controlMonadLoop
-, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes
-, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers
-, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi
-, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase
-, dataDefaultInstancesContainers, dataDefaultInstancesDlist
-, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy
-, esqueleto, 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, scientific, 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, warpTls, word8, xmlConduit, xmlTypes, xssSanitize
-, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent
-, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit
-}:
-
-cabal.mkDerivation (self: {
-  pname = "yesod-platform";
-  version = "1.2.6.1";
-  sha256 = "1hwvpyxwirv9maangw4q6nb2m2kqpqvvh1i095fr08f1a1qih77f";
-  buildDepends = [
-    aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
-    authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
-    blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
-    caseInsensitive cereal certificate cipherAes cipherBlowfish
-    cipherCamellia cipherDes cipherRc4 clientsession conduit connection
-    controlMonadLoop cookie cprngAes cryptoApi cryptocipher
-    cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi
-    cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
-    cryptoRandomApi cssText dataDefault dataDefaultClass
-    dataDefaultInstancesBase dataDefaultInstancesContainers
-    dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist
-    emailValidate entropy esqueleto 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 scientific
-    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 warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod
-    yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
-    yesodStatic yesodTest zlibBindings zlibConduit
-  ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Meta package for Yesod";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix
new file mode 100644
index 00000000000..dd8ad8b3561
--- /dev/null
+++ b/pkgs/development/libraries/ilixi/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }:
+
+# TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen,
+# Reflex, Wnn, NLS
+
+stdenv.mkDerivation rec {
+  name = "ilixi-1.0.0";
+
+  src = fetchurl {
+    url = "http://www.directfb.org/downloads/Libs/${name}.tar.gz";
+    sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v";
+  };
+
+  buildInputs = [ pkgconfig directfb libsigcxx libxml2 fontconfig ];
+
+  configureFlags = ''
+    --enable-log-debug --enable-debug --enable-trace --with-examples
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lightweight C++ GUI toolkit for embedded Linux systems";
+    homepage = http://ilixi.org/;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index e0f2ba77de2..7abad2f2d08 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -5,7 +5,10 @@ stdenv.mkDerivation rec {
   name = "libarchive-3.1.2";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/${name}.tar.gz";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/pkgs/libarchive/libarchive-3.1.2.tar.gz/efad5a503f66329bb9d2f4308b5de98a/${name}.tar.gz"
+      "${meta.homepage}/downloads/${name}.tar.gz"
+    ];
     sha256 = "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb";
   };
 
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
new file mode 100644
index 00000000000..695c0fa1a32
--- /dev/null
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "libcangjie-1.0";
+
+  src = fetchurl {
+    url = "https://github.com/Cangjians/libcangjie/archive/v1.0.tar.gz";
+    sha256 = "15la1pxa2fvhznlbkl32qp2cgd602bvrx2zmahybypbfik0cgqk1";
+  };
+
+  buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ];
+
+  configureScript = "./autogen.sh";
+  
+  preConfigure = ''
+    find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
+  '';
+
+  doCheck = true;
+
+  meta = {
+    description = "A C library implementing the Cangjie input method";
+    longDescription = ''
+      libcangjie is a library implementing the Cangjie input method.
+    '';
+    homepage = http://cangjians.github.io/projects/libcangjie/;
+    license = "LGPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.linquize ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/libsoup/2.44.nix b/pkgs/development/libraries/libsoup/2.44.nix
deleted file mode 100644
index 4bef93ff8cd..00000000000
--- a/pkgs/development/libraries/libsoup/2.44.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection
-, glib, libxml2, sqlite, glib_networking
-, gnomeSupport ? true, libgnome_keyring
-}:
-
-stdenv.mkDerivation {
-  name = "libsoup-2.44.2";
-
-  meta = {
-    description = "HTTP client/server library";
-    license = stdenv.lib.licenses.lgpl2Plus;
-  };
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz;
-    sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77";
-  };
-
-  preConfigure = ''
-    substituteInPlace libsoup/tld-parser.py \
-      --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
-  '';
-
-  nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ];
-
-  propagatedBuildInputs = [ glib libxml2 sqlite ]
-    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
-
-  passthru.propagatedUserEnvPackages = [ glib_networking ];
-
-  # glib_networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check";
-
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-}
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index a5ce0fda270..049d6646ec8 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,19 +1,26 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking
-, libintlOrEmpty }:
-
+, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
+, libintlOrEmpty
+, intltool, python }:
+let
+  majorVersion = "2.45";
+  version = "${majorVersion}.3";
+in
 stdenv.mkDerivation {
-  name = "libsoup-2.38.1";
+  name = "libsoup-${version}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
-    sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
+    url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
+    sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
   };
 
+  patchPhase = ''
+    patchShebangs libsoup/
+  '';
 
-  buildInputs = libintlOrEmpty;
+  buildInputs = libintlOrEmpty ++ [ intltool python ];
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libxml2 ]
+  propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
   passthru.propagatedUserEnvPackages = [ glib_networking ];
 
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 3833e5bffa1..8be17b289f7 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 let
-  version = "1.0.17";
+  version = "1.0.18";
 in
 stdenv.mkDerivation rec {
-  name = "libusbx-${version}"; # it's a fork of original libusb1; should be mostly compatible
+  name = "libusb-${version}"; # at 1.0.18 libusb joined with libusbx
 
   src = fetchurl {
-    url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2";
-    sha256 = "1f25a773x9x5n48a0mcigyk77ay0hkiz6y6bi4588wzf7wn8svw7";
+    url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2";
+    sha256 = "081px0j98az0pjwwyjlq4qcmfn194fvm3qd4im0r9pm58pn5qgy7";
   };
 
   buildInputs = [ pkgconfig ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   meta = {
-    homepage = http://www.libusb.org;
+    homepage = http://www.libusb.info;
     description = "User-space USB library";
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.urkud ];
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
new file mode 100644
index 00000000000..130107341f7
--- /dev/null
+++ b/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
@@ -0,0 +1,11 @@
+--- a/src/scanner.c	
++++ a/src/scanner.c	
+@@ -2574,7 +2574,7 @@ 
+ 
+     /* Resize the string to include the head. */
+ 
+-    while (string.end - string.start <= (int)length) {
++    while ((size_t)(string.end - string.start) <= length) {
+         if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
+             parser->error = YAML_MEMORY_ERROR;
+             goto error;
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
new file mode 100644
index 00000000000..db2b9ff2bba
--- /dev/null
+++ b/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
@@ -0,0 +1,16 @@
+--- a/src/api.c	
++++ a/src/api.c	
+@@ -117,7 +117,12 @@ 
+ YAML_DECLARE(int)
+ yaml_stack_extend(void **start, void **top, void **end)
+ {
+-    void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
++    void *new_start;
++
++    if ((char *)*end - (char *)*start >= INT_MAX / 2)
++	return 0;
++
++    new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
+ 
+     if (!new_start) return 0;
+ 
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch
new file mode 100644
index 00000000000..dc1c50da4e8
--- /dev/null
+++ b/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch
@@ -0,0 +1,131 @@
+--- a/src/scanner.c	Mon Dec 24 03:51:32 2012 +0000
++++ a/src/scanner.c	Mon Jan 27 19:48:28 2014 -0500
+@@ -615,11 +615,14 @@ 
+  */
+ 
+ static int
+-yaml_parser_roll_indent(yaml_parser_t *parser, int column,
++yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
+         int number, yaml_token_type_t type, yaml_mark_t mark);
+ 
+ static int
+-yaml_parser_unroll_indent(yaml_parser_t *parser, int column);
++yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column);
++
++static int
++yaml_parser_reset_indent(yaml_parser_t *parser);
+ 
+ /*
+  * Token fetchers.
+@@ -1206,7 +1209,7 @@ 
+  */
+ 
+ static int
+-yaml_parser_roll_indent(yaml_parser_t *parser, int column,
++yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
+         int number, yaml_token_type_t type, yaml_mark_t mark)
+ {
+     yaml_token_t token;
+@@ -1216,7 +1219,7 @@ 
+     if (parser->flow_level)
+         return 1;
+ 
+-    if (parser->indent < column)
++    if (parser->indent == -1 || parser->indent < column)
+     {
+         /*
+          * Push the current indentation level to the stack and set the new
+@@ -1254,7 +1257,7 @@ 
+ 
+ 
+ static int
+-yaml_parser_unroll_indent(yaml_parser_t *parser, int column)
++yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column)
+ {
+     yaml_token_t token;
+ 
+@@ -1263,6 +1266,15 @@ 
+     if (parser->flow_level)
+         return 1;
+ 
++    /*
++     * column is unsigned and parser->indent is signed, so if
++     * parser->indent is less than zero the conditional in the while
++     * loop below is incorrect.  Guard against that.
++     */
++    
++    if (parser->indent < 0)
++        return 1;
++
+     /* Loop through the intendation levels in the stack. */
+ 
+     while (parser->indent > column)
+@@ -1283,6 +1295,41 @@ 
+ }
+ 
+ /*
++ * Pop indentation levels from the indents stack until the current
++ * level resets to -1.  For each intendation level, append the
++ * BLOCK-END token.
++ */
++
++static int
++yaml_parser_reset_indent(yaml_parser_t *parser)
++{
++    yaml_token_t token;
++
++    /* In the flow context, do nothing. */
++
++    if (parser->flow_level)
++        return 1;
++
++    /* Loop through the intendation levels in the stack. */
++
++    while (parser->indent > -1)
++    {
++        /* Create a token and append it to the queue. */
++
++        TOKEN_INIT(token, YAML_BLOCK_END_TOKEN, parser->mark, parser->mark);
++
++        if (!ENQUEUE(parser, parser->tokens, token))
++            return 0;
++
++        /* Pop the indentation level. */
++
++        parser->indent = POP(parser, parser->indents);
++    }
++
++    return 1;
++}
++
++/*
+  * Initialize the scanner and produce the STREAM-START token.
+  */
+ 
+@@ -1338,7 +1385,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */
+@@ -1369,7 +1416,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */
+@@ -1407,7 +1454,7 @@ 
+ 
+     /* Reset the indentation level. */
+ 
+-    if (!yaml_parser_unroll_indent(parser, -1))
++    if (!yaml_parser_reset_indent(parser))
+         return 0;
+ 
+     /* Reset simple keys. */
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index cf687c97243..93f19165e88 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation {
     sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v";
   };
 
+  # Downloaded on 2014-02-01 from https://bugzilla.redhat.com/show_bug.cgi?id=1033990
+  patches = [ ./cve-2013-6393_a.patch ./cve-2013-6393_b.patch ./cve-2013-6393_c.patch ];
+
   meta = {
     homepage = http://pyyaml.org/;
     description = "A YAML 1.1 parser and emitter written in C";
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix
new file mode 100644
index 00000000000..25c2117b059
--- /dev/null
+++ b/pkgs/development/libraries/libyubikey/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec
+{
+  version = "1.11";
+  name = "libyubikey-${version}";
+
+  src = fetchurl
+  {
+    url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz";
+    sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9";
+  };
+
+  meta =
+  {
+    homepage = "http://opensource.yubico.com/yubico-c/";
+    description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)";
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.calrama ];
+  };
+}
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 60b9c7738a0..1273146c342 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.openldap.org/";
     description = "An open source implementation of the Lightweight Directory Access Protocol";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 6e61b743a56..678a439fe0a 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
     homePage = http://www.open-mpi.org/;
     description = "Open source MPI-2 implementation";
     longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
 
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
new file mode 100644
index 00000000000..48bbd3aa785
--- /dev/null
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, gfortran, openblas }:
+
+let version = "3.1.4";
+in
+stdenv.mkDerivation {
+  name = "arpack-${version}";
+  src = fetchurl {
+    url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${version}.tar.gz";
+    sha256 = "0m4cqy3d7fpzx1nac3brhr298qj7vx3fchjdz5b7n0pp616cmcm1";
+  };
+
+  buildInputs = [ gfortran ];
+  propagatedBuildInputs = [ openblas ];
+
+  # Auto-detection fails because gfortran brings in BLAS by default
+  configureFlags="--with-blas=-lopenblas --with-lapack=-lopenblas";
+
+  meta = {
+    homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";
+    description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
new file mode 100644
index 00000000000..29e92d0b6ec
--- /dev/null
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, mcpp, bzip2, expat, openssl, db5 }:
+
+stdenv.mkDerivation rec {
+  name = "zeroc-ice-3.5.1";
+
+  src = fetchurl {
+    url = "http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz";
+    sha256 = "14pk794p0fq3hcp50xmqnf9pp15dggiqhcnsav8xpnka9hcm37lq";
+  };
+
+  buildInputs = [ mcpp bzip2 expat openssl db5 ];
+
+  buildPhase = ''
+    cd cpp
+    make OPTIMIZE=yes
+  '';
+
+  installPhase = ''
+    make prefix=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.zeroc.com/ice.html";
+    description = "The internet communications engine";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index a77e477f572..c177d8fe03f 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -42,8 +42,9 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "API to access display driver functionality for ATI graphics cards";
     homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
-    license = licenses.amdadl;
+    license = licenses.unfree;
     maintainers = [ maintainers.offline ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 9c843fa8c37..53687868102 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -95,7 +95,15 @@ stdenv.mkDerivation {
     
     ${stdenv.lib.optionalString (app != null) ''
       # Install the App through the debugger
-      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
+      
+      if [ -d "${app}" ]
+      then
+          appPath="$(echo ${app}/*.apk)"
+      else
+          appPath="${app}"
+      fi
+      
+      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath"
     
       # Start the application
       ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index a8d376ef23c..0a0974b886a 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "LCOV, a code coverage tool that enhances GNU gcov";
 
     longDescription =
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = http://ltp.sourceforge.net/coverage/lcov.php;
     license = "GPLv2+";
 
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.mornfall ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index b4fdd4c09d4..4be166f9768 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation {
     description = "Formal verification tool for distributed software systems";
     homepage = http://spinroot.com/;
     license = "free";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index 92bb973b558..33e5339a5f0 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.7.1.1";
-  sha256 = "1gh0md8gfchniclck5ddbkdwf9dl01mkcdmdx3n3f59rx9qi8g0h";
+  version = "0.7.1.2";
+  sha256 = "1bplcjh0rx6m8ja8vpb18cfky349gmi27rlpsg0pw5nr3l4gcwyl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index bdf3a7d0561..732423da5cd 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     description = "A system call tracer for Linux";
     license = licenses.bsd3;
     platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix
new file mode 100644
index 00000000000..f0966357d93
--- /dev/null
+++ b/pkgs/development/web/xmlindent/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, flex }:
+
+stdenv.mkDerivation rec {
+  name = "xmlindent-${version}";
+  version = "0.2.17";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz";
+    sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs";
+  };
+
+  buildInputs = [ flex ];
+
+  preConfigure = ''
+    substituteInPlace Makefile --replace "PREFIX=/usr/local" "PREFIX=$out"
+  '';
+
+  meta = {
+    description = "XML stream reformatter";
+    homepage = http://xmlindent.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
+  };
+}
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 65a61cb6cab..196561d1e37 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -4,7 +4,7 @@ let
   result = withPak (mkPak pak128);
 
   ver_1 = "112";
-  ver_2 = "1";
+  ver_2 = "3";
   ver_h2 = "${ver_1}-${ver_2}";
 
   # "pakset" of objects, images, text, music, etc.
@@ -23,11 +23,11 @@ let
   };
   pak64 = fetchurl {
     url = "mirror://sourceforge/simutrans/pak64/${ver_h2}/simupak64-${ver_h2}.zip";
-    sha256 = "1197rl2534wx9wdafarlr42qjw6pyghz4bynq2g68pi10h8csypw";
+    sha256 = "1ng963n2gvnwmsj73iy3gp9i5iqf5g6qk1gh1jnfm86gnjrsrq4m";
   };
   pak128 = fetchurl {
-    url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.2.0--${ver_1}.0.zip";
-    sha256 = "13rwv9q3fa3ac0k11ds7zkpd00k4mn14rb0cknknvyz46icb9n80";
+    url = "mirror://sourceforge/simutrans/pak128/pak128%20for%20${ver_1}/pak128-2.3.0--${ver_1}.2.zip";
+    sha256 = "0jcif6mafsvpvxh1njyd6z2f6sab0fclq3f3nlg765yp3i1bfgff";
   };
 
   withPak = pak: stdenv.mkDerivation {
@@ -44,7 +44,13 @@ let
 
     src = fetchurl {
       url = "mirror://sourceforge/simutrans/simutrans/${ver_h2}/simutrans-src-${ver_h2}.zip";
-      sha256 = "1xrxpd5m2dc9bk8w21smfj28r41ji1qaihjwkwrifgz6rhg19l5c";
+      sha256 = "0jdq2krfj3qsh8dks9ixsdvpyjq9yi80p58b0xjpsn35mkbxxaca";
+    };
+
+    # this resource is needed since 112.2 because the folders in simutrans directory has been removed from source code
+    resources = fetchurl {
+      url = "mirror://sourceforge/simutrans/simutrans/${ver_h2}/simulinux-${ver_h2}.zip";
+      sha256 = "14ly341pdkr8r3cd0q49w424m79iz38iaxfi9l1yfcxl8idkga1c";
     };
     sourceRoot = ".";
 
@@ -72,6 +78,7 @@ let
     installPhase = ''
       mkdir -p $out/share/
       mv simutrans $out/share/
+      unzip -o ${resources} -d $out/share/
 
       mkdir -p $out/bin/
       mv build/default/sim $out/bin/simutrans
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index ed37227bb03..5695bb5b429 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -15,7 +15,11 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = [ "doConfigure" "doMakeInstall"];
+  phaseNames = [ "patchIncludes" "doConfigure" "doMakeInstall"];
+  patchIncludes = a.fullDepEntry ''
+    sed -e '1i#include <sys/types.h>' -i src/helpers//System.cpp
+    sed -e '1i#include <unistd.h>' -i src/helpers//System.cpp
+  '' ["doUnpack" "minInit"];
 
   meta = {
     description = "X-Moto - obstacled race game";
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 2a774949530..a3400ee0823 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Show battery status and other ACPI information";
     longDescription = ''
       Linux ACPI client is a small command-line
@@ -19,5 +19,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://sourceforge.net/projects/acpiclient/;
     license = "GPLv2+";
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/os-specific/linux/alienfx/default.nix b/pkgs/os-specific/linux/alienfx/default.nix
index 9924779d92a..93d77819e57 100644
--- a/pkgs/os-specific/linux/alienfx/default.nix
+++ b/pkgs/os-specific/linux/alienfx/default.nix
@@ -14,11 +14,12 @@ stdenv.mkDerivation {
     sha256 = "47501a3b4e08d39edee4cd829ae24259a7e740b9798db76b846fa872989f8fb1";
   };
 
-  patchPhase = ''
+  prePatch = ''
     substituteInPlace Makefile --replace /usr/ $out/
     substituteInPlace Makefile --replace "install -o root -g root" "install"
   '';
  
+  patches = [./unistd.patch];
   buildInputs = [ libusb1 ];
   makeFlags = "build";
   preInstall = ''
diff --git a/pkgs/os-specific/linux/alienfx/unistd.patch b/pkgs/os-specific/linux/alienfx/unistd.patch
new file mode 100644
index 00000000000..546a27892f0
--- /dev/null
+++ b/pkgs/os-specific/linux/alienfx/unistd.patch
@@ -0,0 +1,12 @@
+diff --git a/alienfx.cpp b/alienfx.cpp
+index 5981039..aea8992 100644
+--- a/alienfx.cpp
++++ b/alienfx.cpp
+@@ -13,6 +13,7 @@
+ #include <string.h>
+ #include <iostream>
+ #include <libusb-1.0/libusb.h>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 183d2d86d4c..d6513f7ebb5 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
   
   inherit utillinux;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://fuse.sourceforge.net/;
     description = "Kernel module and library that allows filesystems to be implemented in user space";
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix
index 967de85b7b3..437e4bc025a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.13";
-
-  modDirVersion = "3.13.0";
+  version = "3.13.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2";
+    sha256 = "0gkikbz676h79rv0aaihl90mw7fqhjx3rkhcqrmzggjb54048jvq";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index d1909c17967..14a4b64fe55 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.77";
+  version = "3.4.78";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "05hfa5cxcxvqg183amfpvjzh6i9lphx1956j92sh6r90pnhg0xgz";
+    sha256 = "1n9avgjy3qpr28n1rq80kc1gn33w9nz6bvwds6i4d5z793fp7qpk";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/servers/dict/buildfix.diff b/pkgs/servers/dict/buildfix.diff
new file mode 100644
index 00000000000..e30fcb2b038
--- /dev/null
+++ b/pkgs/servers/dict/buildfix.diff
@@ -0,0 +1,11 @@
+--- Makefile.in~	2011-03-06 18:52:54.000000000 +0100
++++ Makefile.in	2014-01-29 19:04:51.384844897 +0100
+@@ -123,7 +123,7 @@
+ 
+ %: %.o
+ 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
+-		$^ $(OBJS) $(LDFLAGS) -lz ${LIBS}
++	    $(^:.o=.lo) $(OBJS) $(LDFLAGS) -lz ${LIBS}
+ 
+ include $(srcdir)/deps
+ 
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 51de674eb9f..1fb7c24418f 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, which, bison, flex }:
+{ stdenv, fetchurl, which, bison, flex, libmaa, zlib, libtool }:
 
-stdenv.mkDerivation {
-  name = "dictd-1.9.15";
+stdenv.mkDerivation rec {
+  version = "1.12.1";
+  name = "dictd-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz;
-    sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac";
+    url = "mirror://sourceforge/dict/dictd-${version}.tar.gz";
+    sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2";
   };
 
-  buildInputs = [ flex bison which ];
-  
+  buildInputs = [ flex bison which libmaa zlib libtool ];
+
+  patchPhase = "patch -p0 < ${./buildfix.diff}";
   configureFlags = "--datadir=/var/run/current-system/share/dictd";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Dict protocol server and client";
-    maintainers = with stdenv.lib.maintainers; mornfall;
+    maintainers = maintainers.mornfall;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix
index 48aaf187605..9e9c05d2f91 100644
--- a/pkgs/servers/dict/dictd-wiktionary.nix
+++ b/pkgs/servers/dict/dictd-wiktionary.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, dict, glibcLocales, writeScript}:
 
 stdenv.mkDerivation rec {
-  version = "20121021";
+  version = "20140118";
   name = "dict-db-wiktionary-${version}";
   data = fetchurl {
     url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
-    sha256 = "1i4xwdpc2bx58495iy62iz0kn50c3qmnh4qribi82f2rd4qkfjd2";
+    sha256 = "892c9fc16b248a31e2d3e42590267161c1b899b31fe923eb1ede1deb6d24cfa8";
   };
 
   convert = ./wiktionary2dict.py;
diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix
new file mode 100644
index 00000000000..c63306e1ff4
--- /dev/null
+++ b/pkgs/servers/dict/libmaa.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libtool }:
+
+stdenv.mkDerivation rec {
+  version = "1.3.2";
+  name = "libmaa-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dict/libmaa-${version}.tar.gz";
+    sha256 = "1idi4c30pi79g5qfl7rr9s17krbjbg93bi8f2qrbsdlh78ga19ar";
+  };
+
+  buildInputs = [ libtool ];
+  # configureFlags = "--datadir=/var/run/current-system/share/dictd";
+
+  meta = with stdenv.lib; {
+    description = "Dict protocol server and client";
+    maintainers = maintainers.mornfall;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index d7d1533b3be..35370ae2128 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -5,6 +5,7 @@
 
 buildPythonPackage rec {
   name = "xpra-0.9.5";
+  namePrefix = "";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.bz2";
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index f6a51eb3193..854801a3edd 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.6";
+  version = "1.6.1";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz";
-    sha256 = "1vg0kppbyngvm7wi2pbg3himixy9v3h8z66lcps6pclw43s1kgpm";
+    sha256 = "0415njniqpy3xhvibpm82i9alrp2fw3lsnm15h7vqkkvgp8s5g39";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
new file mode 100644
index 00000000000..183b889da9b
--- /dev/null
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, pkgconfig, utillinux, kmod }:
+
+stdenv.mkDerivation rec {
+  name = "bcache-tools-${version}";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
+    sha256 = "1abf86xcnj601lddig3kmn26jrf8q8xhcyszf5pxrcs5ym72jj8l";
+  };
+
+  buildInputs = [ pkgconfig utillinux ];
+
+  # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need
+  #   anyway (it's distro specific stuff).
+  # * Fixup absolute path to modprobe.
+  prePatch = ''
+    sed -e "/INSTALL.*initramfs\/hook/d" \
+        -e "/INSTALL.*initcpio\/install/d" \
+        -e "/INSTALL.*dracut\/module-setup.sh/d" \
+        -i Makefile
+
+    sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|" -i bcache-register
+  '';
+
+  preBuild = ''
+    export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\"";
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "User-space tools required for bcache (Linux block layer cache)";
+    longDescription = ''
+      Bcache is a Linux kernel block layer cache. It allows one or more fast
+      disk drives such as flash-based solid state drives (SSDs) to act as a
+      cache for one or more slower hard disk drives.
+      
+      This package contains the required user-space tools.
+
+      User documentation is in Documentation/bcache.txt in the Linux kernel
+      tree.
+    '';
+    homepage = http://bcache.evilpiepirate.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 40a2f7f481d..cca459c1a29 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 = "2014.01.23.4";
+  version = "2014.01.30.2";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0wnw11s3k191wqf3h13ibdbkgdyabv3gigsjk5xq3sqswlmmcvd9";
+    sha256 = "1bx4ip1d4gp057nha4ylj2baksxg8kkxgvsdcx6bj36wbb0f8fl9";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
new file mode 100644
index 00000000000..f667d772ac4
--- /dev/null
+++ b/pkgs/tools/networking/bully/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, openssl, libpcap}:
+
+stdenv.mkDerivation rec {
+  name = "bully-${version}";
+  version = "1.0-22";
+  src = fetchurl {
+    url = "https://github.com/bdpurcell/bully/archive/v${version}.tar.gz";
+    sha256 = "72f568f659fdcf70455a17f91f25dde65a53431c67c796517d3d3c4a4703ab68";
+  };
+  buildInputs = [ openssl libpcap ];
+
+  buildPhase = ''
+    cd src
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv bully $out/bin
+  '';
+
+  meta = {
+    description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point.";
+    homepage = "https://github.com/bdpurcell/bully";
+    maintainers = [ stdenv.lib.maintainers.edwtjo ];
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index 8346be2ceb5..54f3e860e0c 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -1,11 +1,18 @@
-{fetchurl, stdenv, gupnp, gssdp, pkgconfig, glib, libxml2, libsoup, gtk, libglade, gnomeicontheme, e2fsprogs}:
+{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "gupnp-tools-0.6";
+  name = "gupnp-tools-${version}";
+  majorVersion = "0.8";
+  version = "${majorVersion}.8";
   src = fetchurl {
-    url = "http://www.gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.tar.gz";
-    sha256 = "08fnggk85zqdcvm4np53yxw15b3ck25c2rmyfrh04g8j25qf50dj";
+    url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz";
+    sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
   };
 
-  buildInputs = [gupnp gssdp pkgconfig glib libxml2 libsoup gtk libglade gnomeicontheme e2fsprogs];
+  buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper];
+
+  postInstall = ''
+    wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
+    wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
+  '';
 }
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index a1f5026fb28..c40764866eb 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = http://ex-parrot.com/pdw/iftop/;
     platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 99793c139cb..54f6689582d 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 let
-  name = "nbd-3.5";
+  name = "nbd-3.7";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "0frnbmdcm1b0nmmpvpwjb9h1yabdpwwd2l95056mhl2zaafh8gqx";
+    url = "mirror://sourceforge/nbd/${name}.tar.xz";
+    sha256 = "1k4bvg5rg4q6b58y4kd9qwj07sznsfbknlpc6y1bk6c48rgr3d0b";
   };
 
   buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
 
   postInstall = ''
     mkdir -p "$out/share/doc/${name}"
-    cp README "$out/share/doc/${name}/README"
+    cp README.md "$out/share/doc/${name}/"
   '';
 
   # The test suite doesn't succeed in chroot builds.
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 1f785fdf730..0b68ec83b52 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -13,15 +13,16 @@ let
     url = mirror://sourceforge/hpnssh/openssh-6.3p1-hpnssh14v2.diff.gz;
     sha256 = "1jldqjwry9qpxxzb3mikfmmmv90mfb7xkmcfdbvwqac6nl3r7bi3";
   };
+  optionalString = stdenv.lib.optionalString;
 
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-6.4p1";
+  name = "openssh-6.5p1";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1lkmi7v83qvpcc04qrrqk4k7mafnmwxkfk1ccsisw51va4bgcc2m";
+    sha256 = "09wh7mi65aahyxd2xvq1makckhd5laid8c0pb8njaidrbpamw6d1";
   };
 
   prePatch = stdenv.lib.optionalString hpnSupport
@@ -32,9 +33,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./locale_archive.patch ];
 
-  buildInputs = [ zlib openssl libedit pkgconfig pam ] ++
-    (if withKerberos then [ kerberos ] else [])
-  ;
+  buildInputs = [ zlib openssl libedit pkgconfig pam ]
+    ++ stdenv.lib.optional withKerberos [ kerberos ];
 
   # I set --disable-strip because later we strip anyway. And it fails to strip
   # properly when cross building.
@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
       --with-libedit=yes
       --disable-strip
       ${if pam != null then "--with-pam" else "--without-pam"}
-      ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
-      ${if withKerberos  then "--with-kerberos5=${kerberos}" else ""}
+      ${optionalString (etcDir != null) "--sysconfdir=${etcDir}"}
+      ${optionalString withKerberos "--with-kerberos5=${kerberos}"}
     '';
 
   preConfigure =
@@ -67,11 +67,12 @@ stdenv.mkDerivation rec {
 
   installTargets = "install-nosysconf";
 
-  meta = {
-    homepage = http://www.openssh.org/;
+  meta = with stdenv.lib; {
+    homepage = "http://www.openssh.org/";
     description = "An implementation of the SSH protocol";
     license = "bsd";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = stdenv.lib.maintainers.eelco;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ eelco ];
+    broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640
   };
 }
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index acea2d6da6a..2e27c2b2dc3 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "tcpdump, a famous network sniffer";
     homepage = http://www.tcpdump.org/;
     license = "BSD-style";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index e801bcfb2c2..01dea9c35e3 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -39,9 +39,10 @@ stdenv.mkDerivation {
       done # */
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The Debian package manager";
     homepage = http://wiki.debian.org/Teams/Dpkg;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index b35d3b66ad8..73b0ca58828 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.rpm.org/;
     license = "GPLv2";
     description = "The RPM Package Manager";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index ad1cb6bec90..4be2393eed5 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 stdenv.mkDerivation rec {
-  name = "ccid-1.4.13";
+  version = "1.4.14";
+  name = "ccid-${version}";
 
   src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/pcsc-lite-ccid/ccid-1.4.13.tar.bz2/89c167a873df1f8bc0dc907ce209e5ff/ccid-1.4.13.tar.bz2";
-    sha256 = "1w0mxb5qzps9x2fcggv958mwgwmvfxxj4nspxs67fa7qg7r6yxar";
+    url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
+    sha256 = "0inibkhzk4ghg85jkysscjrzshmxfdzz6b54dqj182l0isn082y5";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index b27707a0015..624fcdbe6c6 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "mkpasswd-${version}";
 
-  version = "5.0.26";
+  version = "5.1.1";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz";
-    sha256 = "729625ef81425f4771e06492bb4f3e9f24bff75b8176044ce8d2f605f7ad6af5";
+    sha256 = "0i06a9mb9qcq272782mg6dffv3k7bqkw4cdr31yrc0s6jqylryv9";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 73b6f660bf9..1b2e940540d 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -20,4 +20,9 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index de0fef9b73f..18fa1045153 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
 
 stdenv.mkDerivation rec {
-  name = "pcsclite-1.8.8";
+  version = "1.8.10";
+  name = "pcsclite-${version}";
 
   src = fetchurl {
-    url = "http://alioth.debian.org/frs/download.php/3862/${name}.tar.bz2";
-    sha256 = "1rw5530vr2jf02ziyf32jbd98n5q8zjcfwp5nkw3x3bkgr53arpy";
+    url = "http://ftp.de.debian.org/debian/pool/main/p/pcsc-lite/pcsc-lite_${version}.orig.tar.bz2";
+    sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30";
   };
 
   # The OS should care on preparing the drivers into this location
diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
index 4d216bee0b6..6ce09499780 100644
--- a/pkgs/tools/security/vidalia/default.nix
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake qt4 doxygen ];
 
+  patches = [ ./gcc-4.7.patch ];
+
   meta = with stdenv.lib; {
     homepage = https://www.torproject.org/projects/vidalia.html.en;
     description = "a cross-platform graphical controller for the Tor software, built using the Qt framework";
diff --git a/pkgs/tools/security/vidalia/gcc-4.7.patch b/pkgs/tools/security/vidalia/gcc-4.7.patch
new file mode 100644
index 00000000000..4c163af760c
--- /dev/null
+++ b/pkgs/tools/security/vidalia/gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff -ru vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp
+--- vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:02:01.901732270 +0200
++++ vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:03:26.241677875 +0200
+@@ -20,6 +20,8 @@
+ 
+ #include "Vidalia.h"
+ 
++#include <unistd.h>
++
+ PluginEngine::PluginEngine(QObject *parent)
+   : QScriptEngine(parent)
+ {
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index 83a89cfb602..adc8d9ec486 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
-let release = "0.18.1"; in
+let release = "0.19.1"; in
 stdenv.mkDerivation {
   name = "silver-searcher-${release}";
 
   src = fetchgit {
     url = "https://github.com/ggreer/the_silver_searcher.git";
     rev = "refs/tags/${release}";
-    sha256 = "bf2c8f3c68895e0ee00d373c1d87201e806b413bb28373ee168e375f2a095ec5";
+    sha256 = "1km3ap74mls7vkp6si4f302zb1ifmldipjyfw2z9akqpvr3n44p9";
   };
 
   buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ];
diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix
index e9b46eaa985..426cef3c85d 100644
--- a/pkgs/tools/typesetting/pdfjam/default.nix
+++ b/pkgs/tools/typesetting/pdfjam/default.nix
@@ -5,4 +5,8 @@
     url = http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz;
     sha256 = "05g3mx7mb6h15ivbv0f53r369xphy8ad8a2xblpnk9mrnlrkaxy9";
   };
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix
index 4cb03e7d2c5..8b06cbb5a2b 100644
--- a/pkgs/tools/typesetting/tex/texlive/beamer.nix
+++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix
@@ -20,5 +20,6 @@ rec {
 
   meta = {
     description = "Extra components for TeXLive: beamer class";
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cfa3a111d9..464a23c8520 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -532,6 +532,8 @@ let
 
   bc = callPackage ../tools/misc/bc { };
 
+  bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
+
   bchunk = callPackage ../tools/cd-dvd/bchunk { };
 
   bfr = callPackage ../tools/misc/bfr { };
@@ -1101,11 +1103,11 @@ let
     inherit (gnome) libsoup;
   };
 
+  gupnp_av = callPackage ../development/libraries/gupnp-av {};
+
   gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
 
-  gupnptools = callPackage ../tools/networking/gupnp-tools {
-    inherit (gnome) libsoup libglade gnomeicontheme;
-  };
+  gupnptools = callPackage ../tools/networking/gupnp-tools {};
 
   gvpe = builderDefsPackage ../tools/networking/gvpe {
     inherit openssl gmp nettools iproute;
@@ -1619,6 +1621,8 @@ let
 
   briss = callPackage ../tools/graphics/briss { };
 
+  bully = callPackage ../tools/networking/bully { };
+
   pdnsd = callPackage ../tools/networking/pdnsd { };
 
   pg_top = callPackage ../tools/misc/pg_top { };
@@ -2065,8 +2069,6 @@ let
 
   tkabber = callPackage ../applications/networking/instant-messengers/tkabber { };
 
-  tkabber_plugins = callPackage ../applications/networking/instant-messengers/tkabber-plugins { };
-
   qfsm = callPackage ../applications/science/electronics/qfsm { };
 
   tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix {
@@ -2343,7 +2345,8 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
-  cython = callPackage ../development/interpreters/cython { };
+  cython = callPackage ../development/interpreters/cython/2 { };
+  cython3 = callPackage ../development/interpreters/cython/3 { };
 
   dylan = callPackage ../development/compilers/gwydion-dylan {
     dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
@@ -2688,6 +2691,7 @@ let
   hiphopvm = callPackage ../development/interpreters/hiphopvm {
     libevent = libevent14;
     boost = boost149;
+    stdenv = overrideGCC stdenv gcc48;
   };
 
   falcon = builderDefsPackage (import ../development/interpreters/falcon) {
@@ -3126,6 +3130,8 @@ let
   };
   lua5 = lua5_1;
 
+  lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};
+
   luarocks = callPackage ../development/tools/misc/luarocks {
      lua = lua5;
   };
@@ -3317,7 +3323,10 @@ let
     samples = true;
   };
 
-  avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {};
+  avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {
+    gcc = gcc46;
+    stdenv = overrideGCC stdenv gcc46;
+  };
 
   avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
 
@@ -3768,6 +3777,8 @@ let
 
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
+  xmlindent = callPackage ../development/web/xmlindent {};
+
   xxdiff = callPackage ../development/tools/misc/xxdiff {
     bison = bison2;
   };
@@ -3965,6 +3976,10 @@ let
 
   db48 = callPackage ../development/libraries/db4/db4-4.8.nix { };
 
+  db5 = db53;
+
+  db53 = callPackage ../development/libraries/db/db-5.3.nix { };
+
   dbus = callPackage ../development/libraries/dbus { };
   dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };
   dbus_glib       = callPackage ../development/libraries/dbus-glib { };
@@ -4116,9 +4131,7 @@ let
 
   geoclue = callPackage ../development/libraries/geoclue {};
 
-  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {
-    libsoup = libsoup_2_44;
-  };
+  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
 
   geoip = builderDefsPackage ../development/libraries/geoip {
     inherit zlib;
@@ -4218,6 +4231,8 @@ let
 
   glm = callPackage ../development/libraries/glm { };
 
+  glog = callPackage ../development/libraries/glog { };
+
   glpk = callPackage ../development/libraries/glpk { };
 
   glsurf = callPackage ../applications/science/math/glsurf {
@@ -4439,6 +4454,8 @@ let
 
   ilbc = callPackage ../development/libraries/ilbc { };
 
+  ilixi = callPackage ../development/libraries/ilixi { };
+
   ilmbase = callPackage ../development/libraries/ilmbase { };
 
   imlib = callPackage ../development/libraries/imlib {
@@ -4579,6 +4596,8 @@ let
 
   inherit (gnome3) libcroco;
 
+  libcangjie = callPackage ../development/libraries/libcangjie { };
+
   libctemplate = callPackage ../development/libraries/libctemplate { };
 
   libcue = callPackage ../development/libraries/libcue { };
@@ -4924,7 +4943,6 @@ let
   libsodium = callPackage ../development/libraries/libsodium { };
 
   libsoup = callPackage ../development/libraries/libsoup { };
-  libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { };
 
   libssh = callPackage ../development/libraries/libssh { };
 
@@ -5061,6 +5079,8 @@ let
   libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
   libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { };
 
+  libyubikey = callPackage ../development/libraries/libyubikey {};
+
   libzip = callPackage ../development/libraries/libzip { };
 
   libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
@@ -5728,7 +5748,6 @@ let
     };
 
   webkitgtk = callPackage ../development/libraries/webkitgtk {
-    libsoup = libsoup_2_44;
     harfbuzz = harfbuzz.override {
       withIcu = true;
     };
@@ -6096,7 +6115,9 @@ let
 
   dico = callPackage ../servers/dico { };
 
-  dict = callPackage ../servers/dict { };
+  dict = callPackage ../servers/dict {
+      libmaa = callPackage ../servers/dict/libmaa.nix {};
+  };
 
   dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
     inherit builderDefs;
@@ -6804,7 +6825,7 @@ let
   linuxPackages = linuxPackages_3_10;
 
   # A function to build a manually-configured kernel
-  linuxManualConfig = builtins.trace "linuxManualConfig is now called buildLinux" pkgs.buildLinux;
+  linuxManualConfig = pkgs.buildLinux;
   buildLinux = import ../os-specific/linux/kernel/manual-config.nix {
     inherit (pkgs) stdenv runCommand nettools bc perl kmod writeTextFile ubootChooser;
   };
@@ -7889,6 +7910,7 @@ let
     inherit (gnome) libart_lgpl;
     webkit = null;
     lcms = lcms2;
+    wrapPython = pythonPackages.wrapPython;
   };
 
   gimp = gimp_2_8;
@@ -8050,7 +8072,7 @@ let
 
   hexedit = callPackage ../applications/editors/hexedit { };
 
-  hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
+  hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
 
   homebank = callPackage ../applications/office/homebank { };
 
@@ -8267,6 +8289,8 @@ let
 
   matchbox = callPackage ../applications/window-managers/matchbox { };
 
+  mcpp = callPackage ../development/compilers/mcpp { };
+
   mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
 
   meld = callPackage ../applications/version-management/meld {
@@ -8395,12 +8419,14 @@ let
       withLibdnssdCompat = true;
     };
     jackSupport = config.mumble.jackSupport or false;
+    speechdSupport = config.mumble.speechdSupport or false;
   };
 
   murmur = callPackage ../applications/networking/mumble/murmur.nix {
     avahi = avahi.override {
       withLibdnssdCompat = true;
     };
+    iceSupport = config.murmur.iceSupport or true;
   };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
@@ -8533,7 +8559,7 @@ let
     openssl = if config.pidgin.openssl or true then openssl else null;
     gnutls = if config.pidgin.gnutls or false then gnutls else null;
     libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null;
-    inherit (gnome) startupnotification;
+    startupnotification = libstartup_notification;
   };
 
   pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
@@ -9147,6 +9173,8 @@ let
 
   qgis = callPackage ../applications/misc/qgis {};
 
+  ykpers = callPackage ../applications/misc/ykpers {};
+
   yoshimi = callPackage ../applications/audio/yoshimi {
     fltk = fltk13;
   };
@@ -9157,6 +9185,8 @@ let
 
   zathura = zathuraCollection.zathuraWrapper;
 
+  zeroc_ice = callPackage ../development/libraries/zeroc-ice { };
+
   girara = callPackage ../applications/misc/girara {
     gtk = gtk3;
   };
@@ -9749,6 +9779,8 @@ let
 
   ### SCIENCE/MATH
 
+  arpack = callPackage ../development/libraries/science/math/arpack { };
+
   atlas = callPackage ../development/libraries/science/math/atlas {
     # The build process measures CPU capabilities and optimizes the
     # library to perform best on that particular machine. That is a
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0087aa59df3..ae55febf893 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -522,6 +522,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
 
+  adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
+
   aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
   aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {};
   aeson = self.aeson_0_6_2_1;
@@ -540,6 +542,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   amqp = callPackage ../development/libraries/haskell/amqp {};
 
+  annotatedWlPprint = callPackage ../development/libraries/haskell/annotated-wl-pprint {};
+
   appar = callPackage ../development/libraries/haskell/appar {};
 
   ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {};
@@ -1888,6 +1892,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ppm = callPackage ../development/libraries/haskell/ppm {};
 
+  pqueue = callPackage ../development/libraries/haskell/pqueue {};
+
   prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
@@ -2328,8 +2334,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   tls = callPackage ../development/libraries/haskell/tls {};
 
-  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 = if (pkgs.stdenv.lib.versionOlder ghc.version "7.7") then
      (callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}) else null;
@@ -2572,8 +2576,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {};
 
-  yesodPlatform = callPackage ../development/libraries/haskell/yesod-platform {};
-
   yesodRoutes = callPackage ../development/libraries/haskell/yesod-routes {};
 
   yesodStatic = callPackage ../development/libraries/haskell/yesod-static {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62c37e5d30b..b639f739a05 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1418,6 +1418,27 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
 
+  dpkt = buildPythonPackage rec {
+    name = "dpkt-1.8";
+
+    src = fetchurl {
+      url = "https://dpkt.googlecode.com/files/${name}.tar.gz";
+      sha256 = "01q5prynymaqyfsfi2296xncicdpid2hs3yyasim8iigvkwy4vf5";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
+      homepage = https://code.google.com/p/dpkt/;
+      license = licenses.bsd3;
+      maintainers = [ maintainers.bjornfor ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
+
   evdev = buildPythonPackage rec {
     version = "0.3.2";
     name = "evdev-${version}";
@@ -4296,11 +4317,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-1.12.0";
+    name = "paramiko-1.12.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz";
-      md5 = "4187f77b1a5a313c899993930e30c321";
+      md5 = "ae4544dc0a1419b141342af89fcf0dd9";
     };
 
     propagatedBuildInputs = [ pycrypto ecdsa ];
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 213358bc8ce..14812b3e811 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -2,7 +2,7 @@
    the load on Hydra when testing the `stdenv-updates' branch. */
 
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
-, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
+, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
 }:
 
 with import ./release-lib.nix { inherit supportedSystems; };
author	Vladimír Čunát <vcunat@gmail.com>	2014-02-02 10:05:25 +0100
committer	Vladimír Čunát <vcunat@gmail.com>	2014-02-02 10:05:25 +0100
commit	6e2d3b98473523672b06ff5c90b5b387a029e566 (patch)
tree	4f53d0adf17553b40031d35fae3e6f263933fd93 /pkgs
parent	fcaa782b6ab7cd18b8ccca82cc6615b0b3c36b18 (diff)
parent	14a6a059f5863bfd9e7c69336baa8a918b41a86a (diff)
download	nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.gz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.bz2 nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.lz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.xz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.zst nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.zip