summary refs log tree commit diff
path: root/pkgs/applications/science/logic/tlaplus/default.nix
diff options
context:
space:
mode:
authorYurii Rashkovskii <yrashk@gmail.com>2020-05-06 12:26:10 -0700
committerYurii Rashkovskii <yrashk@gmail.com>2020-05-06 12:26:10 -0700
commitc73875ea1e745349a0451b92a1e6b0c5faee8b82 (patch)
treef6ab8192804c5ff61ce1b5d44ac1d64c4b956096 /pkgs/applications/science/logic/tlaplus/default.nix
parentc0f897ebee2bfd5e7d1526ce166fddb764e38ea5 (diff)
downloadnixpkgs-c73875ea1e745349a0451b92a1e6b0c5faee8b82.tar
nixpkgs-c73875ea1e745349a0451b92a1e6b0c5faee8b82.tar.gz
nixpkgs-c73875ea1e745349a0451b92a1e6b0c5faee8b82.tar.bz2
nixpkgs-c73875ea1e745349a0451b92a1e6b0c5faee8b82.tar.lz
nixpkgs-c73875ea1e745349a0451b92a1e6b0c5faee8b82.tar.xz
nixpkgs-c73875ea1e745349a0451b92a1e6b0c5faee8b82.tar.zst
nixpkgs-c73875ea1e745349a0451b92a1e6b0c5faee8b82.zip
tlaplus: 1.5.6 -> 1.7.0
Diffstat (limited to 'pkgs/applications/science/logic/tlaplus/default.nix')
-rw-r--r--pkgs/applications/science/logic/tlaplus/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix
index 3476b5ea9d9..14944f5e19b 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"