tk-8_5: Remove

Tk 8.5 is end-of-life, and after the preceding commits nothing in the tree
asks for it.

The `broken` line in `generic.nix` goes too: it marked Tk on Darwin broken
when built against Tcl 8.5, which is now unreachable.

Assisted-by: Claude Code (Claude Opus 5)
This commit is contained in:
John Ericson
2026-08-22 14:47:10 -04:00
parent 9ae5806996
commit f2d5bea5a5
4 changed files with 1 additions and 34 deletions

View File

@@ -1,32 +0,0 @@
{
lib,
stdenv,
callPackage,
fetchurl,
fetchpatch,
tcl,
...
}@args:
callPackage ./generic.nix (
args
// {
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
sha256 = "1yhgcalldrjlc5q614rlzg1crgd3b52dhrk1pncdaxvl2vgg2yj0";
};
patches = lib.optionals stdenv.hostPlatform.isDarwin [
# Define MODULE_SCOPE before including tkPort.h
# https://core.tcl-lang.org/tk/info/dba9f5ce3b
(fetchpatch {
name = "module_scope.patch";
url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a";
extraPrefix = "";
sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv";
})
];
}
)

View File

@@ -105,6 +105,5 @@ tcl.mkTclDerivation {
license = lib.licenses.tcltk;
platforms = lib.platforms.all;
maintainers = [ ];
broken = stdenv.hostPlatform.isDarwin && lib.elem (lib.versions.majorMinor tcl.version) [ "8.5" ];
};
}

View File

@@ -2450,6 +2450,7 @@ mapAliases {
timemachine = throw "'timemachine' has been removed as it depended on the deprecated GTK 2 engine"; # Added 2026-08-13
timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
tinyxml2 = throw "The 'tinyxml2' alias has been removed, use 'tinyxml' for https://sourceforge.net/projects/tinyxml/ or 'tinyxml-2' for https://github.com/leethomason/tinyxml2"; # Added 2025-10-11
tk-8_5 = throw "'tk-8_5' has been removed, as Tk 8.5 is end-of-life and nothing needed it any more"; # Added 2026-08-22
tkcvs = throw "'tkcvs' has been renamed to/replaced by 'tkrev'"; # Converted to throw 2025-10-27
tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17
tkimg = throw "'tkimg' has been renamed to/replaced by 'tclPackages.tkimg'"; # Converted to throw 2025-10-27

View File

@@ -6696,7 +6696,6 @@ with pkgs;
tk-9_0 = callPackage ../development/libraries/tk/9.0.nix { tcl = tcl-9_0; };
tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
tpm2-tss = callPackage ../development/libraries/tpm2-tss {
autoreconfHook = buildPackages.autoreconfHook269;