aboutsummaryrefslogblamecommitdiffstats
path: root/community/unison/ocaml-4.08.patch
blob: 9a42a7f8563ce7d921b67c14158013a31492501a (plain) (tree)














































                                                                                                  
This patches fixes compatibility with OCaml 4.08

See:

	* https://github.com/bcpierce00/unison/issues/277
	* https://github.com/bcpierce00/unison/commit/23fa129254a3304902739fc989950cc747d1e0b3

diff -upr unison-2.48.15v4.orig/files.ml unison-2.48.15v4/files.ml
--- unison-2.48.15v4.orig/files.ml	2019-12-05 13:42:09.566446355 +0100
+++ unison-2.48.15v4/files.ml	2019-12-05 13:42:19.469777627 +0100
@@ -722,7 +722,7 @@ let get_files_in_directory dir =
   with End_of_file ->
     dirh.System.closedir ()
   end;
-  Sort.list (<) !files
+  List.sort String.compare !files
 
 let ls dir pattern =
   Util.convertUnixErrorsToTransient
Only in unison-2.48.15v4/src: files.ml.orig
diff -upr unison-2.48.15v4.orig/recon.ml unison-2.48.15v4/recon.ml
--- unison-2.48.15v4.orig/recon.ml	2019-12-05 13:42:09.569779688 +0100
+++ unison-2.48.15v4/recon.ml	2019-12-05 13:42:19.469777627 +0100
@@ -651,8 +651,8 @@ let rec reconcile
 
 (* Sorts the paths so that they will be displayed in order                   *)
 let sortPaths pathUpdatesList =
-  Sort.list
-    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
+  List.sort
+    Path.compare
     pathUpdatesList
 
 let rec enterPath p1 p2 t =
Only in unison-2.48.15v4/src: recon.ml.orig
diff -upr unison-2.48.15v4.orig/system/system_generic.ml unison-2.48.15v4/system/system_generic.ml
--- unison-2.48.15v4.orig/system/system_generic.ml	2019-12-05 13:42:09.573113020 +0100
+++ unison-2.48.15v4/system/system_generic.ml	2019-12-05 13:42:19.469777627 +0100
@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
 let chmod = Unix.chmod
 let chown = Unix.chown
 let utimes = Unix.utimes
-let link = Unix.link
+let link s d = Unix.link s d
 let openfile = Unix.openfile
 let opendir f =
   let h = Unix.opendir f in