From 1c3434cc16f1ff25a6c1dc11c38ffc4af39ec466 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 9 Dec 2012 00:36:38 +0400
Subject: Update E prover

---
 .../applications/science/logic/eProver/default.nix | 34 -----------------
 .../applications/science/logic/eprover/default.nix | 44 ++++++++++++++++++++++
 .../science/logic/eprover/default.upstream         |  3 ++
 3 files changed, 47 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/eProver/default.nix
 create mode 100644 pkgs/applications/science/logic/eprover/default.nix
 create mode 100644 pkgs/applications/science/logic/eprover/default.upstream

(limited to 'pkgs/applications/science')

diff --git a/pkgs/applications/science/logic/eProver/default.nix b/pkgs/applications/science/logic/eProver/default.nix
deleted file mode 100644
index 327a5d3a6237..000000000000
--- a/pkgs/applications/science/logic/eProver/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, which, texLive }:
-
-stdenv.mkDerivation {
-  name = "EProver-1.4";
-
-  src = fetchurl {
-    name = "E-1.4.tar.gz";
-    url = "http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_1.4/E.tgz";
-    sha256 = "1hxkr21xqkkh4bzqip6qf70w9xvvb8p20zzkvyin631ffgvyvr93";
-  };
-
-  buildInputs = [which texLive];
-
-  preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars";
-
-  buildPhase = "make install";
-
-  # HOME=. allows to build missing TeX formats
-  installPhase = ''
-    mkdir -p $out/bin
-    make install
-    HOME=. make documentation
-    mkdir -p $out/share/doc
-    cp -r DOC $out/share/doc/EProver
-    echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp
-    chmod a+x $out/bin/eproof-tptp
-  '';
-
-  meta = {
-    description = "E automated theorem prover";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
new file mode 100644
index 000000000000..8cc1de6e8dad
--- /dev/null
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, which, texLive }:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="eprover";
+    version="1.6";
+    name="${baseName}-${version}";
+    hash="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi";
+    url="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.6/E.tgz";
+    sha256="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi";
+  };
+in
+stdenv.mkDerivation {
+  inherit (s) name;
+
+  src = fetchurl {
+    name = "E-${s.version}.tar.gz";
+    inherit (s) url sha256;
+  };
+
+  buildInputs = [which texLive];
+
+  preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars";
+
+  buildPhase = "make install";
+
+  # HOME=. allows to build missing TeX formats
+  installPhase = ''
+    mkdir -p $out/bin
+    make install
+    HOME=. make documentation
+    mkdir -p $out/share/doc
+    cp -r DOC $out/share/doc/EProver
+    echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp
+    chmod a+x $out/bin/eproof-tptp
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = "E automated theorem prover";
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/science/logic/eprover/default.upstream b/pkgs/applications/science/logic/eprover/default.upstream
new file mode 100644
index 000000000000..fb2d80fafae8
--- /dev/null
+++ b/pkgs/applications/science/logic/eprover/default.upstream
@@ -0,0 +1,3 @@
+url http://www4.informatik.tu-muenchen.de/~schulz/E/Download.html
+version_link '[.]tgz$'
+version '.*[/]V_([0-9.]+)[/].*' '\1'
-- 
cgit 1.4.1