From 7b45967164670b0d375d19cb90dfc9ab0813c4d7 Mon Sep 17 00:00:00 2001 From: Théo Zimmermann Date: Thu, 6 Sep 2018 11:10:07 +0200 Subject: Override Dune derivation to update it before nixpkgs. As suggested by Vincent. --- default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 0ed063a1f4..35da15eebd 100644 --- a/default.nix +++ b/default.nix @@ -38,6 +38,18 @@ with pkgs; with stdenv.lib; +let dune = + overrideDerivation jbuilder (o: { + name = "dune-1.1.1"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "dune"; + rev = "1.1.1"; + sha256 = "0v2pnxpmqsvrvidpwxvbsypzhqfdnjs5crjp9y61qi8nyj8d75zw"; + }; + }); +in + stdenv.mkDerivation rec { name = "coq"; @@ -45,7 +57,7 @@ stdenv.mkDerivation rec { buildInputs = [ hostname python2 time # coq-makefile timing tools - jbuilder + dune ] ++ (with ocamlPackages; [ ocaml findlib camlp5_strict num ]) ++ optional buildIde ocamlPackages.lablgtk -- cgit v1.2.3