diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/ocaml-packages.nix | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index c19e0b612b04..4be489c76ebb 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -161,6 +161,8 @@ let cpuid = callPackage ../development/ocaml-modules/cpuid { }; + crowbar = callPackage ../development/ocaml-modules/crowbar { }; + crunch = callPackage ../development/tools/ocaml/crunch { }; cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; @@ -191,8 +193,6 @@ let curses = callPackage ../development/ocaml-modules/curses { }; - custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; - ctypes = callPackage ../development/ocaml-modules/ctypes { }; decompress = callPackage ../development/ocaml-modules/decompress { }; @@ -365,6 +365,8 @@ let graphql_parser = callPackage ../development/ocaml-modules/graphql/parser.nix { }; + graphql_ppx = callPackage ../development/ocaml-modules/graphql_ppx { }; + gtktop = callPackage ../development/ocaml-modules/gtktop { }; hex = callPackage ../development/ocaml-modules/hex { }; @@ -399,15 +401,7 @@ let jingoo = callPackage ../development/ocaml-modules/jingoo { }; - js_of_ocaml = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { } - else js_of_ocaml_2; - - js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { - base64 = base64_2; - lwt = lwt2; - }; + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {}; @@ -772,19 +766,6 @@ let then type_conv_108_08_00 else null; - sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { }; - sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; - sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; - - sexplib_p4 = - if lib.versionOlder "4.02" ocaml.version - then sexplib_112_24_01 - else if lib.versionOlder "4.00" ocaml.version - then sexplib_111_25_00 - else if lib.versionOlder "3.12" ocaml.version - then sexplib_108_08_00 - else null; - ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; @@ -797,8 +778,6 @@ let pa_bench = callPackage ../development/ocaml-modules/pa_bench { }; - pa_test = callPackage ../development/ocaml-modules/pa_test { }; - parany = callPackage ../development/ocaml-modules/parany { }; pipebang = callPackage ../development/ocaml-modules/pipebang { }; @@ -1137,7 +1116,7 @@ let then janeStreet.sexplib else if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {} - else sexplib_p4; + else null; variantslib = if lib.versionOlder "4.03" ocaml.version |