libsForQt5.libqtpas: Rename from libqt5pas

In preparation for a qt6Packages.libqtpas.

pkgs/applications/editors/cudatext/default.nix

@@ -17,8 +17,7 @@
 , python3
 
 # Qt5
-, libqt5pas
-, qt5
+, libsForQt5
 
 , widgetset ? "qt5"
 # See https://github.com/Alexey-T/CudaText-lexers
@@ -59,13 +58,13 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ lazarus fpc ]
-    ++ lib.optional (widgetset == "qt5") qt5.wrapQtAppsHook;
+    ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
 
   buildInputs = [ libX11 ]
     ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ pango cairo glib atk gdk-pixbuf ]
     ++ lib.optional (widgetset == "gtk2") gtk2
     ++ lib.optional (widgetset == "gtk3") gtk3
-    ++ lib.optional (widgetset == "qt5") libqt5pas;
+    ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas;
 
   NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
 

pkgs/by-name/do/doublecmd/package.nix

@@ -8,7 +8,7 @@
   glib,
   lazarus,
   libX11,
-  libqt5pas,
+  libqtpas,
   wrapQtAppsHook,
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     glib
     libX11
-    libqt5pas
+    libqtpas
   ];
 
   env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}";

pkgs/by-name/la/lazpaint/package.nix

@@ -6,7 +6,6 @@
   fpc,
   autoPatchelfHook,
   libsForQt5,
-  libqt5pas,
   xorg,
   python3,
 }:
@@ -43,9 +42,9 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
   ];
 
-  buildInputs = [
-    libsForQt5.qtbase
-    libqt5pas
+  buildInputs = with libsForQt5; [
+    qtbase
+    libqtpas
   ];
 
   runtimeDependencies = [

pkgs/by-name/pe/peazip/package.nix

@@ -6,7 +6,6 @@
   fpc,
   lazarus,
   xorg,
-  libqt5pas,
   runCommand,
   _7zz,
   archiver,
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     xorg.libX11
-    libqt5pas
+    libsForQt5.libqtpas
   ];
 
   NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";

pkgs/by-name/ya/yandex-browser/package.nix

@@ -46,7 +46,7 @@
 , systemd
 , at-spi2-atk
 , at-spi2-core
-, libqt5pas
+, libsForQt5
 , qt6
 , vivaldi-ffmpeg-codecs
 , edition ? "stable"
@@ -130,7 +130,7 @@ in stdenv.mkDerivation rec {
     nss
     pango
     (lib.getLib stdenv.cc.cc)
-    libqt5pas
+    libsForQt5.libqtpas
     qt6.qtbase
   ];
 

pkgs/development/compilers/fpc/lazarus.nix

@@ -19,7 +19,7 @@
   binutils,
   withQt ? false,
   qtbase ? null,
-  libqt5pas ? null,
+  libqtpas ? null,
   wrapQtAppsHook ? null,
 }:
 
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
       gdk-pixbuf
     ]
     ++ lib.optionals withQt [
-      libqt5pas
+      libqtpas
       qtbase
     ];
 
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
       "-lpango-1.0"
     ]
     ++ lib.optionals withQt [
-      "-L${lib.getLib libqt5pas}/lib"
+      "-L${lib.getLib libqtpas}/lib"
       "-lQt5Pas"
     ]
   );

pkgs/development/compilers/fpc/libqtpas.nix

@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libqt5pas";
+  pname = "libqtpas";
   inherit (lazarus) version src;
 
   sourceRoot = "lazarus/lcl/interfaces/qt5/cbindings";

pkgs/tools/graphics/goverlay/default.nix

@@ -10,7 +10,7 @@
   breeze-qt5,
   libGL,
   libGLU,
-  libqt5pas,
+  libqtpas,
   libX11,
   coreutils,
   git,
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     breeze-qt5
     libGL
     libGLU
-    libqt5pas
+    libqtpas
     libX11
   ];
 

pkgs/top-level/aliases.nix

@@ -664,6 +664,7 @@ mapAliases {
   liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
   libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02
   libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
+  libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25
   libquotient = libsForQt5.libquotient; # Added 2023-11-11
   librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10
   librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17

pkgs/top-level/all-packages.nix

@@ -1495,7 +1495,7 @@ with pkgs;
   ### APPLICATIONS/FILE-MANAGERS
 
   doublecmd = callPackage ../by-name/do/doublecmd/package.nix {
-    inherit (qt5) wrapQtAppsHook;
+    inherit (libsForQt5) libqtpas wrapQtAppsHook;
   };
 
   krusader = libsForQt5.callPackage ../applications/file-managers/krusader { };
@@ -3582,7 +3582,7 @@ with pkgs;
   gdown = with python3Packages; toPythonApplication gdown;
 
   goverlay = callPackage ../tools/graphics/goverlay {
-    inherit (qt5) wrapQtAppsHook;
+    inherit (libsForQt5) libqtpas wrapQtAppsHook;
     inherit (plasma5Packages) breeze-qt5;
   };
 
@@ -9914,8 +9914,6 @@ with pkgs;
     python = python3;
   };
 
-  libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };
-
   librsvg = callPackage ../development/libraries/librsvg {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;

pkgs/top-level/qt5-packages.nix

@@ -170,6 +170,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
 
   libqofono = callPackage ../development/libraries/libqofono { };
 
+  libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { };
+
   libquotient = callPackage ../development/libraries/libquotient { };
 
   libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };