diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index f673eb6d0340..99fde9c66a59 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls_2, Security }: +{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, pcre2, neko, mbedtls_2, Security }: let ocamlDependencies = version: @@ -37,7 +37,8 @@ let pname = "haxe"; inherit version; - buildInputs = [ zlib pcre neko ] + buildInputs = [ zlib neko ] + ++ (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" && stdenv.isDarwin) Security ++ ocamlDependencies version; @@ -124,8 +125,8 @@ in { version = "4.1.5"; sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; }; - haxe_4_2 = generic { - version = "4.2.5"; - sha256 = "sha256-Y0gx6uOQX4OZgg8nK4GJxRR1rKh0S2JUjZQFVQ4cfTs="; + haxe_4_3 = generic { + version = "4.3.3"; + sha256 = "sha256-sMklqQkVbWCYCKpOU23AjkuxzcVV7Aa8ljlFpruam9Y="; }; } diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index da7f9ba1808f..3f2d462fd15e 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,13 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.11"; - useDune2 = true; + version = "0.5.12"; + + minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "sha256-zOz0cxGzhLi3Q36qyStNCz8JGXHtECQfZysMKiyKOkM="; + sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA="; }; postConfigure = '' @@ -23,6 +24,7 @@ buildDunePackage rec { nativeBuildInputs = [ file ]; propagatedBuildInputs = [ ctypes result ]; checkInputs = [ alcotest ]; + # Alcotest depends on fmt that needs 4.08 or newer doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 363335ce023f..ddf76ff732dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16317,12 +16317,12 @@ with pkgs; inherit (callPackage ../development/compilers/haxe { inherit (darwin.apple_sdk.frameworks) Security; }) - haxe_4_2 + haxe_4_3 haxe_4_1 haxe_4_0 ; - haxe = haxe_4_2; + haxe = haxe_4_3; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp;