Merge master into staging

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

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, jbuilder }:
 
 stdenv.mkDerivation rec {
-	version = "2.0";
+	version = "2.1";
 	name = "ocaml${ocaml.version}-csv-${version}";
 	src = fetchurl {
-		url = "https://github.com/Chris00/ocaml-csv/releases/download/2.0/csv-2.0.tbz";
-		sha256 = "1g6xsybwc5ifr7n4hkqlh3294njzca12xg86ghh6pqy350wpq1zp";
+		url = "https://github.com/Chris00/ocaml-csv/releases/download/2.1/csv-2.1.tbz";
+		sha256 = "0cgfb6cwhwy7ypc1i3jyfz6sdnykp75aqi6kk0g1a2d81yjwzbcg";
 	};
 
 	unpackCmd = "tar -xjf $src";

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

@@ -1,6 +1,10 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, qtest, result }:
 
-let version = "0.10"; in
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "sequence is not available for OCaml ${ocaml.version}"
+else
+
+let version = "1.1"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-sequence-${version}";
@@ -9,19 +13,16 @@ stdenv.mkDerivation {
     owner = "c-cube";
     repo = "sequence";
     rev = version;
-    sha256 = "0pl8pv758wn8bm555i8f0fvfn2pw88w1bmzjrzrv01092d85wx1g";
+    sha256 = "08j37nldw47syq3yw4mzhhvya43knl0d7biddp0q9hwbaxhzgi44";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild qtest ounit ];
-
-  configureFlags = [
-    "--enable-tests"
-  ];
+  buildInputs = [ ocaml findlib jbuilder qtest ];
+  propagatedBuildInputs = [ result ];
 
   doCheck = true;
-  checkTarget = "test";
+  checkPhase = "jbuilder runtest";
 
-  createFindlibDestdir = true;
+  inherit (jbuilder) installPhase;
 
   meta = {
     homepage = https://github.com/c-cube/sequence;