diff --git a/nixos/release.nix b/nixos/release.nix
index 0359d0907cca0..325047ce10c41 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -302,6 +302,7 @@ in rec {
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
   tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
+  tests.wordpress = callTest tests/wordpress.nix {};
   tests.xfce = callTest tests/xfce.nix {};
 
 
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 3961138658f7b..b0590fdc38f7a 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
     description = "An offline reader for Web content";
     homepage = http://kiwix.org;
     license = licenses.gpl3;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ robbinch ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index c035fc6266514..f4f4aac5efa7b 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -1,49 +1,53 @@
-{stdenv, fetchurl, pythonPackages}:
+{stdenv, fetchurl, python27Packages, file }:
 
 let
-  inherit (pythonPackages) python;
-in stdenv.mkDerivation rec {
-  url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2";
-  name = stdenv.lib.nameFromURL url ".tar";
-  src = fetchurl {
-    inherit url;
-    sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1";
-  };
-
-  buildInputs = with pythonPackages; 
+  inherit (python27Packages) python;
+in
+  stdenv.mkDerivation rec {
+    name = "salut-a-toi";
+    version = "0.6.1";
+    pname = "sat-${version}";
+
+    src = fetchurl {
+      url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
+      sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
+    };
+
+    buildInputs = with python27Packages; 
     [
       python twisted urwid beautifulsoup wxPython pygobject2
-      wokkel dbus-python pyfeed wrapPython setuptools
+      wokkel dbus-python pyfeed wrapPython setuptools file 
+      pycrypto pyxdg
     ];
 
-  configurePhase = ''
-    sed -i "/use_setuptools/d" setup.py
-    sed -e "s@sys.prefix@'$out'@g" -i setup.py
-    sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${pythonPackages.twisted}/bin\"" -i src/sat.sh
-    sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
+    configurePhase = ''
+      sed -i "/use_setuptools/d" setup.py
+      sed -e "s@sys.prefix@'$out'@g" -i setup.py
+      sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
+      sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
 
-    echo 'import wokkel.muc' | python 
-  '';
+      echo 'import wokkel.muc' | python 
+    '';
 
-  buildPhase = ''
-    ${python.interpreter} setup.py build
-  '';
+    buildPhase = ''
+      ${python.interpreter} setup.py build
+    '';
 
-  installPhase = ''
-    ${python.interpreter} setup.py install --prefix="$out"
+    installPhase = ''
+      ${python.interpreter} setup.py install --prefix="$out"
 
-    for i in "$out/bin"/*; do
+      for i in "$out/bin"/*; do
       head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
         wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
       } || true 
-    done
-  '';
-  
-  meta = {
-    homepage = "http://sat.goffi.org/";
-    description = "A multi-frontend XMPP client";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.gpl3Plus;
-  };
-}
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://sat.goffi.org/;
+      description = "A multi-frontend XMPP client";
+      platforms = platforms.linux;
+      maintainers = [ maintainers.raskin ];
+      license = licenses.gpl3Plus;
+    };
+  }
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index 1096a64887b07..e2980c7108f4d 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -4,12 +4,14 @@ stdenv.mkDerivation rec {
   name = "gnome-mplayer-1.0.4";
 
   src = fetchurl {
-    url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz";
     sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";
   };
 
   buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf];
-  
+
+  hardeningDisable = [ "format" ];
+
   meta = {
     homepage = http://kdekorte.googlepages.com/gnomemplayer;
     description = "Gnome MPlayer, a simple GUI for MPlayer";
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
new file mode 100644
index 0000000000000..69276fb5a7d61
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg, cppo
+, ppx_import, ppx_deriving, yojson, ounit
+}:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}";
+  version = "3.0";
+
+  src = fetchFromGitHub {
+    owner = "whitequark";
+    repo = "ppx_deriving_yojson";
+    rev = "v${version}";
+    sha256 = "1id1a29qq0ax9qp98b5hv6p2q2r0vp4fbkkwzm1bxdhnasw97msk";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam cppo ounit ppx_import ];
+
+  propagatedBuildInputs = [ ppx_deriving yojson ];
+
+  inherit (topkg) installPhase;
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = {
+    description = "A Yojson codec generator for OCaml >= 4.02.";
+    inherit (src.meta) homepage;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix
new file mode 100644
index 0000000000000..b613508c5c059
--- /dev/null
+++ b/pkgs/development/tools/misc/xxdiff/tip.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }:
+
+stdenv.mkDerivation rec {
+  name = "xxdiff-4.0.1.20170101";
+
+  src = fetchFromBitbucket {
+    owner = "blais";
+    repo = "xxdiff";
+    rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8";
+    sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z";
+  };
+
+  nativeBuildInputs = [ flex bison qt5.qtbase docutils ];
+
+  buildInputs = [ qt5.qtbase ];
+
+  preConfigure = ''
+    ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
+    ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true
+  '';
+
+  NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets";
+  
+  configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap";
+
+  installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
+
+
+  meta = with stdenv.lib; {
+    homepage = http://furius.ca/xxdiff/;
+    description = "Graphical file and directories comparator and merge tool";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub raskin ];
+  };
+}
diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix
new file mode 100644
index 0000000000000..bb4435d56e7ed
--- /dev/null
+++ b/pkgs/tools/X11/wayv/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchFromGitHub, libX11}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "wayv";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "mikemb";
+    repo = pname;
+    rev = "b716877603250f690f08b593bf30fd5e8a93a872";
+    sha256 = "046dvaq6na1fyxz5nrjg13aaz6ific9wbygck0dknqqfmmjrsv3b";
+  };
+
+  buildInputs = [ libX11 ];
+
+  postInstall = ''
+    make -C doc install
+    mkdir -p "$out"/share/doc/wayv
+    cp [A-Z][A-Z]* "$out"/share/doc/wayv
+    cp doc/[A-Z][A-Z]* "$out"/share/doc/wayv
+    cp doc/*.txt "$out"/share/doc/wayv
+    cp doc/*.jpg "$out"/share/doc/wayv
+  '';
+
+  meta = {
+    inherit version;
+    description = "A gesture control for X11";
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/mikemb/wayV";
+  };
+}
diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix
new file mode 100644
index 0000000000000..829d9b8ab2d35
--- /dev/null
+++ b/pkgs/tools/X11/xannotate/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchFromBitbucket, libX11}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "xannotate";
+  version = "20150301";
+  
+  src = fetchFromBitbucket {
+    owner = "blais";
+    repo = pname;
+    rev = "e5591c2ec67ca39988f1fb2966e94f0f623f9aa7";
+    sha256 = "02jy19if0rnbxvs6b0l5mi9ifvdj2qmv0pv278v9kfs0kvir68ik";
+  };
+
+  buildInputs = [ libX11 ];
+
+  meta = {
+    inherit version;
+    description = "A tool to scribble over X windows";
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://bitbucket.org/blais/xannotate";
+  };
+}
diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix
index 503beefa15af7..99f19889201ae 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/pkgs/tools/misc/idutils/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional stdenv.isLinux emacs;
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   patches = [ ./nix-mapping.patch ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59c7453777df8..6bf920876c157 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6909,6 +6909,7 @@ with pkgs;
   xxdiff = callPackage ../development/tools/misc/xxdiff {
     bison = bison2;
   };
+  xxdiff-tip = callPackage ../development/tools/misc/xxdiff/tip.nix { };
 
   yacc = bison;
 
@@ -15872,6 +15873,8 @@ with pkgs;
     imlib2 = imlib2-nox;
   };
 
+  wayv = callPackage ../tools/X11/wayv {};
+
   weechat = callPackage ../applications/networking/irc/weechat {
     inherit (darwin) libobjc;
     inherit (darwin) libresolv;
@@ -16011,6 +16014,8 @@ with pkgs;
 
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
+  xannotate = callPackage ../tools/X11/xannotate {};
+
   xaos = callPackage ../applications/graphics/xaos {
     libpng = libpng12;
   };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 03afec1870fe0..f46aa3a251c79 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -483,6 +483,8 @@ let
       then callPackage ../development/ocaml-modules/ppx_deriving {}
       else null;
 
+    ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
+
     ppx_import = callPackage ../development/ocaml-modules/ppx_import {};
 
     ppx_tools =