diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index c6f1b6d1758..4994ceca7fb 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit, seq }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "re is not available for OCaml ${ocaml.version}" @@ -6,14 +6,15 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-re-${version}"; - version = "1.7.3"; + version = "1.8.0"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr"; + sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i"; }; buildInputs = [ ocaml findlib jbuilder ounit ]; + propagatedBuildInputs = [ seq ]; doCheck = true; checkPhase = "jbuilder runtest"; diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/pkgs/development/ocaml-modules/seq/default.nix new file mode 100644 index 00000000000..f4918b420c4 --- /dev/null +++ b/pkgs/development/ocaml-modules/seq/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + version = "0.1"; + name = "ocaml${ocaml.version}-seq-${version}"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "seq"; + rev = version; + sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + description = "Compatibility package for OCaml’s standard iterator type starting from 4.07"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7b6af70ebcf..f5e5cfb3972 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -564,6 +564,8 @@ let result = callPackage ../development/ocaml-modules/ocaml-result { }; + seq = callPackage ../development/ocaml-modules/seq { }; + sequence = callPackage ../development/ocaml-modules/sequence { }; spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };