diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2021-06-25 08:53:41 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-06-27 09:03:12 +0200 |
| commit | 773bdf699871fdc590c0ff94b464f19149264f79 (patch) | |
| tree | 6f8c3f12296c2cc6a3ace922093c26d450a2ce35 | |
| parent | f5b9a25cdd21b4e45ab5f11c27b95dfe17384274 (diff) | |
| download | nixpkgs-773bdf699871fdc590c0ff94b464f19149264f79.tar nixpkgs-773bdf699871fdc590c0ff94b464f19149264f79.tar.gz nixpkgs-773bdf699871fdc590c0ff94b464f19149264f79.tar.bz2 nixpkgs-773bdf699871fdc590c0ff94b464f19149264f79.tar.lz nixpkgs-773bdf699871fdc590c0ff94b464f19149264f79.tar.xz nixpkgs-773bdf699871fdc590c0ff94b464f19149264f79.tar.zst nixpkgs-773bdf699871fdc590c0ff94b464f19149264f79.zip | |
why3: 1.3.3 → 1.4.0
framac: 22.0 → 23.0-rc1
| -rw-r--r-- | pkgs/applications/science/logic/why3/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/frama-c/default.nix | 12 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index c56e5445f0b..f46838c3b07 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,16 +3,15 @@ stdenv.mkDerivation { pname = "why3"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38367/why3-1.3.3.tar.gz"; - sha256 = "1n0a2nn1gnk0zg339lh698g4wpk7m8m1vyi2yvifd5adqvk4milw"; + url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-1.4.0.tar.gz"; + sha256 = "0lw0cpx347zz9vvwqibmbxgs80fsd16scgk3isscvwxnajpc3rv8"; }; buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph zarith menhir menhirLib - # Compressed Sessions # Emacs compilation of why3.el emacs # Documentation @@ -21,18 +20,16 @@ stdenv.mkDerivation { lablgtk # WebIDE js_of_ocaml js_of_ocaml-ppx + # S-expression output for why3pp + ppx_deriving ppx_sexp_conv # Coq Support coqPackages.coq coqPackages.flocq ocamlPackages.camlp5 ]; - propagatedBuildInputs = with ocamlPackages; [ camlzip num ]; + propagatedBuildInputs = with ocamlPackages; [ camlzip num re sexplib ]; enableParallelBuilding = true; - postPatch = '' - substituteInPlace Makefile.in --replace js_of_ocaml.ppx js_of_ocaml-ppx - ''; - configureFlags = [ "--enable-verbose-make" ]; installTargets = [ "install" "install-lib" ]; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 1079974ae62..ab82aed8e5e 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -17,6 +17,12 @@ let ocamlgraph stdlib-shims why3 + re + seq + sexplib + sexplib0 + parsexp + base yojson zarith ]; @@ -25,12 +31,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "22.0"; - slang = "Titanium"; + version = "23.0-rc1"; + slang = "Vanadium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "1mq1fijka95ydrla486yr4w6wdl9l7vmp512s1q00b0p6lmfwmkh"; + sha256 = "1z9f9a217bav3vfc99kq57d5rza6j7hr91ndviwkgcaib6wc5hcv"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; |