From e7b02042c74e84bd57b806a43a26e87ba505de09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franc=CC=A7ois=20Pottier?= <francois.pottier@inria.fr>
Date: Fri, 1 Jan 2021 14:17:55 +0100
Subject: [PATCH] Rename feat to vendored_feat and let it depend on
 vendored_fix.

---
 src/Fix.ml                      | 9 +++++++++
 src/dune                        | 6 +++---
 feat.opam => vendored_feat.opam | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 src/Fix.ml
 rename feat.opam => vendored_feat.opam (95%)

diff --git a/src/Fix.ml b/src/Fix.ml
new file mode 100644
index 0000000..3c13be6
--- /dev/null
+++ b/src/Fix.ml
@@ -0,0 +1,9 @@
+(* The library fix has been renamed vendored_fix so as to prevent Dune
+   from complaining about a conflict with a copy of fix that might be
+   installed on the user's system. *)
+
+(* As a result, the library is now accessible under the name Vendored_fix.
+   Because we do not want to pollute our sources with this name, we define the
+   module Fix as an alias for Vendored_fix. *)
+
+include Vendored_fix
diff --git a/src/dune b/src/dune
index 90a5a6c..ec8d77d 100644
--- a/src/dune
+++ b/src/dune
@@ -1,7 +1,7 @@
 (library
-  (name feat)
-  (public_name feat)
+  (name vendored_feat)
+  (public_name vendored_feat)
   (synopsis "Facilities for enumerating and sampling algebraic data types")
   (flags "-w" "A-44")
-  (libraries seq zarith fix)
+  (libraries seq zarith vendored_fix)
 )
diff --git a/feat.opam b/vendored_feat.opam
similarity index 95%
rename from feat.opam
rename to vendored_feat.opam
index dbec49e..dacf828 100644
--- a/feat.opam
+++ b/vendored_feat.opam
@@ -1,4 +1,4 @@
-name: "feat"
+name: "vendored_feat"
 opam-version: "2.0"
 maintainer: "francois.pottier@inria.fr"
 authors: [
-- 
GitLab