diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 73b82ff48dbf..8d3e034182b8 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -13,7 +13,8 @@ let sha dune_2 luv - ocaml_extlib + (if lib.versionAtLeast version "4.2" + then ocaml_extlib else ocaml_extlib-1-7-7) ] else with ocaml-ng.ocamlPackages_4_05; [ ocaml camlp4 @@ -125,6 +126,10 @@ in { sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml ''; }; + haxe_4_1 = generic { + version = "4.1.5"; + sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; + }; haxe_4_2 = generic { version = "4.2.1"; sha256 = "sha256-0j6M21dh8DB1gC/bPYNJrVuDbJyqQbP+61ItO5RBUcA="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bd1ff822f6a..97d67350d977 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10604,6 +10604,7 @@ in inherit (callPackage ../development/compilers/haxe { }) haxe_4_2 + haxe_4_1 haxe_3_4 haxe_3_2 ;