1 files changed, 8 insertions, 9 deletions
diff --git a/default.nix b/default.nix
index 0b47942748..91d9636041 100644
--- a/default.nix
+++ b/default.nix
@@ -21,11 +21,8 @@
 # Once the build is finished, you will find, in the current directory,
 # a symlink to where Coq was installed.
 
-{ pkgs ?
-    (import (fetchTarball
-      "https://github.com/NixOS/nixpkgs/archive/4345a2cef228a91c1d6d4bf626a0f933eb8cc4f9.tar.gz")
-    {})
-, ocamlPackages ? pkgs.ocamlPackages
+{ pkgs ? (import <nixpkgs> {})
+, ocamlPackages ? pkgs.ocaml-ng.ocamlPackages_4_06
 , buildIde ? true
 , buildDoc ? true
 , doCheck ? true
@@ -38,9 +35,11 @@ stdenv.mkDerivation rec {
 
   name = "coq";
 
-  buildInputs = (with ocamlPackages; [
+  buildInputs = [
 
     # Coq dependencies
+    hostname
+  ] ++ (with ocamlPackages; [
     ocaml
     findlib
     camlp5_strict
@@ -68,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
@@ -90,9 +89,9 @@ stdenv.mkDerivation rec {
 
   prefixKey = "-prefix ";
 
-  buildFlags = optionals buildDoc [ "world" "sphinx" ];
+  buildFlags = [ "world" ] ++ optional buildDoc "doc-html";
 
-  installTargets = [ "install" ] ++ optional buildDoc "install-doc-sphinx";
+  installTargets = [ "install" ] ++ optional buildDoc "install-doc-html";
 
   inherit doCheck;