From 7ac0a231949f23a716e379dfab5aed4d179acc4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 10 Oct 2018 16:24:24 +0200 Subject: [PATCH] prooftree: 0.12 -> 0.13 --- pkgs/applications/science/logic/prooftree/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 2d5fcfd2d261..a88a84e3b0d1 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { name = "prooftree-${version}"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; - sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; + sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3e54fa8d76d..7596a49bae29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21277,10 +21277,9 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = (with ocaml-ng.ocamlPackages_4_01_0; - callPackage ../applications/science/logic/prooftree { - camlp5 = camlp5_transitional; - }); + prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { + camlp5 = ocamlPackages.camlp5_strict; + }; prover9 = callPackage ../applications/science/logic/prover9 { };