From a4ad6a26860de4e93cc67e3d106b059c4279057e Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 8 Jun 2025 14:42:36 +0200 Subject: [PATCH] texinfo4: drop --- .../tools/misc/texinfo/packages.nix | 19 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix index 7cda7d1b58cc..f9d5bab6d10a 100644 --- a/pkgs/development/tools/misc/texinfo/packages.nix +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -69,25 +69,6 @@ let }; in { - texinfo413 = stdenv.mkDerivation (finalAttrs: { - pname = "texinfo"; - version = "4.13a"; - - src = fetchurl { - url = "mirror://gnu/texinfo/texinfo-${finalAttrs.version}.tar.lzma"; - hash = "sha256-bSiwzq6GbjU2FC/FUuejvJ+EyDAxGcJXMbJHju9kyeU="; - }; - - buildInputs = [ ncurses ]; - nativeBuildInputs = [ xz ]; - - # Disabled because we don't have zdiff in the stdenv bootstrap. - #doCheck = true; - - meta = meta // { - branch = finalAttrs.version; - }; - }); texinfo6_5 = buildTexinfo { version = "6.5"; hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e6767dd00258..c44896da9818 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1896,6 +1896,7 @@ mapAliases { tepl = libgedit-tepl; # Added 2024-04-29 termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25 testVersion = testers.testVersion; # Added 2022-04-20 + texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08 tezos-rust-libs = ligo; # Added 2025-06-03 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4c22adf0c47..6053c678e1cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7689,13 +7689,11 @@ with pkgs; texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { }; inherit (texinfoPackages) - texinfo413 texinfo6_5 # needed for allegro texinfo6_7 # needed for gpm, iksemel and fwknop texinfo6 texinfo7 ; - texinfo4 = texinfo413; # needed for eukleides and singular texinfo = texinfo7; texinfoInteractive = texinfo.override { interactive = true; };