libqt5pas,lazarus-qt: 3.2-0 -> 3.6-0, init Qt6 variants (NixOS#368201)

Author: 7c6f434c

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

@@ -2,11 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  lazarus-qt,
+  lazarus-qt5,
   fpc,
   autoPatchelfHook,
   libsForQt5,
-  libqt5pas,
   xorg,
   python3,
 }:
@@ -37,15 +36,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    lazarus-qt
+    lazarus-qt5
     fpc
     libsForQt5.wrapQtAppsHook
     autoPatchelfHook
   ];
 
-  buildInputs = [
-    libsForQt5.qtbase
-    libqt5pas
+  buildInputs = with libsForQt5; [
+    qtbase
+    libqtpas
   ];
 
   runtimeDependencies = [
@@ -63,7 +62,7 @@ stdenv.mkDerivation rec {
     cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap
     cp -r --no-preserve=mode ${bgracontrols} bgracontrols
 
-    lazbuild --lazarusdir=${lazarus-qt}/share/lazarus \
+    lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus \
       --build-mode=ReleaseQt5 \
       bgrabitmap/bgrabitmap/bgrabitmappack.lpk \
       bgracontrols/bgracontrols.lpk \

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,15 +19,15 @@
   binutils,
   withQt ? false,
   qtbase ? null,
-  libqt5pas ? null,
+  libqtpas ? null,
   wrapQtAppsHook ? null,
 }:
 
 # TODO:
 #  1. the build date is embedded in the binary through `$I %DATE%` - we should dump that
 
 let
-  version = "3.2-0";
+  version = "3.6-0";
 
   # as of 2.0.10 a suffix is being added. That may or may not disappear and then
   # come back, so just leave this here.
@@ -43,14 +43,15 @@ let
     )
   );
 
+  qtVersion = lib.versions.major qtbase.version;
 in
 stdenv.mkDerivation rec {
   pname = "lazarus-${LCL_PLATFORM}";
   inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz";
-    sha256 = "69f43f0a10b9e09deea5f35094c73b84464b82d3f40d8a2fcfcb5a5ab03c6edf";
+    hash = "sha256-5luQNn9jvxfLe/NfW+acnvcEyklOkdjGfQcuM3P6sIU=";
   };
 
   postPatch = ''
@@ -73,7 +74,7 @@ stdenv.mkDerivation rec {
       gdk-pixbuf
     ]
     ++ lib.optionals withQt [
-      libqt5pas
+      libqtpas
       qtbase
     ];
 
@@ -94,7 +95,7 @@ stdenv.mkDerivation rec {
     "bigide"
   ];
 
-  LCL_PLATFORM = if withQt then "qt5" else "gtk2";
+  LCL_PLATFORM = if withQt then "qt${qtVersion}" else "gtk2";
 
   NIX_LDFLAGS = lib.concatStringsSep " " (
     [
@@ -113,8 +114,8 @@ stdenv.mkDerivation rec {
       "-lpango-1.0"
     ]
     ++ lib.optionals withQt [
-      "-L${lib.getLib libqt5pas}/lib"
-      "-lQt5Pas"
+      "-L${lib.getLib libqtpas}/lib"
+      "-lQt${qtVersion}Pas"
     ]
   );
 

pkgs/development/compilers/fpc/libqt5pas.nix

@@ -0,0 +1,45 @@
+{
+  stdenv,
+  lib,
+  lazarus,
+  qmake,
+  qtbase,
+  # Not in Qt6 anymore
+  qtx11extras ? null,
+}:
+
+let
+  qtVersion = lib.versions.major qtbase.version;
+in
+stdenv.mkDerivation {
+  pname = "libqtpas";
+  inherit (lazarus) version src;
+
+  sourceRoot = "lazarus/lcl/interfaces/qt${qtVersion}/cbindings";
+
+  postPatch = ''
+    substituteInPlace Qt${qtVersion}Pas.pro \
+      --replace 'target.path = $$[QT_INSTALL_LIBS]' "target.path = $out/lib"
+  '';
+
+  nativeBuildInputs = [ qmake ];
+
+  buildInputs =
+    [
+      qtbase
+    ]
+    ++ lib.optionals (qtVersion == "5") [
+      qtx11extras
+    ];
+
+  dontWrapQtApps = true;
+
+  meta = with lib; {
+    description = "Free Pascal Qt${qtVersion} binding library";
+    homepage =
+      "https://wiki.freepascal.org/Qt${qtVersion}_Interface"
+      + lib.optionalString (qtVersion == "5") "#libqt5pas";
+    maintainers = with maintainers; [ sikmir ];
+    inherit (lazarus.meta) license platforms;
+  };
+}

pkgs/development/compilers/fpc/libqtpas.nix

@@ -5,12 +5,12 @@
   stdenv,
   fetchFromGitHub,
   fpc,
-  lazarus-qt,
+  lazarus-qt5,
   wrapQtAppsHook,
   breeze-qt5,
   libGL,
   libGLU,
-  libqt5pas,
+  libqtpas,
   libX11,
   coreutils,
   git,
@@ -69,23 +69,23 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     fpc
-    lazarus-qt
+    lazarus-qt5
     wrapQtAppsHook
   ];
 
   buildInputs = [
     breeze-qt5
     libGL
     libGLU
-    libqt5pas
+    libqtpas
     libX11
   ];
 
   NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";
 
   buildPhase = ''
     runHook preBuild
-    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt}/share/lazarus -B goverlay.lpi
+    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus -B goverlay.lpi
     runHook postBuild
   '';
 

pkgs/tools/graphics/goverlay/default.nix

@@ -633,6 +633,7 @@ mapAliases {
   LASzip2 = laszip_2; # Added 2024-06-12
   latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   latinmodern-math = lmmath;
+  lazarus-qt = lazarus-qt5; # Added 2024-12-25
   leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
   ledger_agent = ledger-agent; # Added 2024-01-07
   lfs = dysk; # Added 2023-07-03
@@ -664,6 +665,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