From 1992c9070d65d8cfd8a2a79ef38785953aa11943 Mon Sep 17 00:00:00 2001
From: Grayson Tinker <graysontinker@gmail.com>
Date: Wed, 1 Jul 2026 00:34:27 -0700
Subject: [PATCH] tetex: migrate to by-name

---
 .../typesetting/tex => by-name/te}/tetex/clang.patch |  0
 .../tex => by-name/te}/tetex/environment.patch       |  0
 .../tex => by-name/te}/tetex/extramembot.patch       |  0
 .../tex => by-name/te}/tetex/getline.patch           |  0
 .../default.nix => by-name/te/tetex/package.nix}     | 12 ++++++------
 .../tex => by-name/te}/tetex/setup-hook.sh           |  0
 pkgs/top-level/all-packages.nix                      |  2 --
 7 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/clang.patch (100%)
 rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/environment.patch (100%)
 rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/extramembot.patch (100%)
 rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/getline.patch (100%)
 rename pkgs/{tools/typesetting/tex/tetex/default.nix => by-name/te/tetex/package.nix} (90%)
 rename pkgs/{tools/typesetting/tex => by-name/te}/tetex/setup-hook.sh (100%)

diff --git a/pkgs/tools/typesetting/tex/tetex/clang.patch b/pkgs/by-name/te/tetex/clang.patch
similarity index 100%
rename from pkgs/tools/typesetting/tex/tetex/clang.patch
rename to pkgs/by-name/te/tetex/clang.patch
diff --git a/pkgs/tools/typesetting/tex/tetex/environment.patch b/pkgs/by-name/te/tetex/environment.patch
similarity index 100%
rename from pkgs/tools/typesetting/tex/tetex/environment.patch
rename to pkgs/by-name/te/tetex/environment.patch
diff --git a/pkgs/tools/typesetting/tex/tetex/extramembot.patch b/pkgs/by-name/te/tetex/extramembot.patch
similarity index 100%
rename from pkgs/tools/typesetting/tex/tetex/extramembot.patch
rename to pkgs/by-name/te/tetex/extramembot.patch
diff --git a/pkgs/tools/typesetting/tex/tetex/getline.patch b/pkgs/by-name/te/tetex/getline.patch
similarity index 100%
rename from pkgs/tools/typesetting/tex/tetex/getline.patch
rename to pkgs/by-name/te/tetex/getline.patch
diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/by-name/te/tetex/package.nix
similarity index 90%
rename from pkgs/tools/typesetting/tex/tetex/default.nix
rename to pkgs/by-name/te/tetex/package.nix
index b5c09d0a2ccb..f42138f5fdfa 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/pkgs/by-name/te/tetex/package.nix
@@ -5,23 +5,23 @@
   flex,
   bison,
   zlib,
-  libpng,
+  libpng12,
   ncurses,
   ed,
   automake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tetex";
   version = "3.0";
 
   src = fetchurl {
-    url = "https://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-src-${version}.tar.gz";
+    url = "https://mirrors.ctan.org/obsolete/systems/unix/teTeX/${finalAttrs.version}/distrib/tetex-src-${finalAttrs.version}.tar.gz";
     sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww";
   };
 
   texmf = fetchurl {
-    url = "https://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-texmf-${version}.tar.gz";
+    url = "https://mirrors.ctan.org/obsolete/systems/unix/teTeX/${finalAttrs.version}/distrib/tetex-texmf-${finalAttrs.version}.tar.gz";
     sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc";
   };
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     flex
     bison
     zlib
-    libpng
+    libpng12
     ncurses
     ed
   ];
@@ -92,4 +92,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     hydraPlatforms = [ ];
   };
-}
+})
diff --git a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh b/pkgs/by-name/te/tetex/setup-hook.sh
similarity index 100%
rename from pkgs/tools/typesetting/tex/tetex/setup-hook.sh
rename to pkgs/by-name/te/tetex/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c7efee4fdaa..7d3cdd136f86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1581,8 +1581,6 @@ with pkgs;
 
   pgf = pgf2;
 
-  tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
-
   texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
 
   # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive