ocamlPackages.dune_3: enable for OCaml < 4.08
This commit is contained in:
parent
6094e4cfb2
commit
98f36b2d74
|
@ -4,6 +4,7 @@ buildDunePackage rec {
|
||||||
pname = "chrome-trace";
|
pname = "chrome-trace";
|
||||||
inherit (dune_3) src version;
|
inherit (dune_3) src version;
|
||||||
|
|
||||||
|
minimalOCamlVersion = "4.08";
|
||||||
duneVersion = "3";
|
duneVersion = "3";
|
||||||
|
|
||||||
dontAddPrefix = true;
|
dontAddPrefix = true;
|
||||||
|
|
|
@ -4,6 +4,7 @@ buildDunePackage {
|
||||||
pname = "ordering";
|
pname = "ordering";
|
||||||
inherit (dune_3) version src;
|
inherit (dune_3) version src;
|
||||||
duneVersion = "3";
|
duneVersion = "3";
|
||||||
|
minimalOCamlVersion = "4.08";
|
||||||
|
|
||||||
dontAddPrefix = true;
|
dontAddPrefix = true;
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ buildDunePackage rec {
|
||||||
inherit (dune_3) src version;
|
inherit (dune_3) src version;
|
||||||
|
|
||||||
duneVersion = "3";
|
duneVersion = "3";
|
||||||
|
minimalOCamlVersion = "4.08";
|
||||||
|
|
||||||
dontAddPrefix = true;
|
dontAddPrefix = true;
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ buildDunePackage rec {
|
||||||
pname = "js_of_ocaml-compiler";
|
pname = "js_of_ocaml-compiler";
|
||||||
version = "4.1.0";
|
version = "4.1.0";
|
||||||
duneVersion = "3";
|
duneVersion = "3";
|
||||||
|
minimalOCamlVersion = "4.08";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
|
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
|
||||||
|
|
|
@ -357,7 +357,12 @@ let
|
||||||
then pkgs.dune_2
|
then pkgs.dune_2
|
||||||
else throw "dune_2 is not available for OCaml ${ocaml.version}";
|
else throw "dune_2 is not available for OCaml ${ocaml.version}";
|
||||||
|
|
||||||
dune_3 = callPackage ../development/tools/ocaml/dune/3.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-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { };
|
dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue