From 0372c8748170c74a5415e91db7ae9808e7cd654a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 8 Jul 2018 21:56:56 -0400
Subject: [PATCH] monosat: cbaf79cf -> 2deeadef

Upstream fixed a few things I needed to work around
---
 pkgs/applications/science/logic/monosat/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix
index b0de08e489ad..5e624a1853da 100644
--- a/pkgs/applications/science/logic/monosat/default.nix
+++ b/pkgs/applications/science/logic/monosat/default.nix
@@ -8,8 +8,8 @@ with stdenv.lib;
 let
   boolToCmake = x: if x then "ON" else "OFF";
 
-  rev    = "cbaf79cfd01cba97b46cae5a9d7b832771ff442c";
-  sha256 = "1nx3wh34y53lrwgh94cskdrdyrj26jn3py7z2cn4bvacz0wzhi6n";
+  rev    = "2deeadeff214e975c9f7508bc8a24fa05a1a0c32";
+  sha256 = "09yhym2lxmn3xbhw5fcxawnmvms5jd9fw9m7x2wzil7yvy4vwdjn";
 
   pname   = "monosat";
   version = substring 0 7 sha256;
@@ -27,12 +27,6 @@ let
 
     cmakeFlags = [ "-DJAVA=${boolToCmake includeJava}" "-DGPL=${boolToCmake includeGplCode}" ];
 
-    # Minor logic bug: https://github.com/sambayless/monosat/issues/11#issuecomment-403297720
-    postPatch = ''
-      substituteInPlace CMakeLists.txt \
-        --replace '"&&" "true"' '"||" "true"'
-    '';
-
     postInstall = optionalString includeJava ''
       mkdir -p $out/share/java
       cp monosat.jar $out/share/java
@@ -65,9 +59,6 @@ let
         --replace '../../../../libmonosat.dylib' '${core}/lib/libmonosat.dylib' \
         --replace '../../../../libmonosat.so'  '${core}/lib/libmonosat.so' \
         --replace 'use_cython=False' 'use_cython=True'
-
-      # This seems to be forgotten and unused. See https://github.com/sambayless/monosat/issues/10
-      rm monosat/cnf.py
     '';
   };
 in core
\ No newline at end of file