diff options
| author | Théo Zimmermann | 2020-03-10 15:21:29 +0100 |
|---|---|---|
| committer | Théo Zimmermann | 2020-03-10 15:21:29 +0100 |
| commit | 3a5469b2097c55ecf952ead470caf03b6112cd9e (patch) | |
| tree | 7f0833b0f2beb4a44b5ca54d47e495debecc104e | |
| parent | cffb0ed6f58188b8ea01d54a5349d28313b86dc1 (diff) | |
| parent | 6ee44b62d0a858a2c298c9cdfefe29c583d51a00 (diff) | |
Merge PR #11732: Update the OCaml version in `default.nix` to 4.09.0
Reviewed-by: Zimmi48
| -rw-r--r-- | Makefile.doc | 5 | ||||
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | dev/nixpkgs.nix | 4 |
3 files changed, 6 insertions, 5 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 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"; }) |