tlaplus: move to by-name

jopejoe1 675fbe3a d3967f76

+6 -8
+6 -5
pkgs/applications/science/logic/tlaplus/default.nix pkgs/by-name/tl/tlaplus/package.nix
··· 3 stdenv, 4 fetchurl, 5 makeWrapper, 6 - jre, 7 }: 8 9 stdenv.mkDerivation rec { ··· 22 mkdir -p $out/share/java $out/bin 23 cp $src $out/share/java/tla2tools.jar 24 25 - makeWrapper ${jre}/bin/java $out/bin/tlc \ 26 --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC" 27 - makeWrapper ${jre}/bin/java $out/bin/tlasany \ 28 --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY" 29 - makeWrapper ${jre}/bin/java $out/bin/pcal \ 30 --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans" 31 - makeWrapper ${jre}/bin/java $out/bin/tlatex \ 32 --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA" 33 ''; 34
··· 3 stdenv, 4 fetchurl, 5 makeWrapper, 6 + # TODO: switch to jre https://github.com/NixOS/nixpkgs/pull/89731 7 + jre8, 8 }: 9 10 stdenv.mkDerivation rec { ··· 23 mkdir -p $out/share/java $out/bin 24 cp $src $out/share/java/tla2tools.jar 25 26 + makeWrapper ${jre8}/bin/java $out/bin/tlc \ 27 --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC" 28 + makeWrapper ${jre8}/bin/java $out/bin/tlasany \ 29 --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY" 30 + makeWrapper ${jre8}/bin/java $out/bin/pcal \ 31 --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans" 32 + makeWrapper ${jre8}/bin/java $out/bin/tlatex \ 33 --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA" 34 ''; 35
-3
pkgs/top-level/all-packages.nix
··· 15109 gmp-static = gmp.override { withStatic = true; }; 15110 }; 15111 15112 - tlaplus = callPackage ../applications/science/logic/tlaplus { 15113 - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 15114 - }; 15115 tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { 15116 inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; 15117 };
··· 15109 gmp-static = gmp.override { withStatic = true; }; 15110 }; 15111 15112 tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { 15113 inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; 15114 };