Upstreaming changes #32
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Pietro Abate <pietro.abate@nomadic-labs.com> Co-authored-by: Gregoire Henry <gregoire.henry@tezos.com>
It now uses dune and "wraps" its library.
We don't care as we're not using the Makefile directly but: dune: --dev is no longer accepted as it is now the default.
…rom upstream It is upstream acfb41f
- ocaml.4.07.1 - lwt.4.1.0 - dune.1.7.1 These need to be updated all at once due to incompatibilities in our dependencies Author: Grégoire Henry <gregoire.henry@tezos.com>
By @abate - [Protocol compiler]: Minor change to dune file - fix opam file of tezos-client-demo - add install in opam files for lib_resto-directory & lib_resto - makes it feasible to extract all vendors/ packages to an opam repository - Vendors: specify double [[ in build fields in opam files
NOTE: This is only to have uniform opam files.
Co-authored-by: Pietro Abate <pietro.abate@nomadic-labs.com.com> Co-authored-by: Raphaël Proust <code@bnwr.net>
fix also a minor problem in stdlib_unix
chambart
reviewed
Sep 3, 2019
chambart
reviewed
Sep 3, 2019
chambart
reviewed
Sep 3, 2019
|
Are you certain about the merge commit. There seems to be nothing else than opam files changes and some comments ? |
|
On tezos' On this here branch: The IIUC, there's been some up- and down-streaming of patches in this project. Hence the very similar sources and the short diff. |
raphael-proust
force-pushed
the
upstreaming-changes
branch
from
c63f5c4 to
fae576b
Compare
|
Ok then, it's good to go. It probably don't require a new release right now. |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These are all the commits from the tezos repository (https://gitlab.com/tezos/tezos) that made changes to the vendored
ocplib-json-typed. A merge commit reconciles work from the vendored and upstream version.