Skip to content

Commit

Permalink
changes for 3.10.7, and avoid deprecated 'opam config var prefix'
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesm committed Dec 9, 2021
1 parent 4369fcd commit 814f215
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### v3.10.7 (2021-12-09)

- Allow mirage-clock 4.0.0 (@hannesm #1256)
- Use "opam var prefix" instead of "opam config var prefix" (@hannesm)

### v3.10.6 (2021-10-20)

- Adapt to conduit 5.0.0 API (and dns 6.0.0) @hannesm #1246
Expand Down
2 changes: 1 addition & 1 deletion lib/mirage_impl_misc.ml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ let query_ocamlfind ?(recursive = false) ?(format="%p") ?predicates libs =
OS.Cmd.run_out cmd |> OS.Cmd.out_lines >>| fst

let opam_prefix =
let cmd = Bos.Cmd.(v "opam" % "config" % "var" % "prefix") in
let cmd = Bos.Cmd.(v "opam" % "var" % "prefix") in
lazy (match Sys.getenv_opt "PREFIX" with
| Some x -> Ok x
| None -> Bos.OS.Cmd.(run_out cmd |> out_string |> success))
Expand Down

0 comments on commit 814f215

Please sign in to comment.