Upgrade to opam 2

coq-io · Jul 10, 2019 · 9341915 · 9341915
1 parent b07be39
commit 9341915
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 26 deletions.
diff --git a/src/Api.v b/src/Api.v
@@ -153,25 +153,14 @@ Module Evaluate.
       end
     end.
 
-  Definition opam_versions_aux (is_plural : bool) (package : LString.t)
-    : C_exc (list LString.t) :=
-    let field :=
-      if is_plural then
-        LString.s "available-versions"
-      else
-        LString.s "available-version" in
-    let! versions := opam_field field package in
-    let versions := LString.split versions "," in
+  Definition opam_versions (package : LString.t) : C_exc (list LString.t) :=
+    let! versions := opam_field (LString.s "all-versions") package in
+    let versions := LString.split versions " " in
     let versions := List.map LString.trim versions in
     let versions := versions |> List.filter (fun version =>
       negb @@ LString.is_empty version) in
     ret versions.
 
-  Definition opam_versions (package : LString.t) : C_exc (list LString.t) :=
-    let! single_version := opam_versions_aux false package in
-    let! many_versions := opam_versions_aux true package in
-    ret (single_version ++ many_versions).
-
   Definition write_html (name content : LString.t) : C_exc unit :=
     let file_name := LString.s "html/" ++ name in
     let! is_success := Exception.lift @@ System.write_file file_name content in

diff --git a/src/Main.v b/src/Main.v
@@ -20,12 +20,12 @@ Definition get_version (name version : LString.t) : C Version.t :=
   let full_name := name ++ LString.s "." ++ version in
   let get_field field := Api.opam_field (LString.s field) full_name in
   let! fields :=
-    join (get_field "description") @@
-    join (get_field "license") @@
-    join (get_field "homepage") @@
-    join (get_field "bug-reports") @@
-    join (get_field "upstream-url") @@
-    get_field "depends" in
+    join (get_field "synopsis") @@
+    join (get_field "license:") @@
+    join (get_field "homepage:") @@
+    join (get_field "bug-reports:") @@
+    join (get_field "url.src:") @@
+    get_field "depends:" in
   match fields with
   | (description, (license, (homepage, (bug, (url, dependencies))))) =>
     ret @@ Version.New

diff --git a/src/Run.v b/src/Run.v
@@ -10,12 +10,12 @@ Import Io.Run.
 Definition get_version (name : LString.t) (version : Version.t)
   : Run.t (Main.get_version name (Version.version version)) version.
   eapply Let.
-  - eapply (Join (Api.Run.opam_field (LString.s "description") _ (Version.description version))).
-    eapply (Join (Api.Run.opam_field (LString.s "license") _ (Version.license version))).
-    eapply (Join (Api.Run.opam_field (LString.s "homepage") _ (Version.homepage version))).
-    eapply (Join (Api.Run.opam_field (LString.s "bug-reports") _ (Version.bug version))).
-    eapply (Join (Api.Run.opam_field (LString.s "upstream-url") _ (Version.url version))).
-    apply (Api.Run.opam_field (LString.s "depends") _ (Version.dependencies version)).
+  - eapply (Join (Api.Run.opam_field (LString.s "synopsis") _ (Version.description version))).
+    eapply (Join (Api.Run.opam_field (LString.s "license:") _ (Version.license version))).
+    eapply (Join (Api.Run.opam_field (LString.s "homepage:") _ (Version.homepage version))).
+    eapply (Join (Api.Run.opam_field (LString.s "bug-reports:") _ (Version.bug version))).
+    eapply (Join (Api.Run.opam_field (LString.s "url.src:") _ (Version.url version))).
+    apply (Api.Run.opam_field (LString.s "depends:") _ (Version.dependencies version)).
   - destruct version.
     apply Ret.
 Defined.