aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Laporte2018-10-26 10:10:27 +0000
committerVincent Laporte2018-10-26 10:10:27 +0000
commita5854e84d083a6caf045d424ec34d47a9ffebcc4 (patch)
tree1d6158823f0dd1889c41c0cd1cb133a117b97034
parentc1e3086bb7373d40819b6334ebeefba6ea53c8fc (diff)
parentebf38e474ad96e430f0cbeef533e2faab5748eeb (diff)
Merge PR #8821: [default.nix] Update to dune 1.4.
-rw-r--r--default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/default.nix b/default.nix
index 61f434efe6..9a7afbe89e 100644
--- a/default.nix
+++ b/default.nix
@@ -23,8 +23,8 @@
{ pkgs ?
(import (fetchTarball {
- url = "https://github.com/NixOS/nixpkgs/archive/4c95508641fe780efe41885366e03339b95d04fb.tar.gz";
- sha256 = "1wjspwhzdb6d1kz4khd9l0fivxdk2nq3qvj93pql235sb7909ygx";
+ url = "https://github.com/NixOS/nixpkgs/archive/06613c189eebf4d6167d2d010a59cf38b43b6ff4.tar.gz";
+ sha256 = "13grhy3cvdwr7wql1rm5d7zsfpvp44cyjhiain4zs70r90q3swdg";
}) {})
, ocamlPackages ? pkgs.ocaml-ng.ocamlPackages_4_06
, buildIde ? true
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
python2 time # coq-makefile timing tools
dune
]
- ++ (with ocamlPackages; [ ocaml findlib camlp5_strict num ])
+ ++ (with ocamlPackages; [ ocaml findlib camlp5 num ])
++ optional buildIde ocamlPackages.lablgtk
++ optionals buildDoc [
# Sphinx doc dependencies