From 7d3b46c53430afd3c85b827fe1814202de3399a6 Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Sat, 29 Feb 2020 17:09:50 +0100
Subject: Update the OCaml version in `default.nix` to 4.09.0

It is more convenient to use recent versions of OCaml while developing
(better backtraces, etc).
---
 default.nix     | 2 +-
 dev/nixpkgs.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index ae6a8d06e5..841bccb129 100644
--- a/default.nix
+++ b/default.nix
@@ -22,7 +22,7 @@
 # a symlink to where Coq was installed.
 
 { pkgs ? import ./dev/nixpkgs.nix {}
-, ocamlPackages ? pkgs.ocamlPackages
+, ocamlPackages ? pkgs.ocaml-ng.ocamlPackages_4_09
 , buildIde ? true
 , buildDoc ? true
 , doInstallCheck ? true
diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix
index 54baaee1fe..b8a696ef21 100644
--- a/dev/nixpkgs.nix
+++ b/dev/nixpkgs.nix
@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/8da81465c19fca393a3b17004c743e4d82a98e4f.tar.gz";
-  sha256 = "1f3s27nrssfk413pszjhbs70wpap43bbjx2pf4zq5x2c1kd72l6y";
+  url = "https://github.com/NixOS/nixpkgs/archive/34e41a91547e342f6fbc901929134b34000297eb.tar.gz";
+  sha256 = "0mlqxim36xg8aj4r35mpcgqg27wy1dbbim9l1cpjl24hcy96v48w";
 })
-- 
cgit v1.2.3


From 6ee44b62d0a858a2c298c9cdfefe29c583d51a00 Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Tue, 10 Mar 2020 08:56:05 +0100
Subject: Disable parallel build of Sphinx documentation

We are using some Sphinx extensions that are not safe w.r.t. parallel
reaading.
---
 Makefile.doc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.doc b/Makefile.doc
index 1249555cd7..5aa1ae9850 100644
--- a/Makefile.doc
+++ b/Makefile.doc
@@ -38,10 +38,11 @@ SPHINXENV:=COQBIN="$(CURDIR)/bin/" COQLIB="$(WIN_CURDIR)"
 else
 SPHINXENV:=COQBIN="$(CURDIR)/bin/" COQLIB="$(CURDIR)"
 endif
-SPHINXOPTS= -j4
 SPHINXWARNERROR ?= 1
 ifeq ($(SPHINXWARNERROR),1)
-SPHINXOPTS += -W
+SPHINXOPTS= -W
+else
+SPHINXOPTS=
 endif
 SPHINXBUILD= sphinx-build
 SPHINXBUILDDIR= doc/sphinx/_build
-- 
cgit v1.2.3