Merge pull request #299344 from lukaslihotzki/kile

kile: 2.9.93 -> 2.9.94

pkgs/applications/editors/kile/default.nix

@@ -1,63 +1,43 @@
-{ mkDerivation
+{ lib
-, lib
+, stdenv
 , fetchurl
-, extra-cmake-modules
+, cmake
-, kdoctools
+, kdePackages
-, wrapGAppsHook
+, qt6
-, qtscript
-, kconfig
-, kcrash
-, kdbusaddons
-, kdelibs4support
-, kguiaddons
-, kiconthemes
-, kinit
-, khtml
-, konsole
-, kparts
-, ktexteditor
-, kwindowsystem
-, okular
-, poppler
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "kile";
-  version = "2.9.93";
+  version = "2.9.94";
 
   src = fetchurl {
     url = "mirror://sourceforge/kile/kile-${version}.tar.bz2";
-    sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";
+    sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o=";
   };
 
   nativeBuildInputs = [
-    extra-cmake-modules
+    cmake
-    wrapGAppsHook
+    kdePackages.extra-cmake-modules
-    kdoctools
+    qt6.wrapQtAppsHook
+    kdePackages.kdoctools
   ];
 
   buildInputs = [
-    kconfig
+    qt6.qtbase
-    kcrash
+    qt6.qtdeclarative
-    kdbusaddons
+    qt6.qt5compat
-    kdelibs4support
+    kdePackages.kconfig
-    kguiaddons
+    kdePackages.kcrash
-    kiconthemes
+    kdePackages.kdbusaddons
-    kinit
+    kdePackages.kguiaddons
-    khtml
+    kdePackages.kiconthemes
-    kparts
+    kdePackages.konsole
-    ktexteditor
+    kdePackages.kparts
-    kwindowsystem
+    kdePackages.ktexteditor
-    okular
+    kdePackages.kwindowsystem
-    poppler
+    kdePackages.okular
-    qtscript
+    kdePackages.poppler
   ];
-  dontWrapGApps = true;
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  propagatedUserEnvPkgs = [ konsole ];
 
   meta = {
     description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment";

pkgs/top-level/all-packages.nix

@@ -32305,7 +32305,7 @@ with pkgs;
   kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; };
   kid3 = kid3-kde;
 
-  kile = libsForQt5.callPackage ../applications/editors/kile { };
+  kile = callPackage ../applications/editors/kile { };
 
   kitsas = libsForQt5.callPackage ../applications/office/kitsas { };