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: 565ea97ef865
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 34c2b36a4940
Choose a head ref
  • 5 commits
  • 5 files changed
  • 2 contributors

Commits on Mar 20, 2016

  1. Remove >= constraint in opam package 

    This seems to confuse both functoria and opam-depext, so that's not
worth it.
    @samoht
    samoht committed Mar 20, 2016
    Copy the full SHA
    95b48dd View commit details

  2. Update CHANGES

    @samoht
    samoht committed Mar 20, 2016
    Copy the full SHA
    39e5e62 View commit details

  3. Bump version

    @samoht
    samoht committed Mar 20, 2016
    Copy the full SHA
    a18c6df View commit details

  4. Update autogen files

    @samoht
    samoht committed Mar 20, 2016
    Copy the full SHA
    5d5c7e9 View commit details

  5. Merge pull request #519 from samoht/master 

    Fix regression in `opam depext` and in truncated opam output
    @samoht
    samoht committed Mar 20, 2016
    Copy the full SHA
    34c2b36 View commit details
Showing with 13 additions and 12 deletions.
  1. +5 −0 CHANGES.md
  2. +1 −1 _oasis
  3. +3 −3 lib/META
  4. +1 −5 lib/mirage.ml
  5. +3 −3 setup.ml
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 2.7.2 (2016-03-20)

* Fix regression introduce in 2.7.1 which truncates the ouput of
`opam install` and breaks `opam depext` (#519, by @samoht)

### 2.7.1 (2016-03-17)

* Improve the Dockerfile (#507, by @avsm)
2 changes: 1 addition & 1 deletion _oasis
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: mirage
Version: 2.7.1
Version: 2.7.2
Synopsis: Mirage configuration tool
Authors: Thomas Gazagnaire, Anil Madhavapeddy, Dave Scott, Thomas Leonard
License: ISC
6 changes: 3 additions & 3 deletions lib/META
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: cfb5d21d70868ed8792bac8b338cab74)
version = "2.7.1"
# DO NOT EDIT (digest: 2af7ef075b19e30042a16861d5ffc989)
version = "2.7.2"
description = "Mirage configuration tool"
requires = "ipaddr functoria mirage.runtime functoria.app"
archive(byte) = "mirage.cma"
@@ -9,7 +9,7 @@ archive(native) = "mirage.cmxa"
archive(native, plugin) = "mirage.cmxs"
exists_if = "mirage.cma"
package "runtime" (
version = "2.7.1"
version = "2.7.2"
description = "Mirage configuration tool"
requires = "functoria.runtime ipaddr astring"
archive(byte) = "mirage-runtime.cma"
6 changes: 1 addition & 5 deletions lib/mirage.ml
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,6 @@
open Rresult
open Astring

let mirage_types_version = ">=2.6.0"

module Key = Mirage_key
module Name = Functoria_app.Name
module Cmd = Functoria_app.Cmd
@@ -1462,9 +1460,7 @@ module Project = struct
]

method packages =
let l = [
"lwt"; "mirage-types" ^ mirage_types_version; "mirage-types-lwt"
] in
let l = [ "lwt"; "mirage-types"; "mirage-types-lwt" ] in
Key.(if_ is_xen) ("mirage-xen" :: l) ("mirage-unix" :: l)

method libraries =
6 changes: 3 additions & 3 deletions setup.ml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.5 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 7954c72899a8ae3bde9919a93b5cce4e) *)
(* DO NOT EDIT (digest: e123bd014ceccadea3347200d67f3b92) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6695,7 +6695,7 @@ let setup_t =
alpha_features = ["ocamlbuild_more_args"];
beta_features = [];
name = "mirage";
version = "2.7.1";
version = "2.7.2";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -6888,7 +6888,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "\155\028©\129#\133û¦\145\012ÿÿfQM\132";
oasis_digest = Some "\030\b§\138[b:=V´\141l\007\022\156\156";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false