colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

why3: 0.86.2 -> 0.86.3

Browse Source 
And merge with ocamlPackages.why3
(the OCaml library would not work correctly if packaged separately).
This commit is contained in:
Vincent Laporte 2016-03-04 07:29:28 +01:00
parent b219052bf1
commit 014a30da93
3 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/science/logic/why3/default.nix
View File

@ -2,15 +2,20 @@
stdenv.mkDerivation rec {
name = "why3-${version}";
version = "0.86.2";
version = "0.86.3";
src = fetchurl {
url = https://gforge.inria.fr/frs/download.php/file/35214/why3-0.86.2.tar.gz;
sha256 = "08sa7dmp6yp29xn0m6h98nic4q47vb4ahvaid5drwh522pvwvg10";
url = https://gforge.inria.fr/frs/download.php/file/35537/why3-0.86.3.tar.gz;
sha256 = "0sph6i4ga9450bk60wpm5cq3psw3g8xprnac7yjfq64iqz1dyz03";
};
buildInputs = with ocamlPackages;
[ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith menhir ];
buildInputs = (with ocamlPackages; [
ocaml findlib lablgtk ocamlgraph zarith menhir ]) ++
stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocaml ) [
coq coq.camlp5
];
installTargets = [ "install" "install-lib" ];
meta = with stdenv.lib; {
description = "A platform for deductive program verification";

21
pkgs/development/ocaml-modules/why3/default.nix
View File

@ -1,21 +0,0 @@
{ stdenv, ocaml, findlib, zarith, menhir, why3 }:
let ocaml-version = stdenv.lib.getVersion ocaml; in
assert stdenv.lib.versionAtLeast ocaml-version "4.01";
stdenv.mkDerivation {
name = "ocaml-${why3.name}";
inherit (why3) src;
buildInputs = [ ocaml findlib zarith menhir ];
installTargets = "install-lib";
meta = {
inherit (why3.meta) license homepage;
platforms = ocaml.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ vbgl ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -5042,10 +5042,6 @@ let
vg = callPackage ../development/ocaml-modules/vg { };
why3 = callPackage ../development/ocaml-modules/why3 {
why3 = pkgs.why3;
};
x509 = callPackage ../development/ocaml-modules/x509 { };
xmlm = callPackage ../development/ocaml-modules/xmlm { };