From 0a936017ee420ef4af82c9bf32c200ad7a7277bb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 May 2018 08:25:20 +0000 Subject: [default.nix] Drop dependency to ocp-index --- default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/default.nix b/default.nix index b9b7ff32d2..874ca7bb54 100644 --- a/default.nix +++ b/default.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { ] else []) ++ (if lib.inNixShell then [ ocamlPackages.merlin ocamlPackages.ocpIndent - ocamlPackages.ocp-index # Dependencies of the merging script jq -- cgit v1.2.3 From 4c01c6101edad8580061102be2b411835fa8b0e5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 May 2018 08:27:41 +0000 Subject: [default.nix] Use OCaml 4.06 --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 874ca7bb54..c80ae15977 100644 --- a/default.nix +++ b/default.nix @@ -22,7 +22,7 @@ # a symlink to where Coq was installed. { pkgs ? (import {}) -, ocamlPackages ? pkgs.ocamlPackages +, ocamlPackages ? pkgs.ocaml-ng.ocamlPackages_4_06 , buildIde ? true , buildDoc ? true , doCheck ? true -- cgit v1.2.3 From 8ae1a93bd3cd33caf0942d39a09c10ed1ba94087 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 May 2018 09:06:16 +0000 Subject: [default.nix] List “hostname” as a dependency --- default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index c80ae15977..bb9f220f48 100644 --- a/default.nix +++ b/default.nix @@ -35,9 +35,11 @@ stdenv.mkDerivation rec { name = "coq"; - buildInputs = (with ocamlPackages; [ + buildInputs = [ # Coq dependencies + hostname + ] ++ (with ocamlPackages; [ ocaml findlib camlp5_strict -- cgit v1.2.3 From a860f0ed3a81715a73b2b7e7a06c64574dcd2582 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 May 2018 09:06:41 +0000 Subject: [default.nix] Adds “ounit” to check dependencies --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index bb9f220f48..91d9636041 100644 --- a/default.nix +++ b/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { python rsync which + ocamlPackages.ounit ] else []) ++ (if lib.inNixShell then [ ocamlPackages.merlin -- cgit v1.2.3