about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2018-03-05 13:06:36 -0800
committerJohn Wiegley <johnw@newartisans.com>2018-03-05 13:07:16 -0800
commitf5f71c08cdbf1f66b654a1321460b6a7d771c26a (patch)
treea3d275538f9d5c60edd13f34866d7f0a4c836b1a
parentddba7e3ae9a87dba207296a383bce60e4815e7d2 (diff)
downloadnixlib-f5f71c08cdbf1f66b654a1321460b6a7d771c26a.tar
nixlib-f5f71c08cdbf1f66b654a1321460b6a7d771c26a.tar.gz
nixlib-f5f71c08cdbf1f66b654a1321460b6a7d771c26a.tar.bz2
nixlib-f5f71c08cdbf1f66b654a1321460b6a7d771c26a.tar.lz
nixlib-f5f71c08cdbf1f66b654a1321460b6a7d771c26a.tar.xz
nixlib-f5f71c08cdbf1f66b654a1321460b6a7d771c26a.tar.zst
nixlib-f5f71c08cdbf1f66b654a1321460b6a7d771c26a.zip
coqPackages.fiat_HEAD: Update 2016-10-24 -> 2018-02-27
-rw-r--r--pkgs/development/coq-modules/fiat/HEAD.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
index b970747c7726..bc5c0fdd6bb7 100644
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -1,22 +1,23 @@
-{stdenv, fetchgit, coq, python27}:
+{stdenv, fetchgit, coq, ocamlPackages, python27}:
 
 stdenv.mkDerivation rec {
 
   name = "coq-fiat-${coq.coq-version}-unstable-${version}";
-  version = "2016-10-24";
+  version = "2018-02-27";
 
   src = fetchgit {
     url = "https://github.com/mit-plv/fiat.git";
-    rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
-    sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
+    rev = "253fc133397f73d6daed0b9518ca7ab5507a1cb0";
+    sha256 = "0b5z7nz0cr1s7vy04s996dj0pd7ljqx6g5a8syh4hy2z87ijkjzd";
   };
 
-  buildInputs = [ coq.ocaml coq.camlp5 python27 ];
+  buildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp5_transitional
+                  ocamlPackages.findlib python27 ];
   propagatedBuildInputs = [ coq ];
 
   doCheck = false;
 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
   buildPhase = "make -j$NIX_BUILD_CORES";
 
   installPhase = ''
@@ -33,6 +34,6 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: v == "8.5";
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
   };
 }