mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
treewide: move tcl libraries under tclPackages
This commit is contained in:
Francesco Gazzetta
parent
3000459155
commit
68576df997
@ -5,10 +5,9 @@
|
||||
, pkg-config
|
||||
, perl
|
||||
, tcl
|
||||
, tcllib
|
||||
, tclPackages
|
||||
, tk
|
||||
, expat
|
||||
, bwidget
|
||||
, python3
|
||||
, texliveTeTeX
|
||||
, survex
|
||||
@ -25,7 +24,6 @@
|
||||
, sqlite
|
||||
, libtiff
|
||||
, curl
|
||||
, tkimg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -59,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
tkimg
|
||||
tclPackages.tkimg
|
||||
proj
|
||||
wxGTK32
|
||||
vtk
|
||||
@ -74,8 +72,8 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
fmt
|
||||
tcl
|
||||
tcllib
|
||||
bwidget
|
||||
tclPackages.tcllib
|
||||
tclPackages.bwidget
|
||||
];
|
||||
|
||||
fixupPhase = ''
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
, readline
|
||||
, spdlog
|
||||
, tcl
|
||||
, tcllib
|
||||
, tclPackages
|
||||
, xorg
|
||||
, yosys
|
||||
, zlib
|
||||
@ -72,7 +72,7 @@ mkDerivation rec {
|
||||
readline
|
||||
spdlog
|
||||
tcl
|
||||
tcllib
|
||||
tclPackages.tcllib
|
||||
yosys
|
||||
xorg.libX11
|
||||
zlib
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, sqlite
|
||||
, ed
|
||||
, which
|
||||
, tcllib
|
||||
, tclPackages
|
||||
, withJson ? true
|
||||
}:
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# required for build time tool `./tools/translate.c`
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles tcl tcllib ];
|
||||
nativeBuildInputs = [ installShellFiles tcl tclPackages.tcllib ];
|
||||
|
||||
buildInputs = [ zlib openssl readline which ed ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin libiconv
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, tcl
|
||||
, tclx
|
||||
, tclPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
espeak-ng
|
||||
tcl
|
||||
tclx
|
||||
tclPackages.tclx
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
find "$d" -type f -not -executable -execdir chmod 644 {} +
|
||||
makeWrapper ${lib.getExe emacs} $out/bin/emacspeak \
|
||||
--set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \
|
||||
--set TCLLIBPATH "${tclx}/lib" \
|
||||
--set TCLLIBPATH "${tclPackages.tclx}/lib" \
|
||||
--add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"'
|
||||
'';
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
jemalloc,
|
||||
which,
|
||||
tcl,
|
||||
tcltls,
|
||||
tclPackages,
|
||||
ps,
|
||||
getconf,
|
||||
nixosTests,
|
||||
@ -60,11 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# darwin currently lacks a pure `pgrep` which is extensively used here
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
nativeCheckInputs = [
|
||||
which
|
||||
tcl
|
||||
ps
|
||||
] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ] ++ lib.optionals tlsSupport [ tcltls ];
|
||||
nativeCheckInputs =
|
||||
[
|
||||
which
|
||||
tcl
|
||||
ps
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]
|
||||
++ lib.optionals tlsSupport [ tclPackages.tcltls ];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
tk,
|
||||
tcllib,
|
||||
tclPackages,
|
||||
tcl,
|
||||
tkremind ? null,
|
||||
withGui ?
|
||||
@ -23,7 +23,7 @@ tcl.mkTclDerivation rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals withGui [
|
||||
tcllib
|
||||
tclPackages.tcllib
|
||||
tk
|
||||
];
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, makeWrapper
|
||||
, coreutils
|
||||
, tcl-8_6
|
||||
, tcllib
|
||||
, tclPackages
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-ENa/r3+o7abW8iun6V/2LhTVmFVSwVM6v46KXBcKJ1g=";
|
||||
};
|
||||
|
||||
buildInputs = [ tcl-8_6 tcllib coreutils ];
|
||||
buildInputs = [ tcl-8_6 tclPackages.tcllib coreutils ];
|
||||
nativeBuildInputs = [ makeWrapper tcl-8_6.tclPackageHook installShellFiles ];
|
||||
|
||||
tclWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ tcl-8_6 ]) ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, openssl
|
||||
, readline
|
||||
, sqlite
|
||||
, tcl ? null, tk ? null, tix ? null, libX11 ? null, x11Support ? false
|
||||
, tcl ? null, tk ? null, tclPackages, libX11 ? null, x11Support ? false
|
||||
, zlib
|
||||
, self
|
||||
, configd, coreutils
|
||||
@ -273,8 +273,8 @@ in with passthru; stdenv.mkDerivation ({
|
||||
|
||||
setupHook = python-setup-hook sitePackages;
|
||||
|
||||
postPatch = lib.optionalString (x11Support && (tix != null)) ''
|
||||
substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
postPatch = lib.optionalString (x11Support && ((tclPackages.tix or null) != null)) ''
|
||||
substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
, tzdata
|
||||
, withGdbm ? !stdenv.hostPlatform.isWindows, gdbm
|
||||
, withReadline ? !stdenv.hostPlatform.isWindows, readline
|
||||
, x11Support ? false, tcl, tk, tix, libX11, xorgproto
|
||||
, x11Support ? false, tcl, tk, tclPackages, libX11, xorgproto
|
||||
|
||||
# splicing/cross
|
||||
, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
|
||||
@ -323,10 +323,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
|
||||
'' + optionalString mimetypesSupport ''
|
||||
substituteInPlace Lib/mimetypes.py \
|
||||
--replace-fail "@mime-types@" "${mailcap}"
|
||||
'' + optionalString (pythonOlder "3.13" && x11Support && (tix != null)) ''
|
||||
'' + optionalString (pythonOlder "3.13" && x11Support && ((tclPackages.tix or null) != null)) ''
|
||||
substituteInPlace "Lib/tkinter/tix.py" --replace-fail \
|
||||
"os.environ.get('TIX_LIBRARY')" \
|
||||
"os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
"os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
|
||||
'';
|
||||
|
||||
env = {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, substituteAll, fetchurl
|
||||
, zlibSupport ? true, zlib
|
||||
, bzip2, pkg-config, libffi, libunwind, Security
|
||||
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, libX11
|
||||
, sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11
|
||||
, gdbm, db, xz, python-setup-hook
|
||||
, optimizationLevel ? "jit", boehmgc
|
||||
# For the Python package set
|
||||
@ -98,7 +98,7 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
--replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES"
|
||||
|
||||
substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" \
|
||||
--replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
--replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -474,7 +474,7 @@ let
|
||||
RMySQL = with pkgs; [ zlib libmysqlclient openssl.dev ];
|
||||
RNetCDF = with pkgs; [ netcdf udunits ];
|
||||
RODBC = [ pkgs.libiodbc ];
|
||||
rpanel = [ pkgs.bwidget ];
|
||||
rpanel = [ pkgs.tclPackages.bwidget ];
|
||||
Rpoppler = [ pkgs.poppler ];
|
||||
RPostgres = with pkgs; [ postgresql ];
|
||||
RPostgreSQL = with pkgs; [ postgresql postgresql ];
|
||||
@ -1460,9 +1460,9 @@ let
|
||||
|
||||
rpanel = old.rpanel.overrideAttrs (attrs: {
|
||||
preConfigure = ''
|
||||
export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"
|
||||
export TCLLIBPATH="${pkgs.tclPackages.bwidget}/lib/bwidget${pkgs.tclPackages.bwidget.version}"
|
||||
'';
|
||||
TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}";
|
||||
TCLLIBPATH = "${pkgs.tclPackages.bwidget}/lib/bwidget${pkgs.tclPackages.bwidget.version}";
|
||||
});
|
||||
|
||||
networkscaleup = old.networkscaleup.overrideAttrs (attrs: {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchurl, tcl, tk }:
|
||||
{ lib, fetchurl, mkTclDerivation, tk }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "bwidget";
|
||||
version = "1.10.0";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, writeText, tcl }:
|
||||
{ lib, stdenv, mkTclDerivation, fetchurl, writeText, tcl }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "incrtcl";
|
||||
version = "4.2.3";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, tcl, tk, incrtcl }:
|
||||
{ lib, stdenv, fetchurl, mkTclDerivation, tk, incrtcl }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "itk-tcl";
|
||||
version = "4.1.0";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchFromGitHub, tcl, tcllib }:
|
||||
{ lib, fetchFromGitHub, mkTclDerivation, tcllib }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "mustache-tcl";
|
||||
version = "1.1.3.4";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
tcl,
|
||||
mkTclDerivation,
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "pdf4tcl";
|
||||
version = "0.9.4";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchFromGitHub, tcl, tclx }:
|
||||
{ lib, fetchFromGitHub, mkTclDerivation, tclx }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tcl-fcgi";
|
||||
version = "0.5.0";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
tcl,
|
||||
mkTclDerivation,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tclcurl";
|
||||
version = "7.22.1";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib
|
||||
, fetchzip
|
||||
, tcl
|
||||
, mkTclDerivation
|
||||
, critcl
|
||||
, withCritcl ? true
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tcllib";
|
||||
version = "1.21";
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
tcl,
|
||||
mkTclDerivation,
|
||||
fetchzip,
|
||||
graphicsmagick,
|
||||
tk,
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tclmagick";
|
||||
version = "1.3.43";
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
, autoconf
|
||||
, libtool
|
||||
, readline
|
||||
, tcl
|
||||
, mkTclDerivation
|
||||
, tk
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tclreadline";
|
||||
version = "2.4.0";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchurl, tcl, openssl }:
|
||||
{ lib, fetchurl, mkTclDerivation, openssl }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tcltls";
|
||||
version = "1.7.22";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
tcl,
|
||||
mkTclDerivation,
|
||||
fetchfossil,
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tcludp";
|
||||
version = "1.0.11";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
tcl,
|
||||
mkTclDerivation,
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation {
|
||||
mkTclDerivation {
|
||||
pname = "tclvfs";
|
||||
version = "1.4-unstable-2023-11-23";
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, tcl
|
||||
, mkTclDerivation
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tclx";
|
||||
version = "8.6.3";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
tcl,
|
||||
mkTclDerivation,
|
||||
fetchzip,
|
||||
expat,
|
||||
gumbo,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "tdom";
|
||||
version = "0.9.5";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchurl, tcl }:
|
||||
{ lib, fetchurl, mkTclDerivation }:
|
||||
|
||||
tcl.mkTclDerivation {
|
||||
mkTclDerivation {
|
||||
pname = "wapp";
|
||||
version = "0-unstable-2024-05-23";
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, mkTclDerivation
|
||||
, tcl
|
||||
, tcllib
|
||||
}:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
mkTclDerivation rec {
|
||||
pname = "critcl";
|
||||
version = "3.2";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchzip, tcl, tcllib, tk, }:
|
||||
{ lib, fetchzip, tcl, tclPackages, tk, }:
|
||||
|
||||
tcl.mkTclDerivation {
|
||||
pname = "nagelfar";
|
||||
@ -11,7 +11,7 @@ tcl.mkTclDerivation {
|
||||
|
||||
buildInputs = [
|
||||
tcl
|
||||
tcllib
|
||||
tclPackages.tcllib
|
||||
tk
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, tcl, tcllib, runtimeShell }:
|
||||
{ lib, fetchurl, tcl, tclPackages, runtimeShell }:
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "tcl2048";
|
||||
@ -9,7 +9,7 @@ tcl.mkTclDerivation rec {
|
||||
sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e";
|
||||
};
|
||||
|
||||
buildInputs = [ tcllib ];
|
||||
buildInputs = [ tclPackages.tcllib ];
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -152,6 +152,7 @@ mapAliases {
|
||||
|
||||
inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
|
||||
butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18
|
||||
bwidget = tclPackages.bwidget; # Added 2024-10-02
|
||||
# Shorter names; keep the longer name for back-compat. Added 2023-04-11
|
||||
buildFHSUserEnv = buildFHSEnv;
|
||||
buildFHSUserEnvChroot = buildFHSEnvChroot;
|
||||
@ -221,6 +222,7 @@ mapAliases {
|
||||
concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
|
||||
containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
|
||||
crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
|
||||
critcl = tclPackages.critcl; # Added 2024-10-02
|
||||
cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
|
||||
cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
|
||||
|
||||
@ -502,6 +504,7 @@ mapAliases {
|
||||
imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
|
||||
imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
|
||||
immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
|
||||
incrtcl = tclPackages.incrtcl; # Added 2024-10-02
|
||||
input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
|
||||
index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17
|
||||
inotifyTools = inotify-tools;
|
||||
@ -515,6 +518,7 @@ mapAliases {
|
||||
isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
|
||||
isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
|
||||
iso-flags-png-320x420 = lib.warn "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
|
||||
itktcl = tclPackages.itktcl; # Added 2024-10-02
|
||||
|
||||
### J ###
|
||||
|
||||
@ -766,6 +770,7 @@ mapAliases {
|
||||
mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
|
||||
msp430NewlibCross = msp430Newlib; # Added 2024-09-06
|
||||
mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22
|
||||
mustache-tcl = tclPackages.mustache-tcl; # Added 2024-10-02
|
||||
mutt-with-sidebar = mutt; # Added 2022-09-17
|
||||
mysql-client = hiPrio mariadb.client;
|
||||
mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17
|
||||
@ -886,6 +891,7 @@ mapAliases {
|
||||
patchelfStable = patchelf; # Added 2024-01-25
|
||||
pcsctools = pcsc-tools; # Added 2023-12-07
|
||||
pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20
|
||||
pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02
|
||||
peach = asouldocs; # Added 2022-08-28
|
||||
percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13
|
||||
percona-server_lts = percona-server; # Added 2024-10-13
|
||||
@ -1124,7 +1130,16 @@ mapAliases {
|
||||
taplo-cli = taplo; # Added 2022-07-30
|
||||
taplo-lsp = taplo; # Added 2022-07-30
|
||||
taro = taproot-assets; # Added 2023-07-04
|
||||
tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
|
||||
tclcurl = tclPackages.tclcurl; # Added 2024-10-02
|
||||
tcllib = tclPackages.tcllib; # Added 2024-10-02
|
||||
tclmagick = tclPackages.tclmagick; # Added 2024-10-02
|
||||
tcltls = tclPackages.tcltls; # Added 2024-10-02
|
||||
tcludp = tclPackages.tcludp; # Added 2024-10-02
|
||||
tclvfs = tclPackages.tclvfs; # Added 2024-10-02
|
||||
tclx = tclPackages.tclx; # Added 2024-10-02
|
||||
tdesktop = telegram-desktop; # Added 2023-04-07
|
||||
tdom = tclPackages.tdom; # Added 2024-10-02
|
||||
teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
|
||||
teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
|
||||
teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
|
||||
@ -1141,7 +1156,9 @@ mapAliases {
|
||||
invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
|
||||
timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17
|
||||
tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
|
||||
tix = tclPackages.tix; # Added 2024-10-02
|
||||
tkcvs = tkrev; # Added 2022-03-07
|
||||
tkimg = tclPackages.tkimg; # Added 2024-10-02
|
||||
toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22
|
||||
tokodon = plasma5Packages.tokodon;
|
||||
tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
|
||||
@ -1219,6 +1236,7 @@ mapAliases {
|
||||
### W ###
|
||||
wakatime = wakatime-cli; # 2024-05-30
|
||||
wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
|
||||
wapp = tclPackages.wapp; # Added 2024-10-02
|
||||
wayfireApplications-unwrapped = throw ''
|
||||
'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
|
||||
'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins'
|
||||
|
||||
@ -7396,7 +7396,7 @@ with pkgs;
|
||||
|
||||
extundelete = callPackage ../tools/filesystems/extundelete { };
|
||||
|
||||
expect = callPackage ../tools/misc/expect { };
|
||||
expect = tclPackages.expect;
|
||||
|
||||
expected-lite = callPackage ../development/libraries/expected-lite { };
|
||||
|
||||
@ -14429,10 +14429,6 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
critcl = callPackage ../development/compilers/critcl {
|
||||
tcllib = tcllib.override { withCritcl = false; };
|
||||
};
|
||||
|
||||
inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { })
|
||||
crystal_1_2
|
||||
crystal_1_7
|
||||
@ -16617,7 +16613,7 @@ with pkgs;
|
||||
# We don't need versioned package sets thanks to the tcl stubs mechanism
|
||||
tclPackages = recurseIntoAttrs (callPackage ./tcl-packages.nix {});
|
||||
|
||||
tclreadline = callPackage ../development/interpreters/tclreadline { };
|
||||
tclreadline = tclPackages.tclreadline;
|
||||
|
||||
eltclsh = callPackage ../development/tools/eltclsh { };
|
||||
|
||||
@ -18984,8 +18980,6 @@ with pkgs;
|
||||
|
||||
bulletml = callPackage ../development/libraries/bulletml { };
|
||||
|
||||
bwidget = callPackage ../development/libraries/bwidget { };
|
||||
|
||||
bzrtp = callPackage ../development/libraries/bzrtp { };
|
||||
|
||||
c-ares = callPackage ../development/libraries/c-ares { };
|
||||
@ -20261,9 +20255,6 @@ with pkgs;
|
||||
|
||||
ijs = callPackage ../development/libraries/ijs { };
|
||||
|
||||
itktcl = callPackage ../development/libraries/itktcl { };
|
||||
incrtcl = callPackage ../development/libraries/incrtcl { };
|
||||
|
||||
indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { };
|
||||
indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { };
|
||||
|
||||
@ -23202,14 +23193,6 @@ with pkgs;
|
||||
|
||||
tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };
|
||||
|
||||
tcllib = callPackage ../development/libraries/tcllib { };
|
||||
|
||||
tcltls = callPackage ../development/libraries/tcltls { };
|
||||
|
||||
tclx = callPackage ../development/libraries/tclx { };
|
||||
|
||||
tcl-fcgi = callPackage ../development/libraries/tcl-fcgi { };
|
||||
|
||||
tdb = callPackage ../development/libraries/tdb { };
|
||||
|
||||
tdlib = callPackage ../development/libraries/tdlib { };
|
||||
@ -23258,16 +23241,12 @@ with pkgs;
|
||||
|
||||
tivodecode = callPackage ../applications/video/tivodecode { };
|
||||
|
||||
tix = callPackage ../development/libraries/tix { };
|
||||
|
||||
tk = tk-8_6;
|
||||
|
||||
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; };
|
||||
|
||||
tkimg = callPackage ../development/libraries/tkimg { };
|
||||
|
||||
tkrzw = callPackage ../development/libraries/tkrzw { };
|
||||
|
||||
tl-expected = callPackage ../development/libraries/tl-expected { };
|
||||
@ -23437,8 +23416,6 @@ with pkgs;
|
||||
|
||||
wangle = darwin.apple_sdk_11_0.callPackage ../development/libraries/wangle { };
|
||||
|
||||
wapp = callPackage ../development/libraries/wapp { };
|
||||
|
||||
wavpack = callPackage ../development/libraries/wavpack { };
|
||||
|
||||
wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { };
|
||||
@ -27301,8 +27278,6 @@ with pkgs;
|
||||
|
||||
mustache-spec = callPackage ../data/documentation/mustache-spec { };
|
||||
|
||||
mustache-tcl = callPackage ../development/libraries/mustache-tcl { };
|
||||
|
||||
mustache-go = callPackage ../development/tools/mustache-go { };
|
||||
|
||||
mustache-hpp = callPackage ../development/libraries/mustache-hpp { };
|
||||
|
||||
@ -24089,9 +24089,9 @@ with self; {
|
||||
hash = "sha256-+DhYd6Sp7Z89OQPS0PfNcPrDzmgyxg9gCmghzuP7WHI=";
|
||||
};
|
||||
propagatedBuildInputs = [
|
||||
pkgs.bwidget
|
||||
pkgs.tclPackages.bwidget
|
||||
pkgs.tcl
|
||||
pkgs.tix
|
||||
pkgs.tclPackages.tix
|
||||
pkgs.tk
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices ];
|
||||
|
||||
@ -14,5 +14,8 @@ lib.makeScope newScope (
|
||||
inherit tcl tk;
|
||||
inherit (tcl) mkTclDerivation tclPackageHook;
|
||||
|
||||
critcl = self.callPackage ../development/tcl-modules/critcl {
|
||||
tcllib = self.tcllib.override { withCritcl = false; };
|
||||
};
|
||||
})
|
||||
)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user