Merge pull request #697 from hacspec/fix-ci-opam-ppx_deriving

fix(ci): newer version of `ppx_deriving` (6.0.2) loops indefinitely
cryspen · Jun 3, 2024 · 704c0e1 · 704c0e1
2 parents a483aff + 2ec6cb9
commit 704c0e1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/engine/utils/ocaml_of_json_schema/ocaml_of_json_schema.js b/engine/utils/ocaml_of_json_schema/ocaml_of_json_schema.js
@@ -532,8 +532,14 @@ end
 open ParseError
 `;
 
-    impl += ('type ' + items.map(({name, type}) =>
-        `${name} = ${type}\n${derive_items.length ? `[@@deriving ${derive_items.join(', ')}]` : ''}`).join('\nand ')
+    let derive_clause = derive_items.length ? `[@@deriving ${derive_items.join(', ')}]` : '';
+
+    impl += (
+        'type '
+            + items.map(({name, type}) =>
+                `${name} = ${type}\n`
+            ).join('\nand ')
+            + derive_clause
     );
     impl += ('');
     impl += ('let rec ' + items.map(({name, type, parse}) =>