diff options
| author | Théo Zimmermann | 2018-05-29 15:05:11 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2018-05-29 15:05:11 +0200 |
| commit | ec598cca8ba337534ef58fd9bf62328bea62cb17 (patch) | |
| tree | 3dbe238dc2cbcc2173d33d1cd8e4288865a92155 | |
| parent | 0c70c555f74cab5015f0e51a7fe48613c13b83f7 (diff) | |
| parent | a860f0ed3a81715a73b2b7e7a06c64574dcd2582 (diff) | |
Merge PR #7628: [default.nix] Update dependency list
| -rw-r--r-- | default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/default.nix b/default.nix index b9b7ff32d2..91d9636041 100644 --- a/default.nix +++ b/default.nix @@ -22,7 +22,7 @@ # a symlink to where Coq was installed. { pkgs ? (import <nixpkgs> {}) -, ocamlPackages ? pkgs.ocamlPackages +, ocamlPackages ? pkgs.ocaml-ng.ocamlPackages_4_06 , buildIde ? true , buildDoc ? true , doCheck ? true @@ -35,9 +35,11 @@ stdenv.mkDerivation rec { name = "coq"; - buildInputs = (with ocamlPackages; [ + buildInputs = [ # Coq dependencies + hostname + ] ++ (with ocamlPackages; [ ocaml findlib camlp5_strict @@ -65,11 +67,11 @@ stdenv.mkDerivation rec { python rsync which + ocamlPackages.ounit ] else []) ++ (if lib.inNixShell then [ ocamlPackages.merlin ocamlPackages.ocpIndent - ocamlPackages.ocp-index # Dependencies of the merging script jq |