diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 953949b949a0..370163a096f4 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -10,12 +10,13 @@ pcre2, neko, mbedtls_2, + mbedtls, }: let ocamlDependencies = version: if lib.versionAtLeast version "4.3" then - with ocaml-ng.ocamlPackages_4_14; + with ocaml-ng.ocamlPackages; [ ocaml findlib @@ -24,7 +25,7 @@ let ptmap camlp5 sha - luv-0-5-12 + luv extlib ] else @@ -41,17 +42,10 @@ let extlib-1-7-7 ]; - defaultPatch = '' - substituteInPlace extra/haxelib_src/src/haxelib/client/Main.hx \ - --replace '"neko"' '"${neko}/bin/neko"' - ''; - generic = { hash, version, - prePatch ? defaultPatch, - patches ? [ ], }: stdenv.mkDerivation { pname = "haxe"; @@ -63,7 +57,9 @@ let dune ] ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) - ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 + ++ lib.optional (lib.versionAtLeast version "4.1") ( + if lib.versionAtLeast version "4.3" then mbedtls else mbedtls_2 + ) ++ ocamlDependencies version; src = fetchFromGitHub { @@ -74,7 +70,10 @@ let inherit hash; }; - inherit prePatch patches; + prePatch = '' + substituteInPlace extra/haxelib_src/src/haxelib/client/Main.hx \ + --replace-fail '"neko"' '"${neko}/bin/neko"' + ''; buildFlags = [ "all" @@ -160,8 +159,7 @@ in hash = "sha256-QP5/jwexQXai1A5Iiwiyrm+/vkdAc+9NVGt+jEQz2mY="; }; haxe_4_3 = generic { - version = "4.3.6"; - hash = "sha256-m/A0xxB3fw+syPmH1GPKKCcj0a2G/HMRKOu+FKrO5jQ="; - patches = [ ./extlib-1.8.0.patch ]; + version = "4.3.7"; + hash = "sha256-sQb7MCoH2dZOvNmDQ9P0yFYrSXYOMn4FS/jlyjth39Y="; }; } diff --git a/pkgs/development/compilers/haxe/extlib-1.8.0.patch b/pkgs/development/compilers/haxe/extlib-1.8.0.patch deleted file mode 100644 index c95448f830ac..000000000000 --- a/pkgs/development/compilers/haxe/extlib-1.8.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/context/typecore.ml b/src/context/typecore.ml -index dc38a5264..0c3ebde9f 100644 ---- a/src/context/typecore.ml -+++ b/src/context/typecore.ml -@@ -294,7 +294,7 @@ let add_local ctx k n t p = - begin try - let v' = PMap.find n ctx.locals in - (* ignore std lib *) -- if not (List.exists (ExtLib.String.starts_with p.pfile) ctx.com.std_path) then begin -+ if not (List.exists (ExtLib.String.starts_with ~prefix:p.pfile) ctx.com.std_path) then begin - warning ctx WVarShadow "This variable shadows a previously declared variable" p; - warning ~depth:1 ctx WVarShadow (compl_msg "Previous variable was here") v'.v_pos - end -diff --git a/src/optimization/dce.ml b/src/optimization/dce.ml -index 4e7b1fc98..90d8fc5d6 100644 ---- a/src/optimization/dce.ml -+++ b/src/optimization/dce.ml -@@ -76,7 +76,7 @@ let overrides_extern_field cf c = - loop c cf - - let is_std_file dce file = -- List.exists (ExtString.String.starts_with file) dce.std_dirs -+ List.exists (ExtString.String.starts_with ~prefix:file) dce.std_dirs - - let keep_metas = [Meta.Keep;Meta.Expose] -