Fix compatibility with opam 2.2

README.md

@@ -182,7 +182,6 @@ flowchart TD
     style id370539618 fill:#BBB
   end
   subgraph 902546259 ["(local)"]
-
     subgraph 122612022 ["depgraph"]
       id439874552(Opam_installed_graph)
       id882674132(Opam_findlib)
@@ -209,12 +208,20 @@ flowchart TD
       id326418831(Common)
       id189591663{"main"}
     end
+    subgraph 305831830 ["opam_state_compat_gen"]
+      id323374370(Opam_state_compat_gen)
+      id305831830{"opam_state_compat_gen"}
+    end
     subgraph 312718400 ["ocamlgraph_extra"]
       id872997936(Ocamlgraph_extra)
       id157893572(Mermaid)
       id383119909(Graphviz)
       id312718400(["ocamlgraph_extra"])
     end
+    subgraph 433051691 ["opam_state_compat"]
+      id80388000(Opam_state_compat)
+      id433051691(["opam_state_compat"])
+    end
     subgraph 557698697 ["dune_describe"]
       id15495529(Dune_describe)
       id557698697(["dune_describe"])
@@ -228,6 +235,8 @@ flowchart TD
   189591663-->id500343217
   189591663-->122612022
   id189591663-->id725600054
+  305831830-->id261565931
+  id305831830-->id323374370
   id615168812-->id920833612
   id615168812-->id631192440
   id615168812-->id1001087518
@@ -275,9 +284,9 @@ flowchart TD
   id85613087-->id612096776
   id612096776-->id266426620
   122612022-->id11445160
-  122612022-->id261565931
   122612022-->557698697
   122612022-->312718400
+  122612022-->433051691
   122612022-->158492278
   id122612022-->id593996496
   557698697-->id958091540
@@ -286,6 +295,8 @@ flowchart TD
   id557698697-->id15495529
   312718400-->id183162717
   id312718400-->id872997936
+  433051691-->id261565931
+  id433051691-->id80388000
   id158492278-->id1008512934
   id952370123-->id326418831
   id8714191-->id326418831

dune-project

@@ -17,9 +17,9 @@
   sexplib
   (ppx_sexp_conv (>= v0.13))
   parsexp
-  (opam-core (and (>= 2.1.0) (< 2.2)))
-  (opam-state (and (>= 2.1.0) (< 2.2)))
-  (opam-format (< 2.2))
+  (opam-core (>= 2.1.0))
+  (opam-state (>= 2.1.0))
+  opam-format
   (ocamlfind (>= 1.8.1))
   (cmdliner (>= 1.1.0))
   bos

img/dune-odep.mermaid

@@ -172,12 +172,20 @@ flowchart TD
       id326418831(Common)
       id189591663{"main"}
     end
+    subgraph 305831830 ["opam_state_compat_gen"]
+      id323374370(Opam_state_compat_gen)
+      id305831830{"opam_state_compat_gen"}
+    end
     subgraph 312718400 ["ocamlgraph_extra"]
       id872997936(Ocamlgraph_extra)
       id157893572(Mermaid)
       id383119909(Graphviz)
       id312718400(["ocamlgraph_extra"])
     end
+    subgraph 433051691 ["opam_state_compat"]
+      id80388000(Opam_state_compat)
+      id433051691(["opam_state_compat"])
+    end
     subgraph 557698697 ["dune_describe"]
       id15495529(Dune_describe)
       id557698697(["dune_describe"])
@@ -191,6 +199,8 @@ flowchart TD
   189591663-->id500343217
   189591663-->122612022
   id189591663-->id725600054
+  305831830-->id261565931
+  id305831830-->id323374370
   id615168812-->id920833612
   id615168812-->id631192440
   id615168812-->id1001087518
@@ -238,9 +248,9 @@ flowchart TD
   id85613087-->id612096776
   id612096776-->id266426620
   122612022-->id11445160
-  122612022-->id261565931
   122612022-->557698697
   122612022-->312718400
+  122612022-->433051691
   122612022-->158492278
   id122612022-->id593996496
   557698697-->id958091540
@@ -249,6 +259,8 @@ flowchart TD
   id557698697-->id15495529
   312718400-->id183162717
   id312718400-->id872997936
+  433051691-->id261565931
+  id433051691-->id80388000
   id158492278-->id1008512934
   id952370123-->id326418831
   id8714191-->id326418831

odep.opam

@@ -12,9 +12,9 @@ depends: [
   "sexplib"
   "ppx_sexp_conv" {>= "v0.13"}
   "parsexp"
-  "opam-core" {>= "2.1.0" & < "2.2"}
-  "opam-state" {>= "2.1.0" & < "2.2"}
-  "opam-format" {< "2.2"}
+  "opam-core" {>= "2.1.0"}
+  "opam-state" {>= "2.1.0"}
+  "opam-format"
   "ocamlfind" {>= "1.8.1"}
   "cmdliner" {>= "1.1.0"}
   "bos"

src/depgraph/dune

@@ -8,5 +8,6 @@
   parsexp
   opam-format
   opam-state
+  opam_state_compat
   findlib)
  (preprocess (pps ppx_deriving.eq ppx_deriving.ord)))

src/depgraph/opam_installed_graph.ml

@@ -9,9 +9,7 @@ module Ofml = OpamFormula
 module GOper = Graph.Oper.P (G)
 
 let g_of_depends ~st ~env depends =
-  let {u_installed; u_depends; u_depopts; _} =
-    OpamSwitchState.universe st ~requested:Opkg.Name.Set.empty Query
-  in
+  let {u_installed; u_depends; u_depopts; _} = Opam_state_compat.universe_query st in
 
   let fold_all_depends f acc package =
     let deps = Opkg.Map.find package u_depends |> OpamPackageVar.filter_depends_formula ~env in
@@ -65,9 +63,7 @@ let g_of_depends ~st ~env depends =
     fold_deps G.empty Opkg.Set.empty depends_package
 
 let g_of_rdepends ~st ~env rdepends =
-  let {u_installed; u_depends; u_depopts; _} =
-    OpamSwitchState.universe st ~requested:Opkg.Name.Set.empty Query
-  in
+  let {u_installed; u_depends; u_depopts; _} = Opam_state_compat.universe_query st in
 
   let fold_all_depends f acc package =
     let deps = Opkg.Map.find package u_depends |> OpamPackageVar.filter_depends_formula ~env in

src/opam_state_compat/dune

@@ -0,0 +1,13 @@
+(library
+ (name opam_state_compat)
+ (modules opam_state_compat)
+ (libraries opam-state))
+
+(executable
+ (name opam_state_compat_gen)
+ (modules opam_state_compat_gen)
+ (libraries opam-core opam-state))
+
+(rule
+ (target opam_state_compat.ml)
+ (action (with-stdout-to %{target} (run ./opam_state_compat_gen.exe))))

src/opam_state_compat/opam_state_compat.mli

@@ -0,0 +1,4 @@
+open OpamTypes
+open OpamStateTypes
+
+val universe_query: 'a switch_state -> universe