[rpms/ocaml-stdcompat] rawhide: Version 22.0

[rpms/ocaml-stdcompat] rawhide: Version 22.0

[Jerry James]

            A new commit has been pushed.

            Repo   : rpms/ocaml-stdcompat
            Branch : rawhide
            Commit : b50478751338838cf0617186f125537f697afa4c
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-09-16T10:12:11-06:00
            Stats  : +123/-248 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocaml-stdcompat/c/b50478751338838cf0617186f125537f697afa4c?branch=rawhide

            Log:
            Version 22.0

- Update the OCaml compatibility patch for OCaml 5.5.1
- Make some changes necessary to get the tests to run

---
diff --git a/ocaml-stdcompat-ocaml5.5.1.patch b/ocaml-stdcompat-ocaml5.5.1.patch
new file mode 100644
index 0000000..0aaad61
--- /dev/null
+++ b/ocaml-stdcompat-ocaml5.5.1.patch
@@ -0,0 +1,107 @@
+--- stdcompat-22.0/configure.ac.orig	2026-08-14 04:25:24.000000000 -0600
++++ stdcompat-22.0/configure.ac	2026-09-16 09:59:17.147702596 -0600
+@@ -187,6 +187,7 @@ AC_WITH_OCAML_VERSION([5_2_0], [5.2.0])
+ AC_WITH_OCAML_VERSION([5_3_0], [5.3.0])
+ AC_WITH_OCAML_VERSION([5_4_0], [5.4.0])
+ AC_WITH_OCAML_VERSION([5_5_0], [5.5.0])
++AC_WITH_OCAML_VERSION([5_5_1], [5.5.1])
+ 
+ AS_IF([test "x$target_os_type" = "xWin32"],
+   [AC_WITH_BLOCK([WIN32])],
+--- stdcompat-22.0/Makefile.in.orig	2026-08-14 04:25:24.000000000 -0600
++++ stdcompat-22.0/Makefile.in	2026-09-16 10:05:12.735743330 -0600
+@@ -456,6 +456,7 @@ BEGIN_BEFORE_5_2_0 = @BEGIN_BEFORE_5_2_0
+ BEGIN_BEFORE_5_3_0 = @BEGIN_BEFORE_5_3_0@
+ BEGIN_BEFORE_5_4_0 = @BEGIN_BEFORE_5_4_0@
+ BEGIN_BEFORE_5_5_0 = @BEGIN_BEFORE_5_5_0@
++BEGIN_BEFORE_5_5_1 = @BEGIN_BEFORE_5_5_1@
+ BEGIN_FROM_3_07_0 = @BEGIN_FROM_3_07_0@
+ BEGIN_FROM_3_08_0 = @BEGIN_FROM_3_08_0@
+ BEGIN_FROM_3_09_0 = @BEGIN_FROM_3_09_0@
+@@ -484,6 +485,7 @@ BEGIN_FROM_5_2_0 = @BEGIN_FROM_5_2_0@
+ BEGIN_FROM_5_3_0 = @BEGIN_FROM_5_3_0@
+ BEGIN_FROM_5_4_0 = @BEGIN_FROM_5_4_0@
+ BEGIN_FROM_5_5_0 = @BEGIN_FROM_5_5_0@
++BEGIN_FROM_5_5_1 = @BEGIN_FROM_5_5_1@
+ BEGIN_WITHOUT_CYGWIN = @BEGIN_WITHOUT_CYGWIN@
+ BEGIN_WITHOUT_FLAMBDA2 = @BEGIN_WITHOUT_FLAMBDA2@
+ BEGIN_WITHOUT_MAGIC = @BEGIN_WITHOUT_MAGIC@
+@@ -526,6 +528,7 @@ C_BEGIN_BEFORE_5_2_0 = @C_BEGIN_BEFORE_5
+ C_BEGIN_BEFORE_5_3_0 = @C_BEGIN_BEFORE_5_3_0@
+ C_BEGIN_BEFORE_5_4_0 = @C_BEGIN_BEFORE_5_4_0@
+ C_BEGIN_BEFORE_5_5_0 = @C_BEGIN_BEFORE_5_5_0@
++C_BEGIN_BEFORE_5_5_1 = @C_BEGIN_BEFORE_5_5_1@
+ C_BEGIN_FROM_3_07_0 = @C_BEGIN_FROM_3_07_0@
+ C_BEGIN_FROM_3_08_0 = @C_BEGIN_FROM_3_08_0@
+ C_BEGIN_FROM_3_09_0 = @C_BEGIN_FROM_3_09_0@
+@@ -554,6 +557,7 @@ C_BEGIN_FROM_5_2_0 = @C_BEGIN_FROM_5_2_0
+ C_BEGIN_FROM_5_3_0 = @C_BEGIN_FROM_5_3_0@
+ C_BEGIN_FROM_5_4_0 = @C_BEGIN_FROM_5_4_0@
+ C_BEGIN_FROM_5_5_0 = @C_BEGIN_FROM_5_5_0@
++C_BEGIN_FROM_5_5_1 = @C_BEGIN_FROM_5_5_1@
+ C_BEGIN_WITHOUT_CYGWIN = @C_BEGIN_WITHOUT_CYGWIN@
+ C_BEGIN_WITHOUT_FLAMBDA2 = @C_BEGIN_WITHOUT_FLAMBDA2@
+ C_BEGIN_WITHOUT_MAGIC = @C_BEGIN_WITHOUT_MAGIC@
+@@ -592,6 +596,7 @@ C_END_BEFORE_5_2_0 = @C_END_BEFORE_5_2_0
+ C_END_BEFORE_5_3_0 = @C_END_BEFORE_5_3_0@
+ C_END_BEFORE_5_4_0 = @C_END_BEFORE_5_4_0@
+ C_END_BEFORE_5_5_0 = @C_END_BEFORE_5_5_0@
++C_END_BEFORE_5_5_1 = @C_END_BEFORE_5_5_1@
+ C_END_FROM_3_07_0 = @C_END_FROM_3_07_0@
+ C_END_FROM_3_08_0 = @C_END_FROM_3_08_0@
+ C_END_FROM_3_09_0 = @C_END_FROM_3_09_0@
+@@ -620,6 +625,7 @@ C_END_FROM_5_2_0 = @C_END_FROM_5_2_0@
+ C_END_FROM_5_3_0 = @C_END_FROM_5_3_0@
+ C_END_FROM_5_4_0 = @C_END_FROM_5_4_0@
+ C_END_FROM_5_5_0 = @C_END_FROM_5_5_0@
++C_END_FROM_5_5_1 = @C_END_FROM_5_5_1@
+ C_END_WITHOUT_CYGWIN = @C_END_WITHOUT_CYGWIN@
+ C_END_WITHOUT_FLAMBDA2 = @C_END_WITHOUT_FLAMBDA2@
+ C_END_WITHOUT_MAGIC = @C_END_WITHOUT_MAGIC@
+@@ -662,6 +668,7 @@ END_BEFORE_5_2_0 = @END_BEFORE_5_2_0@
+ END_BEFORE_5_3_0 = @END_BEFORE_5_3_0@
+ END_BEFORE_5_4_0 = @END_BEFORE_5_4_0@
+ END_BEFORE_5_5_0 = @END_BEFORE_5_5_0@
++END_BEFORE_5_5_1 = @END_BEFORE_5_5_1@
+ END_FROM_3_07_0 = @END_FROM_3_07_0@
+ END_FROM_3_08_0 = @END_FROM_3_08_0@
+ END_FROM_3_09_0 = @END_FROM_3_09_0@
+@@ -690,6 +697,7 @@ END_FROM_5_2_0 = @END_FROM_5_2_0@
+ END_FROM_5_3_0 = @END_FROM_5_3_0@
+ END_FROM_5_4_0 = @END_FROM_5_4_0@
+ END_FROM_5_5_0 = @END_FROM_5_5_0@
++END_FROM_5_5_1 = @END_FROM_5_5_1@
+ END_WITHOUT_CYGWIN = @END_WITHOUT_CYGWIN@
+ END_WITHOUT_FLAMBDA2 = @END_WITHOUT_FLAMBDA2@
+ END_WITHOUT_MAGIC = @END_WITHOUT_MAGIC@
+--- stdcompat-22.0/tools/compiler_version.ml.orig	2026-08-14 04:25:24.000000000 -0600
++++ stdcompat-22.0/tools/compiler_version.ml	2026-09-16 10:06:12.623056176 -0600
+@@ -92,6 +92,7 @@ let v5_3_0 = mk 5 3 0
+ let v5_4_0 = mk 5 4 0
+ let v5_4_1 = mk 5 4 1
+ let v5_5_0 = mk 5 5 0
++let v5_5_1 = mk 5 5 1
+ 
+ let known_versions =
+ [
+@@ -143,6 +144,7 @@ let known_versions =
+   v5_4_0;
+   v5_4_1;
+   v5_5_0;
++  v5_5_1;
+ ]
+ 
+ let is_known v = List.mem v known_versions
+--- stdcompat-22.0/tools/compiler_version.mli.orig	2026-08-14 04:25:24.000000000 -0600
++++ stdcompat-22.0/tools/compiler_version.mli	2026-09-16 10:06:55.742342997 -0600
+@@ -51,6 +51,10 @@ val v5_1_1 : t
+ val v5_2_0 : t
+ val v5_2_1 : t
+ val v5_3_0 : t
++val v5_4_0 : t
++val v5_4_1 : t
++val v5_5_0 : t
++val v5_5_1 : t
+ 
+ val known_versions : t list
+ 

diff --git a/ocaml-stdcompat-ocaml5.5.patch b/ocaml-stdcompat-ocaml5.5.patch
deleted file mode 100644
index f8c1371..0000000
--- a/ocaml-stdcompat-ocaml5.5.patch
+++ /dev/null
@@ -1,242 +0,0 @@
---- stdcompat-21.1/configure.ac.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/configure.ac	2026-07-05 13:38:24.818904976 -0600
-@@ -185,6 +185,9 @@ AC_WITH_OCAML_VERSION([5_0_0], [5.0.0])
- AC_WITH_OCAML_VERSION([5_1_0], [5.1.0])
- AC_WITH_OCAML_VERSION([5_2_0], [5.2.0])
- AC_WITH_OCAML_VERSION([5_3_0], [5.3.0])
-+AC_WITH_OCAML_VERSION([5_4_0], [5.4.0])
-+AC_WITH_OCAML_VERSION([5_4_1], [5.4.1])
-+AC_WITH_OCAML_VERSION([5_5_0], [5.5.0])
- 
- AS_IF([test "x$target_os_type" = "xWin32"],
-   [AC_WITH_BLOCK([WIN32])],
---- stdcompat-21.1/Makefile.in.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/Makefile.in	2026-07-05 14:09:27.590499177 -0600
-@@ -450,6 +450,9 @@ BEGIN_BEFORE_5_0_0 = @BEGIN_BEFORE_5_0_0
- BEGIN_BEFORE_5_1_0 = @BEGIN_BEFORE_5_1_0@
- BEGIN_BEFORE_5_2_0 = @BEGIN_BEFORE_5_2_0@
- BEGIN_BEFORE_5_3_0 = @BEGIN_BEFORE_5_3_0@
-+BEGIN_BEFORE_5_4_0 = @BEGIN_BEFORE_5_4_0@
-+BEGIN_BEFORE_5_4_1 = @BEGIN_BEFORE_5_4_1@
-+BEGIN_BEFORE_5_5_0 = @BEGIN_BEFORE_5_5_0@
- BEGIN_FROM_3_07_0 = @BEGIN_FROM_3_07_0@
- BEGIN_FROM_3_08_0 = @BEGIN_FROM_3_08_0@
- BEGIN_FROM_3_09_0 = @BEGIN_FROM_3_09_0@
-@@ -476,6 +479,9 @@ BEGIN_FROM_5_0_0 = @BEGIN_FROM_5_0_0@
- BEGIN_FROM_5_1_0 = @BEGIN_FROM_5_1_0@
- BEGIN_FROM_5_2_0 = @BEGIN_FROM_5_2_0@
- BEGIN_FROM_5_3_0 = @BEGIN_FROM_5_3_0@
-+BEGIN_FROM_5_4_0 = @BEGIN_FROM_5_4_0@
-+BEGIN_FROM_5_4_1 = @BEGIN_FROM_5_4_1@
-+BEGIN_FROM_5_5_0 = @BEGIN_FROM_5_5_0@
- BEGIN_WITHOUT_CYGWIN = @BEGIN_WITHOUT_CYGWIN@
- BEGIN_WITHOUT_FLAMBDA2 = @BEGIN_WITHOUT_FLAMBDA2@
- BEGIN_WITHOUT_MAGIC = @BEGIN_WITHOUT_MAGIC@
-@@ -516,6 +522,9 @@ C_BEGIN_BEFORE_5_0_0 = @C_BEGIN_BEFORE_5
- C_BEGIN_BEFORE_5_1_0 = @C_BEGIN_BEFORE_5_1_0@
- C_BEGIN_BEFORE_5_2_0 = @C_BEGIN_BEFORE_5_2_0@
- C_BEGIN_BEFORE_5_3_0 = @C_BEGIN_BEFORE_5_3_0@
-+C_BEGIN_BEFORE_5_4_0 = @C_BEGIN_BEFORE_5_4_0@
-+C_BEGIN_BEFORE_5_4_1 = @C_BEGIN_BEFORE_5_4_1@
-+C_BEGIN_BEFORE_5_5_0 = @C_BEGIN_BEFORE_5_5_0@
- C_BEGIN_FROM_3_07_0 = @C_BEGIN_FROM_3_07_0@
- C_BEGIN_FROM_3_08_0 = @C_BEGIN_FROM_3_08_0@
- C_BEGIN_FROM_3_09_0 = @C_BEGIN_FROM_3_09_0@
-@@ -542,6 +551,9 @@ C_BEGIN_FROM_5_0_0 = @C_BEGIN_FROM_5_0_0
- C_BEGIN_FROM_5_1_0 = @C_BEGIN_FROM_5_1_0@
- C_BEGIN_FROM_5_2_0 = @C_BEGIN_FROM_5_2_0@
- C_BEGIN_FROM_5_3_0 = @C_BEGIN_FROM_5_3_0@
-+C_BEGIN_FROM_5_4_0 = @C_BEGIN_FROM_5_4_0@
-+C_BEGIN_FROM_5_4_1 = @C_BEGIN_FROM_5_4_1@
-+C_BEGIN_FROM_5_5_0 = @C_BEGIN_FROM_5_5_0@
- C_BEGIN_WITHOUT_CYGWIN = @C_BEGIN_WITHOUT_CYGWIN@
- C_BEGIN_WITHOUT_FLAMBDA2 = @C_BEGIN_WITHOUT_FLAMBDA2@
- C_BEGIN_WITHOUT_MAGIC = @C_BEGIN_WITHOUT_MAGIC@
-@@ -578,6 +590,9 @@ C_END_BEFORE_5_0_0 = @C_END_BEFORE_5_0_0
- C_END_BEFORE_5_1_0 = @C_END_BEFORE_5_1_0@
- C_END_BEFORE_5_2_0 = @C_END_BEFORE_5_2_0@
- C_END_BEFORE_5_3_0 = @C_END_BEFORE_5_3_0@
-+C_END_BEFORE_5_4_0 = @C_END_BEFORE_5_4_0@
-+C_END_BEFORE_5_4_1 = @C_END_BEFORE_5_4_1@
-+C_END_BEFORE_5_5_0 = @C_END_BEFORE_5_5_0@
- C_END_FROM_3_07_0 = @C_END_FROM_3_07_0@
- C_END_FROM_3_08_0 = @C_END_FROM_3_08_0@
- C_END_FROM_3_09_0 = @C_END_FROM_3_09_0@
-@@ -604,6 +619,9 @@ C_END_FROM_5_0_0 = @C_END_FROM_5_0_0@
- C_END_FROM_5_1_0 = @C_END_FROM_5_1_0@
- C_END_FROM_5_2_0 = @C_END_FROM_5_2_0@
- C_END_FROM_5_3_0 = @C_END_FROM_5_3_0@
-+C_END_FROM_5_4_0 = @C_END_FROM_5_4_0@
-+C_END_FROM_5_4_1 = @C_END_FROM_5_4_1@
-+C_END_FROM_5_5_0 = @C_END_FROM_5_5_0@
- C_END_WITHOUT_CYGWIN = @C_END_WITHOUT_CYGWIN@
- C_END_WITHOUT_FLAMBDA2 = @C_END_WITHOUT_FLAMBDA2@
- C_END_WITHOUT_MAGIC = @C_END_WITHOUT_MAGIC@
-@@ -644,6 +662,9 @@ END_BEFORE_5_0_0 = @END_BEFORE_5_0_0@
- END_BEFORE_5_1_0 = @END_BEFORE_5_1_0@
- END_BEFORE_5_2_0 = @END_BEFORE_5_2_0@
- END_BEFORE_5_3_0 = @END_BEFORE_5_3_0@
-+END_BEFORE_5_4_0 = @END_BEFORE_5_4_0@
-+END_BEFORE_5_4_1 = @END_BEFORE_5_4_1@
-+END_BEFORE_5_5_0 = @END_BEFORE_5_5_0@
- END_FROM_3_07_0 = @END_FROM_3_07_0@
- END_FROM_3_08_0 = @END_FROM_3_08_0@
- END_FROM_3_09_0 = @END_FROM_3_09_0@
-@@ -670,6 +691,9 @@ END_FROM_5_0_0 = @END_FROM_5_0_0@
- END_FROM_5_1_0 = @END_FROM_5_1_0@
- END_FROM_5_2_0 = @END_FROM_5_2_0@
- END_FROM_5_3_0 = @END_FROM_5_3_0@
-+END_FROM_5_4_0 = @END_FROM_5_4_0@
-+END_FROM_5_4_1 = @END_FROM_5_4_1@
-+END_FROM_5_5_0 = @END_FROM_5_5_0@
- END_WITHOUT_CYGWIN = @END_WITHOUT_CYGWIN@
- END_WITHOUT_FLAMBDA2 = @END_WITHOUT_FLAMBDA2@
- END_WITHOUT_MAGIC = @END_WITHOUT_MAGIC@
-@@ -1068,7 +1092,7 @@ stdcompat__float_s.ml: $(top_builddir)/c
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- stdcompat__format_s.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__format_s.mli.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
--stdcompat__fun_s.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__fun_s.mli.in
-+stdcompat__fun_s.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__fun_s.ml.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- stdcompat__hashtbl_s.ml: $(top_builddir)/config.status $(srcdir)/stdcompat__hashtbl_s.mli.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
---- stdcompat-21.1/stdcompat__arrayLabels_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/stdcompat__arrayLabels_s.mli.in	2026-07-05 13:37:53.075066622 -0600
-@@ -267,4 +267,8 @@ external unsafe_get : 'a array -> int ->
- external unsafe_set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
- (** Alias for {!ArrayLabels.unsafe_set} *)
- 
-+(* OCaml 5.4 *)
-+val equal : eq:('a -> 'a -> bool) -> 'a array -> 'a array -> bool
-+val compare : cmp:('a -> 'a -> int) -> 'a array -> 'a array -> int
-+
- end
---- stdcompat-21.1/stdcompat__array.ml.in.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/stdcompat__array.ml.in	2026-07-05 13:36:16.324298308 -0600
-@@ -229,3 +229,21 @@ let rec find_mapi_from index f array =
- let find_mapi f array =
-   find_mapi_from 0 f array
- @END_BEFORE_5_1_0@
-+
-+@BEGIN_BEFORE_5_4_0@
-+(* copied from OCaml 5.4 stdlib/array.ml *)
-+let equal eq a b =
-+  if length a <> length b then false else
-+  let i = ref 0 in
-+  let len = length a in
-+  while !i < len && eq (unsafe_get a !i) (unsafe_get b !i) do incr i done;
-+  !i = len
-+let compare cmp a b =
-+  let len_a = length a and len_b = length b in
-+  let diff = len_a - len_b in
-+  if diff <> 0 then (if diff < 0 then -1 else 1) else
-+  let i = ref 0 and c = ref 0 in
-+  while !i < len_a && !c = 0
-+  do c := cmp (unsafe_get a !i) (unsafe_get b !i); incr i done;
-+  !c
-+@END_BEFORE_5_4_0@
---- stdcompat-21.1/stdcompat__array_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/stdcompat__array_s.mli.in	2026-07-05 13:37:11.347611845 -0600
-@@ -258,4 +258,8 @@ external unsafe_get : 'a array -> int ->
- external unsafe_set : 'a array -> int -> 'a -> unit = "%array_unsafe_set"
- (** Alias for {!Array.unsafe_set} *)
- 
-+(* OCaml 5.4 *)
-+val equal : ('a -> 'a -> bool) -> 'a array -> 'a array -> bool
-+val compare : ('a -> 'a -> int) -> 'a array -> 'a array -> int
-+
- end
---- stdcompat-21.1/stdcompat__format_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/stdcompat__format_s.mli.in	2025-10-16 09:52:19.515175969 -0600
-@@ -44,6 +44,9 @@ type tag = string
- type formatter_out_functions = Format.formatter_out_functions =
-   {
-   out_string: string -> int -> int -> unit ;
-+@BEGIN_FROM_5_4_0@
-+  out_width: string -> pos:int -> len:int -> int;
-+@END_FROM_5_4_0@
-   out_flush: unit -> unit ;
-   out_newline: unit -> unit ;
-   out_spaces: int -> unit ;
---- stdcompat-21.1/stdcompat__fun_s.mli.in.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/stdcompat__fun_s.mli.in	2026-07-05 13:56:44.390816194 -0600
-@@ -5,8 +5,13 @@ exception Finally_raised of exn
- val compose : ('b -> 'c) -> ('a -> 'b) -> 'a -> 'c
- (** @since 5.2.0: val compose : ('b -> 'c) -> ('a -> 'b) -> 'a -> 'c *)
- 
-+@BEGIN_BEFORE_5_5_0@
- external id : 'a -> 'a = "%identity"
- (** @since 4.08.0: external id : 'a -> 'a = "%identity" *)
-+@END_BEFORE_5_5_0@
-+@BEGIN_FROM_5_5_0@
-+val id: 'a -> 'a
-+@END_FROM_5_5_0@
- 
- val const : 'a -> 'b -> 'a
- (** @since 4.08.0: val const : 'a -> 'b -> 'a *)
---- stdcompat-21.1/stdcompat__fun_s.ml.in.orig	1970-01-01 06:00:00.000000000 -0600
-+++ stdcompat-21.1/stdcompat__fun_s.ml.in	2026-07-05 14:09:15.870304717 -0600
-@@ -0,0 +1,28 @@
-+module type S = sig
-+exception Finally_raised of exn 
-+(** Alias for {!Fun.Finally_raised} *)
-+
-+val compose : ('b -> 'c) -> ('a -> 'b) -> 'a -> 'c
-+(** @since 5.2.0: val compose : ('b -> 'c) -> ('a -> 'b) -> 'a -> 'c *)
-+
-+@BEGIN_BEFORE_5_5_0@
-+external id : 'a -> 'a = "%identity"
-+(** @since 4.08.0: external id : 'a -> 'a = "%identity" *)
-+@END_BEFORE_5_5_0@
-+@BEGIN_FROM_5_5_0@
-+let id x = x
-+@END_FROM_5_5_0@
-+
-+val const : 'a -> 'b -> 'a
-+(** @since 4.08.0: val const : 'a -> 'b -> 'a *)
-+
-+val flip : ('a -> 'b -> 'c) -> 'b -> 'a -> 'c
-+(** @since 4.08.0: val flip : ('a -> 'b -> 'c) -> 'b -> 'a -> 'c *)
-+
-+val negate : ('a -> bool) -> 'a -> bool
-+(** @since 4.08.0: val negate : ('a -> bool) -> 'a -> bool *)
-+
-+val protect : finally:(unit -> unit) -> (unit -> 'a) -> 'a
-+(** @since 4.08.0: val protect : finally:(unit -> unit) -> (unit -> 'a) -> 'a *)
-+
-+end
---- stdcompat-21.1/tools/compiler_version.ml.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/tools/compiler_version.ml	2026-07-05 13:34:33.477698996 -0600
-@@ -87,6 +87,9 @@ let v5_1_1 = mk 5 1 1
- let v5_2_0 = mk 5 2 0
- let v5_2_1 = mk 5 2 1
- let v5_3_0 = mk 5 3 0
-+let v5_4_0 = mk 5 4 0
-+let v5_4_1 = mk 5 4 1
-+let v5_5_0 = mk 5 5 0
- 
- let known_versions =
- [
-@@ -133,6 +136,9 @@ let known_versions =
-   v5_2_0;
-   v5_2_1;
-   v5_3_0;
-+  v5_4_0;
-+  v5_4_1;
-+  v5_5_0;
- ]
- 
- let is_known v = List.mem v known_versions
---- stdcompat-21.1/tools/compiler_version.mli.orig	2025-08-20 02:18:12.000000000 -0600
-+++ stdcompat-21.1/tools/compiler_version.mli	2026-07-05 13:34:49.365211251 -0600
-@@ -51,6 +51,9 @@ val v5_1_1 : t
- val v5_2_0 : t
- val v5_2_1 : t
- val v5_3_0 : t
-+val v5_4_0 : t
-+val v5_4_1 : t
-+val v5_5_0 : t
- 
- val known_versions : t list
- 

diff --git a/ocaml-stdcompat.spec b/ocaml-stdcompat.spec
index 5cf0c2e..bc12322 100644
--- a/ocaml-stdcompat.spec
+++ b/ocaml-stdcompat.spec
@@ -1,5 +1,5 @@
 Name:           ocaml-stdcompat
-Version:        21.1
+Version:        22.0
 Release:        %autorelease
 Summary:        Compatibility module for the OCaml standard library
 
@@ -7,8 +7,8 @@ License:        LGPL-2.1-or-later
 URL:            https://github.com/ocamllibs/stdcompat
 VCS:            git:%{url}.git
 Source:         %{url}/archive/%{version}/stdcompat-%{version}.tar.gz
-# Temporary patch to support OCaml 5.5
-Patch:          %{name}-ocaml5.5.patch
+# Temporary patch to support OCaml 5.5.1
+Patch:          %{name}-ocaml5.5.1.patch
 
 # OCaml packages not built on i686 since OCaml 5 / Fedora 39.
 ExcludeArch:    %{ix86}
@@ -45,10 +45,20 @@ developing applications that use %{name}.
 %autosetup -n stdcompat-%{version} -p1
 
 %check
-# The tests assume that ocamlopt is available
+sed -r \
+    -e 's/.*@(BEGIN|END)_(WITH_UNIX|WITHOUT_WIN32)@//' \
+    -e 's/@BEGIN_(WITHOUT_UNIX|WITH_WIN32)@/\  (*/' \
+    -e 's/@END_(WITHOUT_UNIX|WITH_WIN32)@/\  *)/' \
+    stdcompat_tests.ml.in > _build/default/stdcompat_tests.ml
+OCAMLFLAGS='-I .stdcompat.objs/byte -cclib -L. -o stdcompat_tests'
+cd _build/default
 %ifarch %{ocaml_native_compiler}
-%dune_check
+ocamlopt $OCAMLFLAGS stdcompat.cmxa stdcompat_tests.ml
+%else
+ocamlc $OCAMLFLAGS stdcompat.cma stdcompat_tests.ml
 %endif
+./stdcompat_tests
+cd -
 
 %files -f .ofiles
 %doc AUTHORS CHANGES.md README.md

diff --git a/sources b/sources
index 820efaa..024fe3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stdcompat-21.1.tar.gz) = b3d93d200aa57a193459c143fafa97b7e96cbed3043ef8c7a2bc359ed385ff7d1ec03561cdab1f28e80055dc1c0bd7647bba827c6300b85a1d1c66a539626189
+SHA512 (stdcompat-22.0.tar.gz) = 0e054a1b958717b6320c40af49de696f8b44690bdd74f4a04f1341f2ef5c7f273d488603630af7cdaf4bf719c192b2fe89f90850727d344b044b3ff161e596cd