Skip to content

Commit 9341915

Browse files
committed
Upgrade to opam 2
1 parent b07be39 commit 9341915

File tree

3 files changed

+15
-26
lines changed

3 files changed

+15
-26
lines changed

src/Api.v

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -153,25 +153,14 @@ Module Evaluate.
153153
end
154154
end.
155155

156-
Definition opam_versions_aux (is_plural : bool) (package : LString.t)
157-
: C_exc (list LString.t) :=
158-
let field :=
159-
if is_plural then
160-
LString.s "available-versions"
161-
else
162-
LString.s "available-version" in
163-
let! versions := opam_field field package in
164-
let versions := LString.split versions "," in
156+
Definition opam_versions (package : LString.t) : C_exc (list LString.t) :=
157+
let! versions := opam_field (LString.s "all-versions") package in
158+
let versions := LString.split versions " " in
165159
let versions := List.map LString.trim versions in
166160
let versions := versions |> List.filter (fun version =>
167161
negb @@ LString.is_empty version) in
168162
ret versions.
169163

170-
Definition opam_versions (package : LString.t) : C_exc (list LString.t) :=
171-
let! single_version := opam_versions_aux false package in
172-
let! many_versions := opam_versions_aux true package in
173-
ret (single_version ++ many_versions).
174-
175164
Definition write_html (name content : LString.t) : C_exc unit :=
176165
let file_name := LString.s "html/" ++ name in
177166
let! is_success := Exception.lift @@ System.write_file file_name content in

src/Main.v

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ Definition get_version (name version : LString.t) : C Version.t :=
2020
let full_name := name ++ LString.s "." ++ version in
2121
let get_field field := Api.opam_field (LString.s field) full_name in
2222
let! fields :=
23-
join (get_field "description") @@
24-
join (get_field "license") @@
25-
join (get_field "homepage") @@
26-
join (get_field "bug-reports") @@
27-
join (get_field "upstream-url") @@
28-
get_field "depends" in
23+
join (get_field "synopsis") @@
24+
join (get_field "license:") @@
25+
join (get_field "homepage:") @@
26+
join (get_field "bug-reports:") @@
27+
join (get_field "url.src:") @@
28+
get_field "depends:" in
2929
match fields with
3030
| (description, (license, (homepage, (bug, (url, dependencies))))) =>
3131
ret @@ Version.New

src/Run.v

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ Import Io.Run.
1010
Definition get_version (name : LString.t) (version : Version.t)
1111
: Run.t (Main.get_version name (Version.version version)) version.
1212
eapply Let.
13-
- eapply (Join (Api.Run.opam_field (LString.s "description") _ (Version.description version))).
14-
eapply (Join (Api.Run.opam_field (LString.s "license") _ (Version.license version))).
15-
eapply (Join (Api.Run.opam_field (LString.s "homepage") _ (Version.homepage version))).
16-
eapply (Join (Api.Run.opam_field (LString.s "bug-reports") _ (Version.bug version))).
17-
eapply (Join (Api.Run.opam_field (LString.s "upstream-url") _ (Version.url version))).
18-
apply (Api.Run.opam_field (LString.s "depends") _ (Version.dependencies version)).
13+
- eapply (Join (Api.Run.opam_field (LString.s "synopsis") _ (Version.description version))).
14+
eapply (Join (Api.Run.opam_field (LString.s "license:") _ (Version.license version))).
15+
eapply (Join (Api.Run.opam_field (LString.s "homepage:") _ (Version.homepage version))).
16+
eapply (Join (Api.Run.opam_field (LString.s "bug-reports:") _ (Version.bug version))).
17+
eapply (Join (Api.Run.opam_field (LString.s "url.src:") _ (Version.url version))).
18+
apply (Api.Run.opam_field (LString.s "depends:") _ (Version.dependencies version)).
1919
- destruct version.
2020
apply Ret.
2121
Defined.

0 commit comments

Comments
 (0)