From 0ce5a864c008d521da9a1b4ade802c44a2237161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <georges.duperon@nomadic-labs.com>
Date: Fri, 19 Apr 2019 16:05:52 +0200
Subject: [PATCH] Renamed ppx_let to ppx_let_generalized (part 2)

To avoid conflicts in an installaction containing both our changes and the official version.
---
 .../ppx_let_generalized/dune-project          |  1 -
 .../ppx_let_generalized/expander/dune         |  4 ++--
 .../ppx_let_generalized.opam                  | 21 -------------------
 src/lib_utils/ppx_let_generalized/src/dune    |  4 ++--
 src/lib_utils/tezos-utils.opam                |  4 ++++
 src/ligo/dune                                 |  2 +-
 src/ligo/ligo.opam                            |  2 +-
 7 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 src/lib_utils/ppx_let_generalized/dune-project
 delete mode 100644 src/lib_utils/ppx_let_generalized/ppx_let_generalized.opam

diff --git a/src/lib_utils/ppx_let_generalized/dune-project b/src/lib_utils/ppx_let_generalized/dune-project
deleted file mode 100644
index 598db5612..000000000
--- a/src/lib_utils/ppx_let_generalized/dune-project
+++ /dev/null
@@ -1 +0,0 @@
-(lang dune 1.5)
\ No newline at end of file
diff --git a/src/lib_utils/ppx_let_generalized/expander/dune b/src/lib_utils/ppx_let_generalized/expander/dune
index 2ced86cfa..3a9bb1bc8 100644
--- a/src/lib_utils/ppx_let_generalized/expander/dune
+++ b/src/lib_utils/ppx_let_generalized/expander/dune
@@ -1,2 +1,2 @@
-(library (name ppx_let_expander) (public_name ppx_let.expander)
- (libraries base ppxlib) (preprocess no_preprocessing))
\ No newline at end of file
+(library (name ppx_let_expander) (public_name tezos-utils.ppx_let_generalized.expander)
+ (libraries base ppxlib) (preprocess no_preprocessing))
diff --git a/src/lib_utils/ppx_let_generalized/ppx_let_generalized.opam b/src/lib_utils/ppx_let_generalized/ppx_let_generalized.opam
deleted file mode 100644
index 2de221630..000000000
--- a/src/lib_utils/ppx_let_generalized/ppx_let_generalized.opam
+++ /dev/null
@@ -1,21 +0,0 @@
-opam-version: "2.0"
-maintainer: "opensource@janestreet.com"
-authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
-homepage: "https://github.com/janestreet/ppx_let"
-bug-reports: "https://github.com/janestreet/ppx_let/issues"
-dev-repo: "git+https://github.com/janestreet/ppx_let.git"
-doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ppx_let/index.html"
-license: "MIT"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml" {>= "4.04.2" & < "4.08.0"}
-  "base"
-  "dune"   {build & >= "1.5.1"}
-  "ppxlib" {>= "0.5.0"}
-]
-synopsis: "Monadic let-bindings"
-description: "
-Part of the Jane Street's PPX rewriters collection.
-"
diff --git a/src/lib_utils/ppx_let_generalized/src/dune b/src/lib_utils/ppx_let_generalized/src/dune
index a770da275..ef1eab216 100644
--- a/src/lib_utils/ppx_let_generalized/src/dune
+++ b/src/lib_utils/ppx_let_generalized/src/dune
@@ -1,2 +1,2 @@
-(library (name ppx_let) (public_name ppx_let) (kind ppx_rewriter)
- (libraries ppxlib ppx_let_expander) (preprocess no_preprocessing))
\ No newline at end of file
+(library (name ppx_let) (public_name tezos-utils.ppx_let_generalized) (kind ppx_rewriter)
+ (libraries ppxlib ppx_let_expander) (preprocess no_preprocessing))
diff --git a/src/lib_utils/tezos-utils.opam b/src/lib_utils/tezos-utils.opam
index 4f9d810b4..82f9ec13a 100644
--- a/src/lib_utils/tezos-utils.opam
+++ b/src/lib_utils/tezos-utils.opam
@@ -40,6 +40,10 @@ depends: [
   "tezos-protocol-environment"
   "tezos-protocol-alpha"
   "michelson-parser"
+  # from ppx_let:
+  "ocaml" {>= "4.04.2" & < "4.08.0"}
+  "dune"   {build & >= "1.5.1"}
+  "ppxlib" {>= "0.5.0"}
 ]
 build: [
   ["dune" "build" "-p" name]
diff --git a/src/ligo/dune b/src/ligo/dune
index f356faee8..5a0a250a4 100644
--- a/src/ligo/dune
+++ b/src/ligo/dune
@@ -24,7 +24,7 @@
     run
   )
   (preprocess
-    (pps ppx_let)
+    (pps tezos-utils.ppx_let_generalized)
   )
 )
 
diff --git a/src/ligo/ligo.opam b/src/ligo/ligo.opam
index bf16e3e7f..10390c9a6 100644
--- a/src/ligo/ligo.opam
+++ b/src/ligo/ligo.opam
@@ -10,7 +10,7 @@ depends: [
   "ocamlfind" { build }
   "dune" { build & >= "1.0.1" }
   "menhir"
-  "ppx_let"
+  "ppx_let_generalized"
   "tezos-utils"
 ]
 build: [