diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix index 83adddf1ae61..c13451700809 100644 --- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix @@ -15,8 +15,6 @@ intltool, libayatana-common, libgudev, - libqtdbusmock, - libqtdbustest, librda, libsForQt5, lomiri, @@ -91,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest - libqtdbusmock - libqtdbustest + libsForQt5.libqtdbusmock + libsForQt5.libqtdbustest properties-cpp ]; diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index 142aefe75ad6..623925635e97 100644 --- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -16,8 +16,6 @@ libgee, libnotify, libpulseaudio, - libqtdbusmock, - libqtdbustest, libsForQt5, libxml2, lomiri, @@ -99,8 +97,8 @@ stdenv.mkDerivation (finalAttrs: { dbus-test-runner gtest libsForQt5.qtbase - libqtdbusmock - libqtdbustest + libsForQt5.libqtdbusmock + libsForQt5.libqtdbustest lomiri.gmenuharness ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9718610bf171..9690224d617f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1066,6 +1066,8 @@ mapAliases { libpthreadstubs = libpthread-stubs; # Added 2025-02-04 libpulseaudio-vanilla = throw "'libpulseaudio-vanilla' has been renamed to/replaced by 'libpulseaudio'"; # Converted to throw 2025-10-27 libqt5pas = throw "'libqt5pas' has been renamed to/replaced by 'libsForQt5.libqtpas'"; # Converted to throw 2025-10-27 + libqtdbusmock = warnAlias "'libqtdbusmock' has been renamed to 'libsForQt5.libqtdbusmock'"; # Added 2026-03-10 + libqtdbustest = warnAlias "'libqtdbustest' has been renamed to 'libsForQt5.libqtdbustest'"; # Added 2026-03-10 libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04 LibreArp = throw "'LibreArp' has been renamed to/replaced by 'librearp'"; # Converted to throw 2025-10-27 LibreArp-lv2 = throw "'LibreArp-lv2' has been renamed to/replaced by 'librearp-lv2'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75de0d300208..00d5c1f4f8a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6724,14 +6724,6 @@ with pkgs; inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5; libliftoff = libliftoff_0_5; - libqtdbusmock = libsForQt5.callPackage ../development/libraries/libqtdbusmock { - inherit (lomiri) cmake-extras; - }; - - libqtdbustest = libsForQt5.callPackage ../development/libraries/libqtdbustest { - inherit (lomiri) cmake-extras; - }; - libretranslate = with python3.pkgs; toPythonApplication libretranslate; librsb = callPackage ../development/libraries/librsb { diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 58c73a157878..570f96850641 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -116,6 +116,14 @@ makeScopeWithSplicing' { libqofono = callPackage ../development/libraries/libqofono { }; + libqtdbusmock = callPackage ../development/libraries/libqtdbusmock { + inherit (pkgs.lomiri) cmake-extras; + }; + + libqtdbustest = callPackage ../development/libraries/libqtdbustest { + inherit (pkgs.lomiri) cmake-extras; + }; + libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };