Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d98074985966
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cf63116ffa35
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Nov 3, 2016

  1. use topkg-0.8.0 features

    @hannesm
    hannesm committed Nov 3, 2016
    Copy the full SHA
    a00f206 View commit details

Commits on Nov 4, 2016

  1. Merge pull request #654 from hannesm/topkg-0.8.0-cleanups 

    use topkg-0.8.0 features
    @yomimono
    yomimono authored Nov 4, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cf63116 View commit details
Showing with 5 additions and 12 deletions.
  1. +0 −3 lib_runtime/mirage-runtime.mllib
  2. +1 −1 mirage-types.opam
  3. +1 −1 mirage.opam
  4. +2 −6 pkg/pkg.ml
  5. +1 −1 types/mirage-types.mllib
3 changes: 0 additions & 3 deletions lib_runtime/mirage-runtime.mllib
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# OASIS_START
# DO NOT EDIT (digest: 90cd4ed4daa09207d0dfb6d4ce417c82)
Mirage_runtime
Mirage_info
# OASIS_STOP
2 changes: 1 addition & 1 deletion mirage-types.opam
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ build: [
depends: [
"ocamlbuild" {build}
"ocamlfind" {build}
"topkg" {build & >= "0.7.3"}
"topkg" {build & >= "0.8.0"}
"result"
]
depopts: [ "lwt" "cstruct" "ipaddr" "io-page" ]
2 changes: 1 addition & 1 deletion mirage.opam
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--pinned" "%{pinned}%"]
depends: [
"ocamlbuild" {build}
"ocamlfind" {build}
"topkg" {build & >= "0.7.3"}
"topkg" {build & >= "0.8.0"}
"ipaddr" {>= "2.6.0"}
"functoria" {>= "1.1.0"}
"astring"
8 changes: 2 additions & 6 deletions pkg/pkg.ml
View file
Original file line number Diff line number Diff line change
@@ -31,12 +31,8 @@ let () =
Pkg.bin "lib/main" ~dst:"mirage"; ]
| "mirage-types" ->
Ok [ Pkg.lib "pkg/META.mirage-types" ~dst:"META";
Pkg.lib "types/V1.mli";
Pkg.lib "types/V1.cmi";
Pkg.lib "types/V1.cmti";
Pkg.lib ~exts:Exts.interface "types/V1";
Pkg.mllib "types/mirage-types.mllib";
Pkg.lib ~cond:lwt "types/V1_LWT.mli";
Pkg.lib ~cond:lwt "types/V1_LWT.cmi";
Pkg.lib ~cond:lwt "types/V1_LWT.cmti"; ]
Pkg.lib ~cond:lwt ~exts:Exts.interface "types/V1_LWT"; ]
| other ->
R.error_msgf "unknown package name: %s" other
2 changes: 1 addition & 1 deletion types/mirage-types.mllib
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
runtime/m_pp
runtime/M_pp