Merge branch 'master' into closure-size

pkgs/development/ocaml-modules/dolog/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchzip, ocaml, findlib }:
 
-let version = "1.1"; in
+let version = "3.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-dolog-${version}";
   src = fetchzip {
     url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz";
-    sha256 = "093lmprb1v2ran3pyymcdq80xnsgdz7h76g764xsy97dba5ik40n";
+    sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb";
   };
 
   buildInputs = [ ocaml findlib ];

pkgs/development/ocaml-modules/easy-format/default.nix

@@ -1,25 +1,27 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{ stdenv, fetchzip, ocaml, findlib }:
 let
   pname = "easy-format";
-  version = "1.0.2";
-  webpage = "http://mjambon.com/${pname}.html";
+  version = "1.1.0";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
 
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
-    sha256 = "07wlgprqvk92z0p2xzbnvh312ca6gvhy3xc6hxlqfawnnnin7rzi";
+  src = fetchzip {
+    url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz";
+    sha256 = "084blm13k5lakl5wq3qfxbd0l0bwblvk928v75xcxpaqwv426w5a";
   };
 
   buildInputs = [ ocaml findlib ];
 
   createFindlibDestdir = true;
 
+  doCheck = true;
+  checkTarget = "test";
+
   meta = with stdenv.lib; {
     description = "A high-level and functional interface to the Format module of the OCaml standard library";
-    homepage = "${webpage}";
+    homepage = "http://mjambon.com/${pname}.html";
     license = licenses.bsd3;
     maintainers = [ maintainers.vbgl ];
   };

pkgs/development/ocaml-modules/uucp/default.nix

@@ -4,7 +4,7 @@ let
   inherit (stdenv.lib) getVersion versionAtLeast;
 
   pname = "uucp";
-  version = "0.9.1";
+  version = "1.1.0";
   webpage = "http://erratique.ch/software/${pname}";
 in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "0mbrh5fi2b9a4bl71p7hfs0wwbw023ww44n20x0syxn806wjlrkm";
+    sha256 = "1vm5f2ppdrnk19j0ppjiqz56qf5bzyk26gs0lz071s7iblk459jz";
   };
 
   buildInputs = [ ocaml findlib opam ];

pkgs/development/ocaml-modules/why3/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, ocaml, findlib, zarith, menhir, why3 }:
+
+let ocaml-version = stdenv.lib.getVersion ocaml; in
+
+assert stdenv.lib.versionAtLeast ocaml-version "4.01";
+
+stdenv.mkDerivation {
+  name = "ocaml-${why3.name}";
+
+  inherit (why3) src;
+
+  buildInputs = [ ocaml findlib zarith menhir ];
+
+  installTargets = "install-lib";
+
+  meta = {
+    inherit (why3.meta) license homepage;
+    platforms = ocaml.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+  };
+}

pkgs/development/ocaml-modules/yojson/default.nix

@@ -1,16 +1,15 @@
-{stdenv, fetchurl, ocaml, findlib, cppo, easy-format, biniou}:
+{ stdenv, fetchzip, ocaml, findlib, cppo, easy-format, biniou }:
 let
   pname = "yojson";
-  version = "1.1.8";
-  webpage = "http://mjambon.com/${pname}.html";
+  version = "1.2.3";
 in
 stdenv.mkDerivation {
 
   name = "ocaml-${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv";
+  src = fetchzip {
+    url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz";
+    sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl";
   };
 
   buildInputs = [ ocaml findlib ];
@@ -27,7 +26,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "An optimized parsing and printing library for the JSON format";
-    homepage = "${webpage}";
+    homepage = "http://mjambon.com/${pname}.html";
     license = licenses.bsd3;
     maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;