diff options
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a53b6e446ef..516db732bc4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -40,6 +40,8 @@ let arp = callPackage ../development/ocaml-modules/arp { }; + asai = callPackage ../development/ocaml-modules/asai { }; + asetmap = callPackage ../development/ocaml-modules/asetmap { }; asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; @@ -60,6 +62,8 @@ let ### B ### + b0 = callPackage ../development/ocaml-modules/b0 { }; + bap = janeStreet_0_15.bap; base64 = callPackage ../development/ocaml-modules/base64 { }; @@ -738,7 +742,7 @@ let } else if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { - inherit self; + inherit self ocaml; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; } else if lib.versionOlder "4.08" ocaml.version @@ -790,6 +794,7 @@ let janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix { self = self' // jsDeps; + inherit ocaml; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; }; @@ -827,7 +832,7 @@ let }; ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; - })).overrideScope' liftJaneStreet; + })).overrideScope liftJaneStreet; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { self = self.janeStreet_0_9_0; @@ -962,6 +967,8 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; + lun = callPackage ../development/ocaml-modules/lun { }; + lustre-v6 = callPackage ../development/ocaml-modules/lustre-v6 { }; lutils = callPackage ../development/ocaml-modules/lutils { }; @@ -1039,6 +1046,8 @@ let merlin-lib = callPackage ../development/tools/ocaml/merlin/lib.nix { }; + metadata = callPackage ../development/ocaml-modules/metadata { }; + metrics = callPackage ../development/ocaml-modules/metrics { }; metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { }; @@ -1158,6 +1167,8 @@ let mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { }; + msgpck = callPackage ../development/ocaml-modules/msgpck { }; + mrmime = callPackage ../development/ocaml-modules/mrmime { }; mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; @@ -1264,6 +1275,7 @@ let ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; }; + ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; }; ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; @@ -1286,14 +1298,14 @@ let ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; - ocamlsdl = callPackage ../development/ocaml-modules/ocamlsdl { }; - ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; ocf = callPackage ../development/ocaml-modules/ocf { }; ocf_ppx = callPackage ../development/ocaml-modules/ocf/ppx.nix { }; + ocolor = callPackage ../development/ocaml-modules/ocolor { }; + ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; @@ -1328,6 +1340,8 @@ let odate = callPackage ../development/ocaml-modules/odate { }; + odig = callPackage ../development/ocaml-modules/odig { }; + odoc = callPackage ../development/ocaml-modules/odoc { }; odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { }; @@ -1480,6 +1494,8 @@ let ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; + ppx_lun = callPackage ../development/ocaml-modules/lun/ppx.nix { }; + ppx_monad = callPackage ../development/ocaml-modules/ppx_monad { }; ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { }; @@ -1590,6 +1606,8 @@ let ringo = callPackage ../development/ocaml-modules/ringo { }; + riot = callPackage ../development/ocaml-modules/riot { }; + rock = callPackage ../development/ocaml-modules/rock { }; rope = callPackage ../development/ocaml-modules/rope { }; @@ -1874,6 +1892,10 @@ let zed = callPackage ../development/ocaml-modules/zed { }; + zelus = callPackage ../development/ocaml-modules/zelus { }; + + zelus-gtk = callPackage ../development/ocaml-modules/zelus-gtk { }; + zmq = callPackage ../development/ocaml-modules/zmq { }; zmq-lwt = callPackage ../development/ocaml-modules/zmq/lwt.nix { }; @@ -1886,6 +1908,8 @@ let buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { }; + buildTopkgPackage = callPackage ../build-support/ocaml/topkg.nix { }; + # Apps from all-packages, to be eventually removed google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; @@ -1945,7 +1969,7 @@ in let inherit (pkgs) callPackage; in rec # *and* non-JS OCaml libraries can pull in the same version of JS transitive # dependencies. Remove this once ligo and stanc can be compiled against # janestreet 0.16 libraries. - ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope' (self: super: super // super.janeStreet_0_15); + ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope (self: super: super // super.janeStreet_0_15); # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. |