about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorR. RyanTM <ryantm-bot@ryantm.com>2024-01-17 05:42:30 -0800
committerGitHub <noreply@github.com>2024-01-17 14:42:30 +0100
commit33860c4ffef6e26d57ac281f4cfb1e0b8fdb351f (patch)
treeb1fb151ebda3d2dbc53d3161f3dea0ebff515655 /pkgs/development/compilers
parenta19e19df55c4997a53196a84a0e6eafbfbb28f4c (diff)
downloadnixlib-33860c4ffef6e26d57ac281f4cfb1e0b8fdb351f.tar
nixlib-33860c4ffef6e26d57ac281f4cfb1e0b8fdb351f.tar.gz
nixlib-33860c4ffef6e26d57ac281f4cfb1e0b8fdb351f.tar.bz2
nixlib-33860c4ffef6e26d57ac281f4cfb1e0b8fdb351f.tar.lz
nixlib-33860c4ffef6e26d57ac281f4cfb1e0b8fdb351f.tar.xz
nixlib-33860c4ffef6e26d57ac281f4cfb1e0b8fdb351f.tar.zst
nixlib-33860c4ffef6e26d57ac281f4cfb1e0b8fdb351f.zip
ocamlPackages.luv: 0.5.11 -> 0.5.12 (#226435)
* ocamlPackages.luv: 0.5.11 -> 0.5.12

* haxe: 4.2.5 -> 4.3.3

---------

Co-authored-by: Ulrik Strid <ulrik@strid.tech>
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/haxe/default.nix11
1 files changed, 6 insertions, 5 deletions
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=";
   };
 }