Skip to content

Commit

Permalink
Merge pull request ocaml#251 from samoht/lowerbounds
Browse files Browse the repository at this point in the history
automatically add {>= 3.0.0} version constraints for mirage-types{-lwt}
  • Loading branch information
samoht authored Dec 13, 2016
2 parents bfa33b7 + 94255b9 commit 2c580e0
Show file tree
Hide file tree
Showing 25 changed files with 86 additions and 87 deletions.
3 changes: 1 addition & 2 deletions packages/channel/channel.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"ocamlbuild" {build}
"topkg" {build}
"mirage-types" {>= "3.0.0"}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"io-page"
"lwt" {>= "2.4.7"}
"cstruct"
Expand All @@ -23,6 +23,5 @@ depends: [
"mirage-flow" {test}
]
conflicts: [ "tcpip" {<"2.5.0"} ]
depopts: []
build: [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "false" ]
build-test: [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "true" ]
5 changes: 2 additions & 3 deletions packages/crunch/crunch.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ depends: [
"bos" {test}
"cstruct" {test}
"lwt" {test}
"mirage-types" {test}
"mirage-types-lwt" {test}
"mirage-types" {test & >= "3.0.0"}
"mirage-types-lwt" {test & >= "3.0.0"}
"io-page" {test}
]

