From 1f8912155127dd78713e7a2464fd8d0bd0ae82ef Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 26 Oct 2016 09:36:06 -0500
Subject: [PATCH 1/4] yices: 2.3.1 -> 2.5.1

---
 pkgs/applications/science/logic/yices/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index f495ee257ff..d892a9abb2e 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.3.1";
+  version = "2.5.1";
 
   src = fetchurl {
-    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree";
+    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-${version}-src.tar.gz&accept=I+Agree";
     name = "yices-${version}-src.tar.gz";
-    sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs";
+    sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c";
   };
 
   configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"

From 8584ec97edc281b69d82d86e030d3e669103f824 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 26 Oct 2016 09:47:50 -0500
Subject: [PATCH 2/4] yices: fix install target by using 'true' as ldconfig

---
 pkgs/applications/science/logic/yices/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index d892a9abb2e..a34b995ecea 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
                    ];
   buildInputs = [ gmp-static gperf autoreconfHook ];
 
+  installPhase = ''make install LDCONFIG=true'';
+
   meta = {
     description = "A high-performance theorem prover and SMT solver";
     homepage    = "http://yices.csl.sri.com";

From 3cf27a654adfe57a7e4c00f37b3f3b090d4b66e3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 26 Oct 2016 09:52:29 -0500
Subject: [PATCH 3/4] yices: Build in parallel, run tests, fix test shebang.

---
 pkgs/applications/science/logic/yices/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index a34b995ecea..7ad8080a9f8 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -10,11 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c";
   };
 
+  patchPhase = ''patchShebangs tests/regress/check.sh'';
+
   configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
                      "--with-static-gmp-include-dir=${gmp-static.dev}/include"
                    ];
   buildInputs = [ gmp-static gperf autoreconfHook ];
 
+  enableParallelBuilding = true;
+  doCheck = true;
+
   installPhase = ''make install LDCONFIG=true'';
 
   meta = {

From 0443affe1709d29e3ae3c7b3080df096f020018e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 30 Oct 2016 13:34:42 -0500
Subject: [PATCH 4/4] yices: Add darwin to meta.platforms

---
 pkgs/applications/science/logic/yices/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 7ad8080a9f8..cf5114b4a41 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
 
   installPhase = ''make install LDCONFIG=true'';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A high-performance theorem prover and SMT solver";
     homepage    = "http://yices.csl.sri.com";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.unfreeRedistributable;
+    platforms   = platforms.linux ++ platforms.darwin;
+    maintainers = [ maintainers.thoughtpolice ];
   };
 }