diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2020-05-06 21:17:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 21:17:46 -0700 |
| commit | 9c492330b5fe3aa7e3cebb33a5b278135f3e3464 (patch) | |
| tree | dc2eeef612f5b66e574c4dde95984bc20e4de86a /pkgs/applications | |
| parent | f68f909524b9ec8919313a3770b9b1643aa536d4 (diff) | |
| parent | c73875ea1e745349a0451b92a1e6b0c5faee8b82 (diff) | |
| download | nixlib-9c492330b5fe3aa7e3cebb33a5b278135f3e3464.tar nixlib-9c492330b5fe3aa7e3cebb33a5b278135f3e3464.tar.gz nixlib-9c492330b5fe3aa7e3cebb33a5b278135f3e3464.tar.bz2 nixlib-9c492330b5fe3aa7e3cebb33a5b278135f3e3464.tar.lz nixlib-9c492330b5fe3aa7e3cebb33a5b278135f3e3464.tar.xz nixlib-9c492330b5fe3aa7e3cebb33a5b278135f3e3464.tar.zst nixlib-9c492330b5fe3aa7e3cebb33a5b278135f3e3464.zip | |
Merge pull request #87131 from yrashk/tlaplus-1.7.0
tlaplus: 1.5.6 -> 1.7.0
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/science/logic/tlaplus/default.nix | 12 |
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 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" |