From 92ea6137a2fc2a70b5e26cfb154d0372974f93b2 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Fri, 4 Dec 2020 17:20:28 +0100
Subject: [dune] [opam] Disable dune subst in opam files until the upstream fix
 is propagated

`dune subst` is broken on unicode files, see
https://github.com/ocaml/dune/pull/3879 and
https://github.com/ocaml/dune/pull/3879

This is a frequent problem, introduced by
https://github.com/coq/coq/pull/13374 , so disabling pending on dune
2.8 being released.
---
 coq-doc.opam       | 3 ++-
 coq.opam           | 3 ++-
 coqide-server.opam | 3 ++-
 coqide.opam        | 3 ++-
 dune-project       | 5 ++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/coq-doc.opam b/coq-doc.opam
index 67cdbd8bf0..3a872db33d 100644
--- a/coq-doc.opam
+++ b/coq-doc.opam
@@ -20,7 +20,8 @@ depends: [
   "coq" {build & = version}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+# Disabled until Dune 2.8 is available
+# ["dune" "subst"] {pinned}
   [
     "dune"
     "build"
diff --git a/coq.opam b/coq.opam
index 2f14b00238..f868d511af 100644
--- a/coq.opam
+++ b/coq.opam
@@ -26,7 +26,8 @@ depends: [
   "zarith" {>= "1.10"}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+# Disabled until Dune 2.8 is available
+# ["dune" "subst"] {pinned}
   [
     "dune"
     "build"
diff --git a/coqide-server.opam b/coqide-server.opam
index 101cd4ad78..cbb0db2893 100644
--- a/coqide-server.opam
+++ b/coqide-server.opam
@@ -23,7 +23,8 @@ depends: [
   "coq" {= version}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+# Disabled until Dune 2.8 is available
+# ["dune" "subst"] {pinned}
   [
     "dune"
     "build"
diff --git a/coqide.opam b/coqide.opam
index 3007200fe5..9e4fb05701 100644
--- a/coqide.opam
+++ b/coqide.opam
@@ -21,7 +21,8 @@ depends: [
   "coqide-server" {= version}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+# Disabled until Dune 2.8 is available
+# ["dune" "subst"] {pinned}
   [
     "dune"
     "build"
diff --git a/dune-project b/dune-project
index 1265c993b7..1187c58449 100644
--- a/dune-project
+++ b/dune-project
@@ -5,7 +5,10 @@
 (formatting
  (enabled_for ocaml))
 
-(generate_opam_files true)
+; Pending on dune 2.8 as to avoid bug with dune subst
+; see https://github.com/ocaml/dune/pull/3879 and
+; https://github.com/ocaml/dune/pull/3879
+; (generate_opam_files true)
 
 (license LGPL-2.1-only)
 (maintainers "The Coq development team <coqdev@inria.fr>")
-- 
cgit v1.2.3