From dd4a015aa8e6cc836828a2f8a9dd419aca5076b9 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 20 Sep 2016 11:56:41 -0400
Subject: [PATCH] eprover: 1.9 -> 1.9.1

---
 .../science/logic/eprover/default.nix         | 47 ++++++-------------
 .../science/logic/eprover/default.upstream    |  3 --
 2 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/eprover/default.upstream

diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 1f36858ae320..92b5b49cec7c 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,46 +1,29 @@
 { stdenv, fetchurl, which }:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="eprover";
-    version="1.9";
-    name="${baseName}-${version}";
-    hash="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4";
-    url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.9/E.tgz";
-    sha256="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4";
-  };
-in
-stdenv.mkDerivation {
-  inherit (s) name;
+stdenv.mkDerivation rec {
+  name = "eprover-${version}";
+  version = "1.9.1";
 
   src = fetchurl {
-    name = "E-${s.version}.tar.gz";
-    inherit (s) url sha256;
+    url = "http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz";
+    sha256 = "1vi977mdfqnj04m590aw4896nqzlc4c5rqadjzk86z1zvj7mqnqw";
   };
 
   buildInputs = [ which ];
 
   preConfigure = ''
-    sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' \
-    -e 's/^CC *= gcc$//' \
-    -i Makefile.vars
+    sed -e 's/ *CC *= gcc$//' -i Makefile.vars
+  '';
+  configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man";
+
+  postInstall = ''
+    sed -e s,EXECPATH=.\*,EXECPATH=$out/bin, -i $out/bin/eproof{,_ram}
   '';
 
-  buildPhase = "make install";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    make install
-    echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp
-    chmod a+x $out/bin/eproof-tptp
-  '';
-
-  meta = {
-    inherit (s) version;
+  meta = with stdenv.lib; {
     description = "Automated theorem prover for full first-order logic with equality";
     homepage = http://www.eprover.org/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ raskin gebner ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/science/logic/eprover/default.upstream b/pkgs/applications/science/logic/eprover/default.upstream
deleted file mode 100644
index f871d4985bbd..000000000000
--- a/pkgs/applications/science/logic/eprover/default.upstream
+++ /dev/null
@@ -1,3 +0,0 @@
-url http://wwwlehre.dhbw-stuttgart.de/~sschulz/E/Download.html
-version_link '[.]tgz$'
-version '.*[/]V_([0-9.]+)[/].*' '\1'