From 1531b831017d594002ed21a966b62081b5e003a6 Mon Sep 17 00:00:00 2001 From: Théo Zimmermann Date: Thu, 25 Oct 2018 23:36:11 +0200 Subject: [default.nix] Update to dune 1.4. --- default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 61f434efe6..9557d6da47 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 -- cgit v1.2.3 From ebf38e474ad96e430f0cbeef533e2faab5748eeb Mon Sep 17 00:00:00 2001 From: Théo Zimmermann Date: Fri, 26 Oct 2018 10:08:54 +0200 Subject: [default.nix] Clean-up: use camlp5 instead of synonymous camlp5_strict. --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 9557d6da47..9a7afbe89e 100644 --- a/default.nix +++ b/default.nix @@ -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 -- cgit v1.2.3