From c73875ea1e745349a0451b92a1e6b0c5faee8b82 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 6 May 2020 12:26:10 -0700
Subject: [PATCH] tlaplus: 1.5.6 -> 1.7.0

---
 pkgs/applications/science/logic/tlaplus/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix
index 3476b5ea9d90..14944f5e19b0 100644
--- a/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/pkgs/applications/science/logic/tlaplus/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub, makeWrapper
-, jdk, jre, ant
+, adoptopenjdk-bin, jre, ant
 }:
 
 stdenv.mkDerivation rec {
   pname = "tlaplus";
-  version = "1.5.6";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner  = "tlaplus";
     repo   = "tlaplus";
     rev    = "refs/tags/v${version}";
-    sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f";
+    sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891";
   };
 
-  buildInputs = [ makeWrapper jdk ant ];
+  buildInputs = [ makeWrapper adoptopenjdk-bin ant ];
 
-  buildPhase = "ant -f tlatools/customBuild.xml compile dist";
+  buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist";
   installPhase = ''
     mkdir -p $out/share/java $out/bin
-    cp tlatools/dist/*.jar $out/share/java
+    cp tlatools/org.lamport.tlatools/dist/*.jar $out/share/java
 
     makeWrapper ${jre}/bin/java $out/bin/tlc2 \
       --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC"