Skip to content

Commit c6b60d1

Browse files
committed
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.
1 parent fe58450 commit c6b60d1

5 files changed

Lines changed: 9 additions & 12 deletions

File tree

pkgs/applications/video/kodi/unwrapped.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
which,
2727
openssl,
2828
gperf,
29-
tinyxml2,
29+
tinyxml,
3030
tinyxml-2,
3131
taglib,
3232
libssh,
@@ -299,7 +299,7 @@ stdenv.mkDerivation (
299299
libdrm
300300
openssl
301301
gperf
302-
tinyxml2
302+
tinyxml
303303
tinyxml-2
304304
taglib
305305
libssh

pkgs/games/pokerth/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
protobuf,
1616
sqlite,
1717
wrapQtAppsHook,
18-
tinyxml2,
18+
tinyxml,
1919
target ? "client",
2020
}:
2121

@@ -77,7 +77,7 @@ mkDerivation rec {
7777
protobuf
7878
qtbase
7979
sqlite
80-
tinyxml2
80+
tinyxml
8181
];
8282

8383
qmakeFlags = [

pkgs/tools/filesystems/encfs/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
gettext,
1010
fuse,
1111
openssl,
12-
tinyxml2,
12+
tinyxml-2,
1313
gtest,
1414
}:
1515

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636
buildInputs = [
3737
fuse
3838
openssl
39-
tinyxml2
39+
tinyxml-2
4040
gtest
4141
];
4242
nativeBuildInputs = [

pkgs/top-level/aliases.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2608,6 +2608,7 @@ mapAliases {
26082608
timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17
26092609
tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
26102610
timelens = throw "'timelens' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
2611+
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
26112612
tix = tclPackages.tix; # Added 2024-10-02
26122613
tkcvs = tkrev; # Added 2022-03-07
26132614
tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17

pkgs/top-level/all-packages.nix

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,9 +2703,7 @@ with pkgs;
27032703

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

2706-
encfs = callPackage ../tools/filesystems/encfs {
2707-
tinyxml2 = tinyxml-2;
2708-
};
2706+
encfs = callPackage ../tools/filesystems/encfs { };
27092707

27102708
ethercalc = callPackage ../servers/web-apps/ethercalc { };
27112709

@@ -8747,9 +8745,7 @@ with pkgs;
87478745

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

8750-
tinyxml = tinyxml2;
8751-
8752-
tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
8748+
tinyxml = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
87538749

87548750
tk = tk-8_6;
87558751

0 commit comments

Comments
 (0)