fstar: 0.9.5.0 -> 0.9.6.0

This commit is contained in:
Gabriel Ebner 2018-05-25 10:27:02 +02:00
parent 917099b528
commit 8033f52a12
2 changed files with 7 additions and 4 deletions

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fstar-${version}"; name = "fstar-${version}";
version = "0.9.5.0"; version = "0.9.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FStarLang"; owner = "FStarLang";
repo = "FStar"; repo = "FStar";
rev = "v${version}"; rev = "v${version}";
sha256 = "1pi2ny3kpmvm85x8w98anhjf0hp0wccc51m7v697qypn5cl4ydqk"; sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [
z3 ocaml findlib batteries menhir stdint z3 ocaml findlib batteries menhir stdint
zarith camlp4 yojson pprint zarith camlp4 yojson pprint
ulex ocaml-migrate-parsetree process ppx_deriving ppx_deriving_yojson ocamlbuild
]; ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
@ -26,8 +27,10 @@ stdenv.mkDerivation rec {
''; '';
buildFlags = "-C src/ocaml-output"; buildFlags = "-C src/ocaml-output";
preInstall = ''
mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib
'';
installFlags = "-C src/ocaml-output"; installFlags = "-C src/ocaml-output";
postInstall = '' postInstall = ''
wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin"
''; '';

View File

@ -6469,7 +6469,7 @@ with pkgs;
}; };
fstar = callPackage ../development/compilers/fstar { fstar = callPackage ../development/compilers/fstar {
ocamlPackages = ocaml-ng.ocamlPackages_4_02; ocamlPackages = ocaml-ng.ocamlPackages_4_06;
}; };
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});