about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-08-27 11:52:54 +0200
committerGitHub <noreply@github.com>2019-08-27 11:52:54 +0200
commit5026c1ef698936f5f95053e8a034c32ef0c44ff6 (patch)
tree577e4fdbedf537f13fde8fc27281d12bbee50ab6 /pkgs/applications
parent9a02d9c75e94aa63983a085df774ea9b7a728b29 (diff)
parent6f279584fde080646f689c653c571fb8a8919d3b (diff)
downloadnixlib-5026c1ef698936f5f95053e8a034c32ef0c44ff6.tar
nixlib-5026c1ef698936f5f95053e8a034c32ef0c44ff6.tar.gz
nixlib-5026c1ef698936f5f95053e8a034c32ef0c44ff6.tar.bz2
nixlib-5026c1ef698936f5f95053e8a034c32ef0c44ff6.tar.lz
nixlib-5026c1ef698936f5f95053e8a034c32ef0c44ff6.tar.xz
nixlib-5026c1ef698936f5f95053e8a034c32ef0c44ff6.tar.zst
nixlib-5026c1ef698936f5f95053e8a034c32ef0c44ff6.zip
Merge pull request #67535 from jonringer/bump-stp
stp: 2.2.0 -> 2.3.3
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/science/logic/stp/default.nix13
1 files 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";