Commit 9f5b62ff authored by jopejoe1's avatar jopejoe1
Browse files

ocamlPackages.dune_{2,3}: don't throw when evaling

parent 968d86d0

pkgs/top-level/ocaml-packages.nix

+2 −14
Original line number Diff line number Diff line
@@ -464,21 +464,9 @@ let 


        dune_1 = callPackage ../development/tools/ocaml/dune/1.nix { };



        dune_2 =

          if lib.versionAtLeast ocaml.version "4.08" then

            callPackage ../development/tools/ocaml/dune/2.nix { }

          else if lib.versionAtLeast ocaml.version "4.02" then

            pkgs.dune_2

          else

            throw "dune_2 is not available for OCaml ${ocaml.version}";

        dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { };



        dune_3 =

          if lib.versionAtLeast ocaml.version "4.08" then

            callPackage ../development/tools/ocaml/dune/3.nix { }

          else if lib.versionAtLeast ocaml.version "4.02" then

            pkgs.dune_3

          else

            throw "dune_3 is not available for OCaml ${ocaml.version}";

        dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { };



        dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { };