tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From caf5430f30830a2222bd7d0e6c5cea7b632e4a6a Mon Sep 17 00:00:00 2001
2From: Zoggy <zoggy@bat8.org>
3Date: Wed, 22 Oct 2025 11:41:52 +0200
4Subject: [PATCH] support Yojson >= 3.0: do not use `Tuple any more, use `List
5 instead
6
7---
8 Changes | 3 +++
9 lib/ocf.ml | 14 +++++---------
10 2 files changed, 8 insertions(+), 9 deletions(-)
11
12diff --git a/lib/ocf.ml b/lib/ocf.ml
13index 3169d13..3ac98a4 100644
14--- a/lib/ocf.ml
15+++ b/lib/ocf.ml
16@@ -130,8 +130,7 @@ module Wrapper =
17 let list w =
18 let to_j ?with_doc l = `List (List.map (w.to_json ?with_doc) l) in
19 let from_j ?def = function
20- | `List l
21- | `Tuple l -> List.map (w.from_json ?def: None) l
22+ | `List l -> List.map (w.from_json ?def: None) l
23 | `Null -> []
24 | json -> invalid_value json
25 in
26@@ -150,27 +149,24 @@ module Wrapper =
27
28 let pair w1 w2 =
29 let to_j ?with_doc (v1, v2) =
30- `Tuple [w1.to_json ?with_doc v1 ; w2.to_json ?with_doc v2]
31+ `List [w1.to_json ?with_doc v1 ; w2.to_json ?with_doc v2]
32 in
33 let from_j ?def = function
34- `List [v1 ; v2]
35- | `Tuple [v1 ; v2] -> (w1.from_json v1, w2.from_json v2)
36+ | `List [v1 ; v2] -> (w1.from_json v1, w2.from_json v2)
37 | json -> invalid_value json
38 in
39 make to_j from_j
40
41 let triple w1 w2 w3 =
42 let to_j ?with_doc (v1, v2, v3) =
43- `Tuple [
44+ `List [
45 w1.to_json ?with_doc v1 ;
46 w2.to_json ?with_doc v2 ;
47 w3.to_json ?with_doc v3 ;
48 ]
49 in
50 let from_j ?def = function
51- `List [v1 ; v2 ; v3]
52- | `Tuple [v1 ; v2 ; v3] ->
53- (w1.from_json v1, w2.from_json v2, w3.from_json v3)
54+ `List [v1 ; v2 ; v3] -> (w1.from_json v1, w2.from_json v2, w3.from_json v3)
55 | json -> invalid_value json
56 in
57 make to_j from_j
58--
59GitLab
60