diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 0ae038d47138..5329cf59aa37 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchgit, coreutils, ocaml, zlib, pcre, neko, camlp4 }: +{ stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }: + +let inherit (ocamlPackages) ocaml camlp4; in let generic = { version, sha256, prePatch }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d2d2a3b30db..42203a18847a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7986,7 +7986,9 @@ in graphviz = graphviz-nox; }); - inherit (ocaml-ng.ocamlPackages_4_05.haxe) haxe_3_2 haxe_3_4; + inherit (callPackage ../development/compilers/haxe { + ocamlPackages = ocaml-ng.ocamlPackages_4_05; + }) haxe_3_2 haxe_3_4; haxe = haxe_3_4; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f2e0559244fb..36aa85d570c9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1107,8 +1107,6 @@ let # Apps / from all-packages - haxe = callPackage ../development/compilers/haxe { }; - ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; trv = callPackage ../development/tools/misc/trv { };