From 675fbe3ab6a519d0b2e3030bbdd7c4aeafa50b99 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 18:03:52 +0200
Subject: [PATCH] tlaplus: move to by-name

---
 .../default.nix => by-name/tl/tlaplus/package.nix}    | 11 ++++++-----
 pkgs/top-level/all-packages.nix                       |  3 ---
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{applications/science/logic/tlaplus/default.nix => by-name/tl/tlaplus/package.nix} (81%)

diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/by-name/tl/tlaplus/package.nix
similarity index 81%
rename from pkgs/applications/science/logic/tlaplus/default.nix
rename to pkgs/by-name/tl/tlaplus/package.nix
index 4798e1148fcf..36bf0203b746 100644
--- a/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/pkgs/by-name/tl/tlaplus/package.nix
@@ -3,7 +3,8 @@
   stdenv,
   fetchurl,
   makeWrapper,
-  jre,
+  # TODO: switch to jre https://github.com/NixOS/nixpkgs/pull/89731
+  jre8,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,13 +23,13 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/java $out/bin
     cp $src $out/share/java/tla2tools.jar
 
-    makeWrapper ${jre}/bin/java $out/bin/tlc \
+    makeWrapper ${jre8}/bin/java $out/bin/tlc \
       --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC"
-    makeWrapper ${jre}/bin/java $out/bin/tlasany \
+    makeWrapper ${jre8}/bin/java $out/bin/tlasany \
       --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY"
-    makeWrapper ${jre}/bin/java $out/bin/pcal \
+    makeWrapper ${jre8}/bin/java $out/bin/pcal \
       --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans"
-    makeWrapper ${jre}/bin/java $out/bin/tlatex \
+    makeWrapper ${jre8}/bin/java $out/bin/tlatex \
       --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA"
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7147770e9cf0..219c66990f05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15109,9 +15109,6 @@ with pkgs;
     gmp-static = gmp.override { withStatic = true; };
   };
 
-  tlaplus = callPackage ../applications/science/logic/tlaplus {
-    jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-  };
   tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };