diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level/ocaml-packages.nix')
-rw-r--r-- | nixpkgs/pkgs/top-level/ocaml-packages.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index e040cef15759..1a7c42c8a543 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -22,6 +22,8 @@ let alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; + alcotest-mirage = callPackage ../development/ocaml-modules/alcotest/mirage.nix {}; + angstrom = callPackage ../development/ocaml-modules/angstrom { }; angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { }; @@ -118,12 +120,8 @@ let then callPackage ../development/ocaml-modules/camomile { } else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { }; - camlimages_4_1_2 = - if lib.versionOlder "4.02" ocaml.version - then null - else callPackage ../development/ocaml-modules/camlimages/4.1.2.nix { - libpng = pkgs.libpng12; - }; + camlimages_4_2_4 = callPackage ../development/ocaml-modules/camlimages/4.2.4.nix { }; + camlimages = callPackage ../development/ocaml-modules/camlimages { }; benchmark = callPackage ../development/ocaml-modules/benchmark { }; @@ -614,6 +612,8 @@ let ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; }; + lwt-canceler = callPackage ../development/ocaml-modules/lwt-canceler { }; + ocaml_lwt = lwt; lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; @@ -1155,6 +1155,8 @@ let rope = callPackage ../development/ocaml-modules/rope { }; + routes = callPackage ../development/ocaml-modules/routes { }; + rpclib = callPackage ../development/ocaml-modules/rpclib { }; rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { }; |