diff options
| author | coqbot-app[bot] | 2020-12-08 14:16:48 +0000 |
|---|---|---|
| committer | GitHub | 2020-12-08 14:16:48 +0000 |
| commit | eed93daca185e08a042f26886e30a50b1d60bbac (patch) | |
| tree | 409478254f3d7df27254d0fec70f8ebf69c3a787 | |
| parent | c79e503a91be63a7799d6f82690d319ce7a24040 (diff) | |
| parent | 92ea6137a2fc2a70b5e26cfb154d0372974f93b2 (diff) | |
Merge PR #13572: [dune] [opam] Disable dune subst in opam files until the upstream fix is propagated
Reviewed-by: Zimmi48
| -rw-r--r-- | coq-doc.opam | 3 | ||||
| -rw-r--r-- | coq.opam | 3 | ||||
| -rw-r--r-- | coqide-server.opam | 3 | ||||
| -rw-r--r-- | coqide.opam | 3 | ||||
| -rw-r--r-- | 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" @@ -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>") |