From a89ea61714feb69a62f021a69ed7fdca2e2ff6f5 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Tue, 19 May 2020 18:46:17 +0200
Subject: [ci] [docker] Bump ocamlformat and dune

cc: #12350
---
 .gitlab-ci.yml                      | 2 +-
 .ocamlformat                        | 4 ++--
 dev/ci/docker/bionic_coq/Dockerfile | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc0cdebcf0..fae2c64484 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ stages:
 variables:
   # Format: $IMAGE-V$DATE [Cache is not used as of today but kept here
   # for reference]
-  CACHEKEY: "bionic_coq-V2020-05-18-V3"
+  CACHEKEY: "bionic_coq-V2020-05-19-V33"
   IMAGE: "$CI_REGISTRY_IMAGE:$CACHEKEY"
   # By default, jobs run in the base switch; override to select another switch
   OPAM_SWITCH: "base"
diff --git a/.ocamlformat b/.ocamlformat
index 62e609fb55..a0d4ef6bbb 100644
--- a/.ocamlformat
+++ b/.ocamlformat
@@ -1,4 +1,4 @@
-version=0.14.0
+version=0.14.2
 profile=ocamlformat
 
 # to enable a whole directory, put "disable=false" in dir/.ocamlformat
@@ -11,4 +11,4 @@ cases-exp-indent=2
 field-space=loose
 exp-grouping=preserve
 break-cases=fit
-doc-comments-val=before
+doc-comments=before
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index 51a602303a..0d2f1dfbc7 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -1,4 +1,4 @@
-# CACHEKEY: "bionic_coq-V2020-05-18-V3"
+# CACHEKEY: "bionic_coq-V2020-05-19-V33"
 # ^^ Update when modifying this file.
 
 FROM ubuntu:bionic
@@ -58,7 +58,7 @@ RUN opam switch create "${COMPILER}+32bit" && eval $(opam env) && \
 
 # EDGE switch
 ENV COMPILER_EDGE="4.10.0" \
-    BASE_OPAM_EDGE="dune.2.5.0 dune-release.1.3.3 ocamlformat.0.14.0"
+    BASE_OPAM_EDGE="dune.2.5.1 dune-release.1.3.3 ocamlformat.0.14.2"
 
 # EDGE+flambda switch, we install CI_OPAM as to be able to use
 # `ci-template-flambda` with everything.
-- 
cgit v1.2.3


From 7e8897ae8f47d114451a4edf3246e2223a797bff Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Wed, 20 May 2020 12:37:49 +0200
Subject: Bump nixpkgs to get ocamlformat 0.14.2.

---
 dev/nixpkgs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix
index fb84155392..bfb25e72dd 100644
--- a/dev/nixpkgs.nix
+++ b/dev/nixpkgs.nix
@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/807ca93fadd5197c2260490de0c76e500562dc05.tar.gz";
-  sha256 = "10yq8bnls77fh3pk5chkkb1sv5lbdgyk1rr2v9xn71rr1k2x563p";
+  url = "https://github.com/NixOS/nixpkgs/archive/17812e653d89c46d68b7b10e290b1c16758f4e47.tar.gz";
+  sha256 = "1zcb70dyfqc8l2ywpbvxmpfshapdi0g365m3rhmwpagqg47pnyxs";
 })
-- 
cgit v1.2.3