Skip to content

Commit

Permalink
[opam] delete host-* packages from lock files
Browse files Browse the repository at this point in the history
Summary:
These are architecture-dependent and as such not always satisfiable.

See also ocaml/opam#6042

Reviewed By: geralt-encore

Differential Revision: D62236842

fbshipit-source-id: d985556513d7367a0c0b1db6252104d9325015e0
  • Loading branch information
jvillard authored and facebook-github-bot committed Sep 5, 2024
1 parent d9558ef commit 003cb74
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
3 changes: 3 additions & 0 deletions opam/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@ all: infer.opam.locked infer-tests.opam.locked ocamlformat.opam.locked
.PHONY: infer.opam.locked
infer.opam.locked:
$(OPAM) lock --switch $(OPAMSWITCH) ./infer.opam
sed -i '/^ *"host-/d' $@

# depends on opam internal state
.PHONY: infer-tests.opam.locked
infer-tests.opam.locked:
sed -e 's/{with-test}//' -e 's/ & with-test}/}/' infer.opam > infer-tests.opam
$(OPAM) lock --switch $(OPAMSWITCH) ./infer-tests.opam
sed -i '/^ *"host-/d' $@

# depends on opam internal state
.PHONY: ocamlformat.opam.locked
ocamlformat.opam.locked:
$(OPAM) lock --switch $(OPAMSWITCH) ocamlformat
sed -i '/^ *"host-/d' $@
2 changes: 0 additions & 2 deletions opam/infer-tests.opam.locked
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ depends: [
"fieldslib" {= "v0.15.0"}
"fmt" {= "0.9.0"}
"gen" {= "1.1"}
"host-arch-x86_64" {= "1"}
"host-system-other" {= "1"}
"int_repr" {= "v0.15.0"}
"integers" {= "0.7.0"}
"iter" {= "1.8"}
Expand Down
2 changes: 0 additions & 2 deletions opam/infer.opam.locked
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ depends: [
"fieldslib" {= "v0.15.0"}
"fmt" {= "0.9.0"}
"gen" {= "1.1"}
"host-arch-x86_64" {= "1"}
"host-system-other" {= "1"}
"int_repr" {= "v0.15.0"}
"integers" {= "0.7.0"}
"iter" {= "1.8"}
Expand Down
2 changes: 0 additions & 2 deletions opam/ocamlformat.opam.locked
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ depends: [
"either" {= "1.0.0"}
"fix" {= "20230505"}
"fpath" {= "0.7.3"}
"host-arch-x86_64" {= "1"}
"host-system-other" {= "1"}
"menhir" {= "20240715"}
"menhirCST" {= "20240715"}
"menhirLib" {= "20240715"}
Expand Down

0 comments on commit 003cb74

Please sign in to comment.