b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #140497 from pnmadelaine/update-fstar

Browse source
This commit is contained in:
Sandro 2021-10-05 17:14:08 +02:00 committed by GitHub
parent c130b07988 f048b1401f
commit d86e170612
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -8920,6 +8920,12 @@
githubId = 11365056;
name = "Kevin Liu";
};
pnmadelaine = {
name = "Paul-Nicolas Madelaine";
email = "pnm@pnm.tf";
github = "pnmadelaine";
githubId = 21977014;
};
pnotequalnp = {
email = "kevin@pnotequalnp.com";
github = "pnotequalnp";

10
pkgs/development/compilers/fstar/default.nix
View file

@ -17,19 +17,20 @@ in
stdenv.mkDerivation rec {
pname = "fstar";
version = "2021.09.11";
version = "2021.09.30";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "FStar";
rev = "v${version}";
sha256 = "1aqk6fx77zcb7mcm78dk4l4zzd323qiv7yc7hvc38494yf6gk8a0";
sha256 = "gqy9iaLZlTyv9ufHrUG87ta2xyc1OaZ/KRGhAzB+wsQ=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
buildInputs = [
z3
sedlex-2_3
] ++ (with ocamlPackages; [
ocaml
findlib
@ -42,7 +43,6 @@ stdenv.mkDerivation rec {
menhir
menhirLib
pprint
sedlex-2_3
ppxlib
ppx_deriving
ppx_deriving_yojson
@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
buildFlags = [ "libs" ];
enableParallelBuilding = true;
postPatch = ''
patchShebangs ulib/gen_mllib.sh
substituteInPlace src/ocaml-output/Makefile --replace '$(COMMIT)' 'v${version}'
@ -74,6 +76,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md";
platforms = with platforms; darwin ++ linux;
maintainers = with maintainers; [ gebner ];
maintainers = with maintainers; [ gebner pnmadelaine ];
};
}