build: [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "false" ]
build-test: [
[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "true" ]
Expand Down
38 changes: 22 additions & 16 deletions packages/datakit/datakit.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,37 @@ build-test: [
]

depends: [
"ocamlfind" {build}
"ocamlfind" {build}
"ocamlbuild" {build}
"topkg" {build}
"topkg" {build}
"datakit-server" {>= "0.7.0"}
"cmdliner"
"rresult" "astring" "fmt" "asetmap"
"git" {>= "1.9.3"}
"mirage-tc" "uri"
"mirage-types"
"irmin" {>= "0.12.0"}
"camlzip" {>= "1.06"}
"cstruct" {>= "2.2"}
"result" "lwt"
"conduit" "mirage-flow"
"rresult"
"astring"
"fmt"
"asetmap"
"git" {>= "1.9.3"}
"mirage-tc"
"uri"
"mirage-types" {>= "3.0.0"}
"irmin" {>= "0.12.0"}
"camlzip" {>= "1.06"}
"cstruct" {>= "2.2"}
"result"
"lwt"
"conduit"
"mirage-flow"
"cohttp"
"named-pipe" {>= "0.4.0"}
"hvsock" {>= "0.8.1"}
"logs" {>= "0.5.0"}
"named-pipe" {>= "0.4.0"}
"hvsock" {>= "0.8.1"}
"logs" {>= "0.5.0"}
"win-eventlog"
"asl" {>= "0.10"}
"asl" {>= "0.10"}
"mtime"
"irmin-watcher" {>= "0.2.0"}
"datakit-client" {test}
"datakit-server"
"datakit-github" {test}
"alcotest" {test & >= "0.7.0"}
"alcotest" {test & >= "0.7.0"}
]
available: [ocaml-version >= "4.02.0"]
4 changes: 2 additions & 2 deletions packages/git-mirage/git-mirage.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dev-repo: "https://github.com/mirage/ocaml-git.git"
depends: [
"mirage-http"
"mirage-flow"
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"channel"
"git" {>= "1.6.0"}
]
]
28 changes: 14 additions & 14 deletions packages/git/git.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@ build-test: [

depends: [
"cmdliner"
"mstruct" {>= "1.3.1"}
"mstruct" {>= "1.3.1"}
"ocamlgraph"
"uri" {>= "1.3.12"}
"lwt" {>= "2.4.7"}
"uri" {>= "1.3.12"}
"lwt" {>= "2.4.7"}
"mtime"
"logs"
"fmt"
"hex"
"astring"
"crc"
"alcotest" {test}
"mirage-types-lwt" {test}
"mirage-http" {test}
"mirage-flow" {test}
"channel" {test}
"mirage-fs-unix" {test & >="1.1.4"}
"cohttp" {test}
"conduit" {test}
"base-unix" {test}
"camlzip" {test & >= "1.06"}
"nocrypto" {test}
"alcotest" {test}
"mirage-types-lwt" {test & >= "3.0.0"}
"mirage-http" {test}
"mirage-flow" {test}
"channel" {test}
"mirage-fs-unix" {test & >= "1.1.4"}
"cohttp" {test}
"conduit" {test}
"base-unix" {test}
"camlzip" {test & >= "1.06"}
"nocrypto" {test}
]
depopts: [
# --enable-mirage
Expand Down
2 changes: 1 addition & 1 deletion packages/irmin-mirage/irmin-mirage.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dev-repo: "https://github.com/mirage/irmin.git"

depends: [
"mirage-types" {>= "3.0.0"}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"git-mirage"
"irmin"
]
5 changes: 2 additions & 3 deletions packages/mirage-block-ccm/mirage-block-ccm.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: "mirage-block-ccm"
homepage: "https://github.com/sg2342/mirage-block-ccm"
dev-repo: "https://github.com/sg2342/mirage-block-ccm.git"
bug-reports: "https://github.com/sg2342/mirage-block-ccm/issues"
author: ["Stefan Grundmann <sg2342@googlemail.com>"]
maintainer: ["Stefan Grundmann <sg2342@googlemail.com>"]
license: "ISC"

Expand All @@ -18,15 +17,15 @@ depends: [
"ocamlfind" {build}
"cstruct" {>= "1.0.1"}
"lwt" {>= "2.4.3"}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"nocrypto" {>= "0.5.1"}
"io-page" {>= "1.0.0"}
"ounit" {test}
"bisect" {test}
]

build-test: [
[ "./configure" "--%{ounit:enable}%-tests" "--%{bisect:enable}%-coverage" ]
[ make "cover_test" ] ]

available: [ocaml-version > "4.02.0"]
authors: "Stefan Grundmann <sg2342@googlemail.com>"
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
opam-version: "1.2"
name: "mirage-block-ramdisk"
maintainer: "dave@recoil.org"
version: "0.1"
authors: [ "David Scott" ]
license: "ISC"
homepage: "https://github.com/mirage/mirage-block-ramdisk"
Expand All @@ -17,7 +16,7 @@ depends: [
"base-bytes"
"cstruct"
"io-page"
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"lwt"
"ocamlfind" {build}
"ocamlbuild" {build}
Expand Down
6 changes: 1 addition & 5 deletions packages/mirage-block/mirage-block.dev~mirage/opam
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
opam-version: "1.2"
name: "mirage-block"
maintainer: "dave@recoil.org"
version: "0.1"
authors: [ "David Scott" ]
license: "ISC"
homepage: "https://github.com/mirage/mirage-block"
dev-repo: "https://github.com/mirage/mirage-block.git"
bug-reports: "https://github.com/mirage/mirage-block/issues"

tags: [
]

build: [
[make "PREFIX=%{prefix}%"]
]
Expand All @@ -22,7 +18,7 @@ remove: [["ocamlfind" "remove" "mirage-block"]]
depends: [
"base-bytes"
"cstruct"
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"lwt"
"logs"
"ocamlfind" {build}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"ocamlbuild" {build}
"topkg" {build}
"mirage-types" {>= "0.3.0"}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"lwt"
]
build: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"ocamlbuild" {build}
"topkg" {build}
"mirage-types" {>= "3.0.0"}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"lwt"
]
build: [ "ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "%{pinned}%" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ depends: [
"ocamlfind" {build}
"ocamlbuild" {build}
"topkg" {build}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"mirage-solo5"
"mirage-runtime"
"cstruct"
Expand Down
10 changes: 6 additions & 4 deletions packages/mirage-console-xen/mirage-console-xen.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ license: "ISC"
build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "%{pinned}%"]

depends: [
"ocamlfind" {build}
"ocamlfind" {build}
"ocamlbuild" {build}
"topkg" {build & >= "0.7.3"}
"topkg" {build & >= "0.7.3"}
"mirage-console-xen-proto"
"mirage-types-lwt"
"xen-evtchn" "xen-gnt" "mirage-xen"
"mirage-types-lwt" {>= "3.0.0"}
"xen-evtchn"
"xen-gnt"
"mirage-xen"
]
available: [ocaml-version >= "4.03.0"]
6 changes: 3 additions & 3 deletions packages/mirage-flow/mirage-flow.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ install: [make "install"]
remove: ["ocamlfind" "remove" "mirage-flow"]
depends: [
"ocamlbuild" {build}
"ocamlfind" {build}
"ocamlfind" {build}
"mirage-types" {>= "3.0.0"}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"cstruct"
"lwt" {>= "2.5.0"}
"alcotest" {test}
"ounit" {test}
"ounit" {test}
]
10 changes: 5 additions & 5 deletions packages/mirage-fs-unix/mirage-fs-unix.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ depends: [
"ocamlfind" {build}
"cstruct" {>= "1.4.0"}
"mirage-types" {>= "3.0.0"}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"mirage-runtime"
"lwt"
"rresult" {test}
"rresult" {test}
"mirage-clock-unix" {test}
"alcotest" {test & >= "0.7.1"}
"ounit" {test}
"ptime" {test}
"alcotest" {test & >= "0.7.1"}
"ounit" {test}
"ptime" {test}
]
available: [ ocaml-version >= "4.03.0"]
6 changes: 3 additions & 3 deletions packages/mirage-net-macosx/mirage-net-macosx.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ build: ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%"]

depends: [
"ocamlfind" {build}
"topkg" {build}
"topkg" {build}
"cstruct" {>= "1.4.0"}
"ipaddr"
"sexplib"
"lwt" {>= "2.4.3"}
"mirage-types"
"mirage-types-lwt"
"mirage-types" {>= "3.0.0"}
"mirage-types-lwt" {>= "3.0.0"}
"io-page" {>= "1.4.0"}
"vmnet"
]
2 changes: 1 addition & 1 deletion packages/mirage-net-solo5/mirage-net-solo5.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ depends: [
"topkg" {build}
"cstruct" {>= "1.0.1"}
"lwt" {>= "2.4.3"}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"io-page" {>= "1.0.0"}
"ipaddr" {>= "1.0.0"}
"mirage-solo5"
Expand Down
8 changes: 4 additions & 4 deletions packages/mirage-qubes/mirage-qubes.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ depends: [
"ocamlfind" {build}
"ocamlbuild" {build}
"topkg" {build}
"cstruct" { >= "1.9.0" }
"vchan" { >= "2.0.0" }
"cstruct" {>= "1.9.0"}
"vchan" {>= "2.0.0"}
"xen-evtchn"
"xen-gnt"
"mirage-xen"
"lwt"
"mirage-types"
"logs" { >= "0.5.0" }
"mirage-types" {>= "3.0.0"}
"logs" {>= "0.5.0"}
]
depopts: [
"ipaddr"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ depends: [
"ocamlfind" {build}
"ocamlbuild" {build}
"topkg" {build}
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"cstruct" {>= "1.9.0"}
]

build: [
[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]
]
6 changes: 3 additions & 3 deletions packages/protocol-9p/protocol-9p.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ build-test: [
depends: [
"base-bytes"
"cstruct" {>= "1.9.0"}
"sexplib" {> "113.00.00" }
"sexplib" {> "113.00.00"}
"result"
"mirage-types-lwt"
"channel" {>= "1.1.0" }
"mirage-types-lwt" {>= "3.0.0"}
"channel" {>= "1.1.0"}
"lwt" {>= "2.4.7"}
"base-unix"
"cmdliner"
Expand Down
6 changes: 3 additions & 3 deletions packages/qcow-format/qcow-format.dev~mirage/opam
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ depends: [
"base-bytes"
"cstruct"
"result"
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"lwt"
"mirage-block" {>= "0.2" }
"mirage-block-unix" {>= "2.1.0" }
"mirage-block" {>= "0.2"}
"mirage-block-unix" {>= "2.1.0"}
"cmdliner"
"sexplib"
"logs"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ depends: [
"lwt"
"ocamlfind"
"ounit"
"mirage-types-lwt"
"mirage-types-lwt" {>= "3.0.0"}
"mirage-block-unix"
"mirage-clock-unix"
"sexplib"
Expand Down
Loading

0 comments on commit 2c580e0

Please sign in to comment.