diff options
Diffstat (limited to 'pkgs/applications/science/logic')
-rw-r--r-- | pkgs/applications/science/logic/stp/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/science/logic/symbiyosys/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/logic/vampire/default.nix | 9 |
3 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 5e186a395fc5..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"; 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"; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 064ad204aff8..58674a4cacf2 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Tooling for Yosys-based verification flows"; homepage = https://symbiyosys.readthedocs.io/; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice emily ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 35be32f458c4..42963fe5f9c6 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }: +{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib }: stdenv.mkDerivation rec { - version = "4.2.2"; pname = "vampire"; + version = "4.4"; src = fetchFromGitHub { owner = "vprover"; repo = "vampire"; rev = version; - sha256 = "03dqjxr3cwz4h6sn9074kc6b6wjz12kpsvsi0mq2w0j5l9f8d80y"; - #fetchSubmodules = true; - #leaveDotGit = true; + sha256 = "0v2fdfnk7l5xr5c4y54r25g1nbp4vi85zv29nbklh3r7aws3w9q1"; }; - nativeBuildInputs = [ git ]; buildInputs = [ z3 zlib ]; makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ]; |