From 6f279584fde080646f689c653c571fb8a8919d3b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 26 Aug 2019 14:00:48 -0700 Subject: [PATCH] stp: 2.2.0 -> 2.3.3 --- pkgs/applications/science/logic/stp/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 081dc788163b..0ea659d1927f 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl, python3, python3Packages, zlib, minisatUnstable, cryptominisat }: stdenv.mkDerivation rec { - version = "2.2.0"; - name = "stp-${version}"; + pname = "stp"; + version = "2.3.3"; src = fetchFromGitHub { owner = "stp"; repo = "stp"; - rev = "stp-${version}"; - sha256 = "1jh23wjm62nnqfx447g2y53bbangq04hjrvqc35v9xxpcjgj3i49"; + rev = version; + sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87"; }; buildInputs = [ boost zlib minisatUnstable cryptominisat python3 ]; @@ -23,9 +23,8 @@ stdenv.mkDerivation rec { ) ''; - # `make -f lib/Interface/CMakeFiles/cppinterface.dir/build.make lib/Interface/CMakeFiles/cppinterface.dir/cpp_interface.cpp.o`: - # include/stp/AST/UsefulDefs.h:41:29: fatal error: stp/AST/ASTKind.h: No such file or directory - enableParallelBuilding = false; + # seems to build fine now, may revert if concurrency does become an issue + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Simple Theorem Prover";