yices: 2.5.3 -> 2.5.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>

1 files changed, 14 insertions, 12 deletions

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index aac72ba24f01..a607f1066395 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,38 +2,40 @@
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchurl {
     url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz";
     name = "${name}-src.tar.gz";
-    sha256 = "0a3zzbvmgyiljzqn6xmc037gismm779p696jywk09j2pqbvp52ac";
+    sha256 = "1k8wmlddi3zv5kgg6xbch3a0s0xqsmsfc7y6z8zrgcyhswl36h7p";
   };
 
-  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"
-                     "--enable-mcsat"
-                   ];
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ gmp-static gperf libpoly ];
+  buildInputs       = [ gmp-static gperf libpoly ];
+  configureFlags =
+    [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
+      "--with-static-gmp-include-dir=${gmp-static.dev}/include"
+      "--enable-mcsat"
+    ];
 
   enableParallelBuilding = true;
   doCheck = true;
 
+  # Usual shenanigans
+  patchPhase = ''patchShebangs tests/regress/check.sh'';
+
   # Includes a fix for the embedded soname being libyices.so.2.5, but
-  # only installing the libyices.so.2.5.1 file.
+  # only installing the libyices.so.2.5.x file.
   installPhase = ''
       make install LDCONFIG=true
-      (cd $out/lib && ln -s -f libyices.so.2.5.3 libyices.so.2.5)
+      (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5)
   '';
 
   meta = with stdenv.lib; {
     description = "A high-performance theorem prover and SMT solver";
     homepage    = "http://yices.csl.sri.com";
     license     = licenses.gpl3;
-    platforms   = platforms.linux ++ platforms.darwin;
+    platforms   = with platforms; linux ++ darwin;
     maintainers = [ maintainers.thoughtpolice ];
   };
 }