lol

Merge pull request #101369 from doronbehar/pkg/kdeApplications/qt515

kdeApplications: Use latest qt515 by default

authored by

Frederik Rietdijk and committed by
GitHub
54f74986 93e0a06d

+173 -120
+1 -1
nixos/modules/services/x11/desktop-managers/plasma5.nix
··· 200 200 201 201 security.wrappers = { 202 202 kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass"; 203 - start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit"; 203 + start_kdeinit.source = "${lib.getBin pkgs.kdeFrameworks.kinit}/libexec/kf5/start_kdeinit"; 204 204 kwin_wayland = { 205 205 source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; 206 206 capabilities = "cap_sys_nice+ep";
+6 -1
nixos/modules/services/x11/display-managers/sddm.nix
··· 9 9 cfg = dmcfg.sddm; 10 10 xEnv = config.systemd.services.display-manager.environment; 11 11 12 - inherit (pkgs) sddm; 12 + sddm = if config.services.xserver.desktopManager.lxqt.enable then 13 + # TODO: Move lxqt to libsForQt515 14 + pkgs.libsForQt514.sddm 15 + else 16 + pkgs.libsForQt5.sddm 17 + ; 13 18 14 19 xserverWrapper = pkgs.writeScript "xserver-wrapper" '' 15 20 #!/bin/sh
+10 -3
pkgs/applications/editors/kile/default.nix
··· 29 29 sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; 30 30 }; 31 31 32 - nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; 32 + nativeBuildInputs = [ 33 + extra-cmake-modules 34 + wrapGAppsHook 35 + kdoctools 36 + ]; 33 37 34 - propagatedBuildInputs = [ 38 + buildInputs = [ 35 39 kconfig 36 40 kcrash 37 41 kdbusaddons 38 42 kdelibs4support 39 - kdoctools 40 43 kguiaddons 41 44 kiconthemes 42 45 kinit ··· 48 51 poppler 49 52 qtscript 50 53 ]; 54 + dontWrapGApps = true; 55 + preFixup = '' 56 + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") 57 + ''; 51 58 52 59 propagatedUserEnvPkgs = [ konsole ]; 53 60
+2 -2
pkgs/applications/misc/tellico/default.nix
··· 1 1 { lib 2 2 , fetchurl 3 3 , mkDerivation 4 - , kdeApplications 4 + , libkcddb 5 5 , kinit 6 6 , kdelibs4support 7 7 , solid ··· 46 46 exempi 47 47 extra-cmake-modules 48 48 karchive 49 - kdeApplications.libkcddb 49 + libkcddb 50 50 kdelibs4support 51 51 kfilemetadata 52 52 khtml
+2 -2
pkgs/applications/networking/browsers/firefox/wrapper.nix
··· 4 4 , flashplayer, hal-flash 5 5 , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd 6 6 , gnome3/*.gnome-shell*/ 7 - , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow 7 + , browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow 8 8 , tridactyl-native 9 9 , fx_cast_bridge 10 10 , udev ··· 65 65 ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native 66 66 ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell 67 67 ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator 68 - ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration 68 + ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5.plasma-browser-integration 69 69 ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge 70 70 ++ extraNativeMessagingHosts 71 71 );
+11 -3
pkgs/data/icons/maia-icon-theme/default.nix
··· 1 - { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: 1 + { stdenv 2 + , fetchFromGitLab 3 + , cmake 4 + , extra-cmake-modules 5 + , gtk3 6 + , plasma-framework 7 + , kwindowsystem 8 + , hicolor-icon-theme 9 + }: 2 10 3 11 stdenv.mkDerivation { 4 12 pname = "maia-icon-theme"; ··· 17 25 cmake 18 26 extra-cmake-modules 19 27 gtk3 20 - kdeFrameworks.plasma-framework 21 - kdeFrameworks.kwindowsystem 28 + plasma-framework 29 + kwindowsystem 22 30 ]; 23 31 24 32 propagatedBuildInputs = [
+1 -1
pkgs/desktops/lxqt/default.nix
··· 43 43 44 44 ### OPTIONAL 45 45 qterminal = callPackage ./qterminal {}; 46 - compton-conf = pkgs.qt5.callPackage ./compton-conf {}; 46 + compton-conf = qt5.callPackage ./compton-conf {}; 47 47 obconf-qt = callPackage ./obconf-qt {}; 48 48 lximage-qt = callPackage ./lximage-qt {}; 49 49 qps = callPackage ./qps {};
-2
pkgs/desktops/plasma-5/default.nix
··· 36 36 }; 37 37 38 38 mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; 39 - qtbase = libsForQt5.callPackage ({ qtbase }: qtbase) {}; 40 39 41 40 packages = self: with self; 42 41 let ··· 83 82 setupHook = args.setupHook or defaultSetupHook; 84 83 85 84 meta = { 86 - broken = lib.versionAtLeast qtbase.version "5.15"; 87 85 license = with lib.licenses; [ 88 86 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 89 87 ];
+2 -2
pkgs/development/libraries/drumstick/default.nix
··· 1 1 { stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen 2 - , fluidsynth, pkgconfig, qt5 2 + , fluidsynth, pkgconfig, qtbase, qtsvg 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 22 22 23 23 nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ]; 24 24 buildInputs = [ 25 - alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg 25 + alsaLib doxygen fluidsynth qtbase qtsvg 26 26 ]; 27 27 28 28 meta = with stdenv.lib; {
+10 -6
pkgs/development/libraries/kdiagram/default.nix
··· 1 1 { 2 - mkDerivation, fetchurl, lib, 2 + mkDerivation, fetchFromGitLab, lib, 3 3 extra-cmake-modules, qttools, 4 4 qtbase, qtsvg, 5 5 }: 6 6 7 - mkDerivation { 8 - name = "kdiagram-2.6.0"; 9 - src = fetchurl { 10 - url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz"; 11 - sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02"; 7 + mkDerivation rec { 8 + pname = "kdiagram"; 9 + version = "2.7.0"; 10 + src = fetchFromGitLab { 11 + domain = "invent.kde.org"; 12 + owner = "graphics"; 13 + repo = pname; 14 + rev = "v${version}"; 15 + sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc="; 12 16 }; 13 17 nativeBuildInputs = [ extra-cmake-modules qttools ]; 14 18 propagatedBuildInputs = [ qtbase qtsvg ];
+2 -2
pkgs/development/libraries/kpmcore/default.nix
··· 1 1 { stdenv, lib, fetchurl, extra-cmake-modules 2 - , qtbase, kdeFrameworks 2 + , qtbase, kio 3 3 , libatasmart, parted 4 4 , utillinux }: 5 5 ··· 17 17 libatasmart 18 18 parted # we only need the library 19 19 20 - kdeFrameworks.kio 20 + kio 21 21 22 22 utillinux # needs blkid (note that this is not provided by utillinux-compat) 23 23 ];
+56
pkgs/top-level/aliases.nix
··· 752 752 753 753 ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; 754 754 755 + /* If these are in the scope of all-packages.nix, they cause collisions 756 + between mixed versions of qt. See: 757 + https://github.com/NixOS/nixpkgs/pull/101369 */ 758 + 759 + inherit (kdeFrameworks) breeze-icons oxygen-icons5; 760 + inherit (kdeApplications) 761 + akonadi akregator ark 762 + bomber bovo 763 + dolphin dragon 764 + elisa 765 + ffmpegthumbs filelight 766 + granatier gwenview 767 + k3b 768 + kaddressbook kalzium kapptemplate kapman kate katomic 769 + kblackbox kblocks kbounce 770 + kcachegrind kcalc kcharselect kcolorchooser 771 + kdenlive kdf kdialog kdiamond 772 + keditbookmarks 773 + kfind kfloppy 774 + kget kgpg 775 + khelpcenter 776 + kig kigo killbots kitinerary 777 + kleopatra klettres klines 778 + kmag kmail kmines kmix kmplot 779 + knavalbattle knetwalk knights 780 + kollision kolourpaint kompare konsole kontact korganizer 781 + kpkpass 782 + krdc kreversi krfb 783 + kshisen ksquares ksystemlog 784 + kteatime ktimer ktouch kturtle 785 + kwalletmanager kwave 786 + marble minuet 787 + okular 788 + picmi 789 + spectacle 790 + yakuake 791 + ; 792 + inherit (plasma5) 793 + bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover 794 + kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 795 + kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard 796 + kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration 797 + plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace 798 + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm 799 + systemsettings user-manager xdg-desktop-portal-kde 800 + ; 801 + inherit (plasma5.thirdParty) 802 + plasma-applet-caffeine-plus 803 + kwin-dynamic-workspaces 804 + kwin-tiling 805 + krohnkite 806 + ; 807 + inherit (libsForQt5) 808 + sddm 809 + ; 810 + 755 811 })
+70 -95
pkgs/top-level/all-packages.nix
··· 6216 6216 6217 6217 packagekit = callPackage ../tools/package-management/packagekit { }; 6218 6218 6219 - packagekit-qt = libsForQt5.callPackage ../tools/package-management/packagekit/qt.nix { }; 6220 - 6221 6219 packetdrill = callPackage ../tools/networking/packetdrill { }; 6222 6220 6223 6221 pacman = callPackage ../tools/package-management/pacman { }; ··· 8750 8748 devpi-server = callPackage ../development/tools/devpi-server {}; 8751 8749 8752 8750 dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;}; 8753 - 8754 - drumstick = callPackage ../development/libraries/drumstick { }; 8755 8751 8756 8752 ecl = callPackage ../development/compilers/ecl { }; 8757 8753 ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { }; ··· 13326 13322 let 13327 13323 mkFrameworks = import ../development/libraries/kde-frameworks; 13328 13324 attrs = { 13329 - libsForQt5 = libsForQt514; 13325 + inherit libsForQt5; 13330 13326 inherit lib fetchurl; 13331 13327 }; 13332 13328 in ··· 13340 13336 keybinder3 = callPackage ../development/libraries/keybinder3 { 13341 13337 automake = automake111x; 13342 13338 }; 13343 - 13344 - kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { }; 13345 13339 13346 13340 krb5 = callPackage ../development/libraries/kerberos/krb5.nix { 13347 13341 inherit (buildPackages.darwin) bootstrap_cmds; ··· 15138 15132 inherit llvmPackages_5; 15139 15133 }); 15140 15134 15141 - libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); 15142 - 15143 15135 qt514 = recurseIntoAttrs (makeOverridable 15144 15136 (import ../development/libraries/qt-5/5.14) { 15145 15137 inherit newScope; ··· 15170 15162 inherit llvmPackages_5; 15171 15163 }); 15172 15164 15165 + libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); 15166 + 15173 15167 libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); 15174 15168 15175 15169 libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); ··· 15196 15190 kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt 15197 15191 networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet 15198 15192 syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose 15199 - kcontacts kquickcharts kdoctools kapidox; 15193 + kcontacts kquickcharts kdoctools kapidox kdesu kinit kded frameworkintegration 15194 + kdewebkit breeze-icons 15195 + ; 15200 15196 15201 15197 ### KDE PLASMA 5 15202 15198 15203 15199 inherit (plasma5.override { libsForQt5 = self; }) 15204 - kdecoration khotkeys libkscreen libksysguard; 15200 + kdecoration khotkeys libkscreen libksysguard bluedevil 15201 + breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover kactivitymanagerd 15202 + kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit 15203 + kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration 15204 + kwin kwrited milou oxygen plasma-browser-integration plasma-desktop 15205 + plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace 15206 + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm 15207 + systemsettings user-manager xdg-desktop-portal-kde 15208 + ; 15209 + 15210 + inherit ((plasma5.override { libsForQt5 = self; }).thirdParty) 15211 + plasma-applet-caffeine-plus kwin-dynamic-workspaces kwin-tiling krohnkite 15212 + ; 15205 15213 15206 15214 ### KDE APPLICATIONS 15207 15215 15208 15216 inherit (kdeApplications.override { libsForQt5 = self; }) 15209 - libkdcraw libkexiv2 libkipi libkomparediff2 libksane; 15217 + libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts 15218 + akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface 15219 + kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight 15220 + granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic 15221 + kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser 15222 + kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter 15223 + kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot 15224 + knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer 15225 + kpkpass krdc kreversi krfb kshisen ksquares ksystemlog kteatime ktimer ktouch kturtle 15226 + kwalletmanager kwave marble minuet okular picmi spectacle yakuake 15227 + ; 15210 15228 15211 15229 ### LIBRARIES 15212 15230 ··· 15218 15236 15219 15237 dxflib = callPackage ../development/libraries/dxflib {}; 15220 15238 15239 + drumstick = callPackage ../development/libraries/drumstick { }; 15240 + 15221 15241 fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; 15222 15242 15223 15243 qgpgme = callPackage ../development/libraries/gpgme { }; ··· 15229 15249 kdiagram = callPackage ../development/libraries/kdiagram { }; 15230 15250 15231 15251 kdsoap = callPackage ../development/libraries/kdsoap { }; 15252 + 15253 + kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; 15232 15254 15233 15255 kproperty = callPackage ../development/libraries/kproperty { }; 15234 15256 ··· 15249 15271 liblastfm = callPackage ../development/libraries/liblastfm { }; 15250 15272 15251 15273 libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; 15274 + 15275 + packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; 15252 15276 15253 15277 libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; 15254 15278 ··· 15320 15344 15321 15345 qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; 15322 15346 15347 + # Not a library, but we do want it to be built for every qt version there 15348 + # is, to allow users to choose the right build if needed. 15349 + sddm = callPackage ../applications/display-managers/sddm { }; 15323 15350 }; 15324 15351 15325 15352 qtEnv = qt5.env; ··· 18970 18997 18971 18998 brise = callPackage ../data/misc/brise { }; 18972 18999 18973 - inherit (kdeFrameworks) breeze-icons; 18974 - 18975 19000 cacert = callPackage ../data/misc/cacert { }; 18976 19001 18977 19002 caladea = callPackage ../data/fonts/caladea {}; ··· 19137 19162 19138 19163 fira-mono = callPackage ../data/fonts/fira-mono { }; 19139 19164 19140 - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { }; 19165 + flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { 19166 + inherit (kdeFrameworks) breeze-icons; 19167 + }; 19141 19168 19142 19169 font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; 19143 19170 font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; ··· 19296 19323 19297 19324 luculent = callPackage ../data/fonts/luculent { }; 19298 19325 19299 - luna-icons = callPackage ../data/icons/luna-icons { }; 19326 + luna-icons = callPackage ../data/icons/luna-icons { 19327 + inherit (kdeFrameworks) breeze-icons; 19328 + }; 19300 19329 19301 - maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; 19330 + maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; 19302 19331 19303 19332 mailcap = callPackage ../data/misc/mailcap { }; 19304 19333 ··· 19417 19446 19418 19447 oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; 19419 19448 19420 - inherit (kdeFrameworks) oxygen-icons5; 19421 - 19422 19449 paper-gtk-theme = callPackage ../data/themes/paper-gtk { }; 19423 19450 19424 19451 paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; 19425 19452 19426 - papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; 19453 + papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { 19454 + inherit (kdeFrameworks) breeze-icons; 19455 + }; 19427 19456 19428 - papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { }; 19457 + papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { 19458 + inherit (kdeFrameworks) breeze-icons; 19459 + }; 19429 19460 19430 19461 papis = with python3Packages; toPythonApplication papis; 19431 19462 ··· 19455 19486 19456 19487 pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; 19457 19488 19458 - pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; 19489 + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { 19490 + inherit (kdeFrameworks) breeze-icons; 19491 + }; 19459 19492 19460 19493 posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; 19461 19494 ··· 19735 19768 19736 19769 yaru-theme = callPackage ../data/themes/yaru {}; 19737 19770 19738 - zafiro-icons = callPackage ../data/icons/zafiro-icons { }; 19771 + zafiro-icons = callPackage ../data/icons/zafiro-icons { 19772 + inherit (kdeFrameworks) breeze-icons; 19773 + }; 19739 19774 19740 19775 zeal = libsForQt514.callPackage ../data/documentation/zeal { }; 19741 19776 ··· 20116 20151 calibre = calibre-py3; 20117 20152 20118 20153 calligra = libsForQt514.callPackage ../applications/office/calligra { 20119 - inherit (kdeApplications) akonadi-calendar akonadi-contacts; 20120 20154 openjpeg = openjpeg_1; 20121 - poppler = poppler_0_61; 20155 + poppler = poppler_0_61.override { 20156 + qt5Support = true; 20157 + # Must be using the same qt version as calligra itself. 20158 + qtbase = qt514.qtbase; 20159 + }; 20122 20160 }; 20123 20161 20124 20162 perkeep = callPackage ../applications/misc/perkeep { }; ··· 21694 21732 let 21695 21733 mkApplications = import ../applications/kde; 21696 21734 attrs = { 21697 - libsForQt5 = libsForQt514; 21735 + inherit libsForQt5; 21698 21736 inherit lib fetchurl; 21699 21737 inherit okteta; 21700 21738 }; 21701 21739 in 21702 21740 recurseIntoAttrs (makeOverridable mkApplications attrs); 21703 21741 21704 - inherit (kdeApplications) 21705 - akonadi akregator ark 21706 - bomber bovo 21707 - dolphin dragon 21708 - elisa 21709 - ffmpegthumbs filelight 21710 - granatier gwenview 21711 - k3b 21712 - kaddressbook kalzium kapptemplate kapman kate katomic 21713 - kblackbox kblocks kbounce 21714 - kcachegrind kcalc kcharselect kcolorchooser 21715 - kdeconnect-kde kdenlive kdf kdialog kdiamond 21716 - keditbookmarks 21717 - kfind kfloppy 21718 - kget kgpg 21719 - khelpcenter 21720 - kig kigo killbots kitinerary 21721 - kleopatra klettres klines 21722 - kmag kmail kmines kmix kmplot 21723 - knavalbattle knetwalk knights 21724 - kollision kolourpaint kompare konsole kontact korganizer 21725 - kpkpass 21726 - krdc kreversi krfb 21727 - kshisen ksquares ksystemlog 21728 - kteatime ktimer ktouch kturtle 21729 - kwalletmanager kwave 21730 - marble minuet 21731 - okular 21732 - picmi 21733 - spectacle 21734 - yakuake; 21735 - 21736 21742 okteta = libsForQt5.callPackage ../applications/editors/okteta { }; 21737 21743 21738 21744 k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; 21739 - 21740 - inherit (kdeFrameworks) kdesu; 21741 21745 21742 21746 kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; 21743 21747 ··· 21776 21780 21777 21781 kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; 21778 21782 21779 - kile = libsForQt514.callPackage ../applications/editors/kile { }; 21783 + kile = libsForQt5.callPackage ../applications/editors/kile { }; 21780 21784 21781 21785 kino = callPackage ../applications/video/kino { 21782 21786 inherit (gnome2) libglade; ··· 21791 21795 21792 21796 kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; 21793 21797 21794 - kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { 21795 - inherit (kdeApplications) kidentitymanagement; 21796 - inherit (kdeFrameworks) kdewebkit; 21797 - }; 21798 + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; 21798 21799 21799 21800 kodestudio = callPackage ../applications/editors/kodestudio { }; 21800 21801 ··· 23489 23490 23490 23491 robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; 23491 23492 23492 - sddm = libsForQt514.callPackage ../applications/display-managers/sddm { }; 23493 - 23494 23493 skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; 23495 23494 23496 23495 smartgithg = callPackage ../applications/version-management/smartgithg { ··· 23871 23870 23872 23871 tribler = callPackage ../applications/networking/p2p/tribler { }; 23873 23872 23874 - trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { 23875 - inherit (kdeApplications) akonadi-contacts; 23876 - }; 23873 + trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { }; 23877 23874 23878 23875 tudu = callPackage ../applications/office/tudu { }; 23879 23876 ··· 24690 24687 zam-plugins = callPackage ../applications/audio/zam-plugins { }; 24691 24688 24692 24689 zanshin = libsForQt514.callPackage ../applications/office/zanshin { 24693 - inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; 24694 - inherit (kdeFrameworks) krunner kwallet kcalendarcore; 24695 24690 boost = boost160; 24696 24691 }; 24697 24692 ··· 25033 25028 dhewm3 = callPackage ../games/dhewm3 {}; 25034 25029 25035 25030 digikam = libsForQt514.callPackage ../applications/graphics/digikam { 25036 - inherit (plasma5) oxygen; 25037 - inherit (kdeApplications) akonadi-contacts; 25038 - inherit (kdeFrameworks) kcalendarcore; 25039 25031 opencv3 = opencv3WithoutCuda; 25040 25032 }; 25041 25033 ··· 25911 25903 lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); 25912 25904 25913 25905 lxqt = recurseIntoAttrs (import ../desktops/lxqt { 25906 + # TODO: Update these to qt515 at some point. When doing it, please remove 25907 + # the choice of libsForQt5*.sddm in sddm's module. 25914 25908 qt5 = qt514; 25915 25909 libsForQt5 = libsForQt514; 25916 25910 inherit pkgs; ··· 25949 25943 let 25950 25944 mkPlasma5 = import ../desktops/plasma-5; 25951 25945 attrs = { 25952 - libsForQt5 = libsForQt514; 25946 + inherit libsForQt5; 25953 25947 inherit lib fetchurl; 25954 25948 gconf = gnome2.GConf; 25955 25949 inherit gsettings-desktop-schemas; 25956 25950 }; 25957 25951 in 25958 25952 recurseIntoAttrs (makeOverridable mkPlasma5 attrs); 25959 - 25960 - inherit (kdeFrameworks) kded kinit frameworkintegration; 25961 - 25962 - inherit (plasma5) 25963 - bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover 25964 - kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 25965 - kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard 25966 - kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration 25967 - plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace 25968 - plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm 25969 - systemsettings user-manager xdg-desktop-portal-kde; 25970 - 25971 - inherit (plasma5.thirdParty) 25972 - plasma-applet-caffeine-plus 25973 - kwin-dynamic-workspaces 25974 - kwin-tiling 25975 - krohnkite; 25976 - 25977 - ### SCIENCE 25978 25953 25979 25954 ### SCIENCE/CHEMISTY 25980 25955