ocamlPackages.extlib: 1.7.9 → 1.8.0

NixOS · Jan 14, 2025 · 890ae82 · 890ae82
1 parent fb23f7e
commit 890ae82
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
@@ -53,6 +53,7 @@ let
       hash,
       version,
       prePatch ? defaultPatch,
+      patches ? [],
     }:
     stdenv.mkDerivation {
       pname = "haxe";
@@ -76,7 +77,7 @@ let
         inherit hash;
       };
 
-      inherit prePatch;
+      inherit prePatch patches;
 
       buildFlags = [
         "all"
@@ -165,5 +166,6 @@ in
   haxe_4_3 = generic {
     version = "4.3.6";
     hash = "sha256-m/A0xxB3fw+syPmH1GPKKCcj0a2G/HMRKOu+FKrO5jQ=";
+    patches = [ ./extlib-1.8.0.patch ];
   };
 }
diff --git a/pkgs/development/compilers/haxe/extlib-1.8.0.patch b/pkgs/development/compilers/haxe/extlib-1.8.0.patch
@@ -0,0 +1,26 @@
+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]
+
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -7,13 +7,11 @@
 
 buildDunePackage rec {
   pname = "extlib";
-  version = "1.7.9";
-
-  minimalOCamlVersion = "4.02";
+  version = "1.8.0";
 
   src = fetchurl {
-    url = "https://ygrek.org/p/release/ocaml-${pname}/${pname}-${version}.tar.gz";
-    hash = "sha512-I4asafA36lIINcBiTTmun7/+Q6ILGOJH3gMiMu1vQZ1me1PSMUxvVtxx02i/C2IBpWwvPypb39kzdmxabLmHaA==";
+    url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz";
+    hash = "sha256-lkJ38AEoCo7d/AjgcB1Zygxr3F0FIxOz5A5QiPbUXXA=";
   };
 
   nativeBuildInputs = [ cppo ];