Skip to content

Commit

Permalink
coqPackages.fiat_HEAD: Update 2016-10-24 -> 2018-02-27
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwiegley
jwiegley committed Mar 5, 2018
1 parent ddba7e3 commit f5f71c0
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions pkgs/development/coq-modules/fiat/HEAD.nix
View file
@@ -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 = ''
Expand All @@ -33,6 +34,6 @@ stdenv.mkDerivation rec {
};

passthru = {
compatibleCoqVersions = v: v == "8.5";
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
}

5 comments on commit f5f71c0

@Zimmi48
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jwiegley Was this actually tested? It seems that in the current state, this fails because it doesn't fetch submodules. With deepClone = true and sha256 = "04zpazhznnykwgrx1r7rz3cxbpv2nd4l9gfcwhxg9xc7fc18qg0q" (with the submodules it is indeed a different hash) it seems like the Makefile fails because it contains a call to git submodule (and git is not available) which somehow ends up installing .v files instead of .vo.

BTW @JasonGross: that's the second time that I'm bothered by the fact that the fiat Makefile contains a call to git. That's really bad practice IMO.

@jwiegley
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Zimmi48 Not tested well enough. I'll roll it back.

@JasonGross
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's the second time that I'm bothered by the fact that the fiat Makefile contains a call to git. That's really bad practice IMO.

Indeed. However, I'm not actively developing fiat (and don't have plans to in the near future), so I'm disinclined to go mucking around with the build system. (I'm also bottlenecked on time, right now.) What's the reason you're packaging fiat?

@Zimmi48
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not. I only stumbled upon this commit. As for @jwiegley, I suppose he uses it 😃

@jwiegley
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a new version of fiat, btw, called fiat-core, which contains only the core elements. This version is not publicly released yet, and I think it still relies on Git, so it's worth fixing that in the Nix build when that happens. Stay tuned.

Please sign in to comment.