From f4931dfaee8e7e47705ab85058403889069d2ad7 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 21 Dec 2021 12:44:01 +0100
Subject: [PATCH] ekrhyper: refactor

---
 .../science/logic/ekrhyper/default.nix        | 42 ++++++++-----------
 .../science/logic/ekrhyper/default.upstream   |  3 --
 2 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/ekrhyper/default.upstream

diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix
index 38cc0f06088d..d6d9bb11a9a0 100644
--- a/pkgs/applications/science/logic/ekrhyper/default.nix
+++ b/pkgs/applications/science/logic/ekrhyper/default.nix
@@ -1,32 +1,26 @@
-{lib, stdenv, fetchurl, ocaml, perl}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="ekrhyper";
-    version="1_4_21022014";
-    name="${baseName}-${version}";
-    hash="14xaaxyvfli1nd4vd9fp4j1s8k76z2bhazxzzc7br3q6hc6b8ivw";
-    url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_21022014.tar.gz";
-    sha256="14xaaxyvfli1nd4vd9fp4j1s8k76z2bhazxzzc7br3q6hc6b8ivw";
-  };
-  buildInputs = [
-    ocaml perl
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
+{ lib, stdenv, fetchurl, ocaml, perl }:
+
+stdenv.mkDerivation rec {
+  pname = "ekrhyper";
+  version = "1_4_21022014";
+
   src = fetchurl {
-    inherit (s) url sha256;
+    url = "http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_${version}.tar.gz";
+    sha256 = "sha256-fEe0DIMGj7wO+79/BZf45kykgyTXpbZJsyFSt31XqpM=";
   };
+
+  buildInputs = [
+    ocaml
+    perl
+  ];
   setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)";
   preInstall = "export INSTALLDIR=$out";
   postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done '';
-  meta = {
-    inherit (s) version;
+
+  meta = with lib; {
     description = "Automated first-order theorem prover";
-    license = lib.licenses.gpl2 ;
-    maintainers = [lib.maintainers.raskin];
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/logic/ekrhyper/default.upstream b/pkgs/applications/science/logic/ekrhyper/default.upstream
deleted file mode 100644
index 310e93ea53fd..000000000000
--- a/pkgs/applications/science/logic/ekrhyper/default.upstream
+++ /dev/null
@@ -1,3 +0,0 @@
-url http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/
-ensure_choice
-version '.*[^0-9]_([-0-9_]+)[.].*' '\1'