summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorVincent Laporte <vbgl@users.noreply.github.com>2018-08-07 19:28:46 +0000
committerxeji <36407913+xeji@users.noreply.github.com>2018-08-07 21:28:46 +0200
commit805bc58d081eaabfbbf1bca6bc95a5a9526e65d9 (patch)
tree4f7a5d90d3f7ecfa687751b27c54670feba32583 /pkgs/development
parent296c520920558798384be4d23b974b46999323b2 (diff)
downloadnixlib-805bc58d081eaabfbbf1bca6bc95a5a9526e65d9.tar
nixlib-805bc58d081eaabfbbf1bca6bc95a5a9526e65d9.tar.gz
nixlib-805bc58d081eaabfbbf1bca6bc95a5a9526e65d9.tar.bz2
nixlib-805bc58d081eaabfbbf1bca6bc95a5a9526e65d9.tar.lz
nixlib-805bc58d081eaabfbbf1bca6bc95a5a9526e65d9.tar.xz
nixlib-805bc58d081eaabfbbf1bca6bc95a5a9526e65d9.tar.zst
nixlib-805bc58d081eaabfbbf1bca6bc95a5a9526e65d9.zip
ocamlPackages.sequence: 0.10 -> 1.1 (#44628)
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/ocaml-modules/sequence/default.nix21
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix
index 34f342faaa3f..f06282df4fc6 100644
--- a/pkgs/development/ocaml-modules/sequence/default.nix
+++ b/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;