diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-03-04 07:29:28 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-03-04 09:29:10 +0100 |
| commit | 014a30da93e370b785e4283630a43c3d12e48ee5 (patch) | |
| tree | 2fec3cd7f7e317edff5db82071f31e47e14a03be /pkgs | |
| parent | b219052bf1e8c78b449f7ec0edc0303f55708293 (diff) | |
| download | nixpkgs-014a30da93e370b785e4283630a43c3d12e48ee5.tar nixpkgs-014a30da93e370b785e4283630a43c3d12e48ee5.tar.gz nixpkgs-014a30da93e370b785e4283630a43c3d12e48ee5.tar.bz2 nixpkgs-014a30da93e370b785e4283630a43c3d12e48ee5.tar.lz nixpkgs-014a30da93e370b785e4283630a43c3d12e48ee5.tar.xz nixpkgs-014a30da93e370b785e4283630a43c3d12e48ee5.tar.zst nixpkgs-014a30da93e370b785e4283630a43c3d12e48ee5.zip | |
why3: 0.86.2 -> 0.86.3
And merge with ocamlPackages.why3 (the OCaml library would not work correctly if packaged separately).
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/logic/why3/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/why3/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 10 insertions, 30 deletions
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 0313467ed78..0eb51ff1620 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/why3/default.nix b/pkgs/development/ocaml-modules/why3/default.nix deleted file mode 100644 index 3ce0f8bdfac..00000000000 --- a/pkgs/development/ocaml-modules/why3/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e45a7466aaf..4aaaaf2ae1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |