Commit c6b60d19 authored by K900's avatar K900
Browse files

treewide: drop 'tinyxml2' alias 

We have tinyxml, tinyxml2, which is an alias for tinyxml,
and tinyxml-2, which is an entirely different thing.
This is very confusing. Reduce confusion by removing the alias.
parent fe584505

pkgs/applications/video/kodi/unwrapped.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
  which,

  openssl,

  gperf,

  tinyxml2,

  tinyxml,

  tinyxml-2,

  taglib,

  libssh,
@@ -299,7 +299,7 @@ stdenv.mkDerivation ( 
      libdrm

      openssl

      gperf

      tinyxml2

      tinyxml

      tinyxml-2

      taglib

      libssh

pkgs/games/pokerth/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  protobuf,

  sqlite,

  wrapQtAppsHook,

  tinyxml2,

  tinyxml,

  target ? "client",

}:
@@ -77,7 +77,7 @@ mkDerivation rec { 
    protobuf

    qtbase

    sqlite

    tinyxml2

    tinyxml

  ];



  qmakeFlags = [

pkgs/tools/filesystems/encfs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  gettext,

  fuse,

  openssl,

  tinyxml2,

  tinyxml-2,

  gtest,

}:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [

    fuse

    openssl

    tinyxml2

    tinyxml-2

    gtest

  ];

  nativeBuildInputs = [

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -2608,6 +2608,7 @@ mapAliases { 
  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

  timelens = throw "'timelens' has been removed due to lack of upstream maintenance"; # Added 2025-01-25

  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

  tix = tclPackages.tix; # Added 2024-10-02

  tkcvs = tkrev; # Added 2022-03-07

  tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17

pkgs/top-level/all-packages.nix

+2 −6
Original line number Diff line number Diff line
@@ -2703,9 +2703,7 @@ with pkgs; 


  emborg = python3Packages.callPackage ../development/python-modules/emborg { };



  encfs = callPackage ../tools/filesystems/encfs {

    tinyxml2 = tinyxml-2;

  };

  encfs = callPackage ../tools/filesystems/encfs { };



  ethercalc = callPackage ../servers/web-apps/ethercalc { };
@@ -8747,9 +8745,7 @@ with pkgs; 


  tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };



  tinyxml = tinyxml2;



  tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };

  tinyxml = callPackage ../development/libraries/tinyxml/2.6.2.nix { };



  tk = tk-8_6;