haxe: build versions < 4.2 with OCaml 4.10
This commit is contained in:
parent
44339cc0b0
commit
ab51ade9a3
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
ocamlDependencies = version:
|
ocamlDependencies = version:
|
||||||
if lib.versionAtLeast version "4.0"
|
if lib.versionAtLeast version "4.2"
|
||||||
then with ocaml-ng.ocamlPackages; [
|
then with ocaml-ng.ocamlPackages; [
|
||||||
ocaml
|
ocaml
|
||||||
findlib
|
findlib
|
||||||
|
@ -13,8 +13,19 @@ let
|
||||||
sha
|
sha
|
||||||
dune_2
|
dune_2
|
||||||
luv
|
luv
|
||||||
(if lib.versionAtLeast version "4.2"
|
ocaml_extlib
|
||||||
then ocaml_extlib else ocaml_extlib-1-7-7)
|
] else if lib.versionAtLeast version "4.0"
|
||||||
|
then with ocaml-ng.ocamlPackages_4_10; [
|
||||||
|
ocaml
|
||||||
|
findlib
|
||||||
|
sedlex_2
|
||||||
|
xml-light
|
||||||
|
ptmap
|
||||||
|
camlp5
|
||||||
|
sha
|
||||||
|
dune_2
|
||||||
|
luv
|
||||||
|
ocaml_extlib-1-7-7
|
||||||
] else with ocaml-ng.ocamlPackages_4_05; [
|
] else with ocaml-ng.ocamlPackages_4_05; [
|
||||||
ocaml
|
ocaml
|
||||||
camlp4
|
camlp4
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
# Older version of extlib for Haxe 4.0 and 4.1.
|
# Older version of extlib for Haxe 4.0 and 4.1.
|
||||||
# May be replaceable by the next extlib + extlib-base64 release.
|
# May be replaceable by the next extlib + extlib-base64 release.
|
||||||
{ fetchurl, ocaml_extlib }:
|
{ lib, fetchurl, ocaml, ocaml_extlib }:
|
||||||
|
|
||||||
ocaml_extlib.overrideAttrs (_: rec {
|
ocaml_extlib.overrideAttrs (x: rec {
|
||||||
version = "1.7.7";
|
version = "1.7.7";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz";
|
url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz";
|
||||||
sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1";
|
sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1";
|
||||||
};
|
};
|
||||||
|
meta = x.meta // {
|
||||||
|
broken = lib.versionAtLeast ocaml.version "4.12";
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue