diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-03 22:15:07 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-03 22:15:07 +0200 |
| commit | de857975653a745ad766480e387a239c4d94c28d (patch) | |
| tree | edef63702ea15a7a7a9af029ab0e691d027fa96c /pkgs/top-level/ocaml-packages.nix | |
| parent | d512362e770d4016cbf8a2f573d00d6d2c4e61e6 (diff) | |
| parent | 1f49035aca52303abb2e09976baf36f297eb68a6 (diff) | |
| download | nixlib-de857975653a745ad766480e387a239c4d94c28d.tar nixlib-de857975653a745ad766480e387a239c4d94c28d.tar.gz nixlib-de857975653a745ad766480e387a239c4d94c28d.tar.bz2 nixlib-de857975653a745ad766480e387a239c4d94c28d.tar.lz nixlib-de857975653a745ad766480e387a239c4d94c28d.tar.xz nixlib-de857975653a745ad766480e387a239c4d94c28d.tar.zst nixlib-de857975653a745ad766480e387a239c4d94c28d.zip | |
Merge remote-tracking branch 'origin/master' into gcc-8
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b7eb250710a3..af3f446cb259 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -63,6 +63,8 @@ let batteries = callPackage ../development/ocaml-modules/batteries { }; + bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; + bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -188,6 +190,8 @@ let lwt = ocaml_lwt; }; + cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {}; + cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {}; csv = @@ -217,6 +221,8 @@ let dolog = callPackage ../development/ocaml-modules/dolog { }; + domain-name = callPackage ../development/ocaml-modules/domain-name { }; + dtoa = callPackage ../development/ocaml-modules/dtoa { }; dune = callPackage ../development/tools/ocaml/dune { }; @@ -273,6 +279,8 @@ let gen = callPackage ../development/ocaml-modules/gen { }; + gmap = callPackage ../development/ocaml-modules/gmap { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; higlo = callPackage ../development/ocaml-modules/higlo { }; @@ -384,11 +392,7 @@ let lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; - lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; - lambdaTerm = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/lambda-term { } - else lambdaTerm-1_6; + lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { }; linenoise = callPackage ../development/ocaml-modules/linenoise { }; @@ -551,6 +555,10 @@ let ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { }; + ocplib-json-typed-browser = callPackage ../development/ocaml-modules/ocplib-json-typed/browser.nix { }; + + ocplib-json-typed-bson = callPackage ../development/ocaml-modules/ocplib-json-typed/bson.nix { }; + ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; |