Merge remote-tracking branch 'origin/master' into staging.

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

pkgs/development/tools/ocaml/findlib/default.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://projects.camlcity.org/projects/findlib.html;
     description = "O'Caml library manager";
-    license = "MIT/X11";
+    license = stdenv.lib.licenses.mit;
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z

pkgs/development/tools/ocaml/merlin/default.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}:
+stdenv.mkDerivation {
+
+  name = "merlin-1.6";
+
+  src = fetchurl {
+    url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz";
+    sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy";
+  };
+
+  buildInputs = [ ocaml findlib biniou yojson menhir easy-format ];
+
+  prefixKey = "--prefix ";
+
+  meta = {
+    description = "An editor-independant tool to ease the developpement of programs in OCaml";
+    homepage = "http://the-lambda-church.github.io/merlin/";
+    license = stdenv.lib.licenses.mit;
+  };
+}
+