Merge pull request #201028 from mweinelt/qtwebkit-vulnerable

This commit is contained in:
Martin Weinelt 2022-11-19 01:46:35 +01:00 committed by GitHub
commit c099aa3797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View file

@ -1,5 +1,5 @@
{ mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules
, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase
, qtquickcontrols, qttools, kde-cli-tools, qtbase
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
@ -24,7 +24,7 @@ mkDerivation rec {
];
propagatedBuildInputs = [
qtquickcontrols qtwebkit boost libkomparediff2
qtquickcontrols boost libkomparediff2
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, boost,
qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee,
qtbase, qtscript, qtquickcontrols, qtxmlpatterns, grantlee,
kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons
}:
@ -19,7 +19,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost
qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee
qtbase qtscript qtquickcontrols qtxmlpatterns grantlee
kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons
];
}

View file

@ -69,5 +69,8 @@ qtModule {
meta = {
maintainers = with lib.maintainers; [ abbradar periklis ];
knownVulnerabilities = [
"QtWebkit upstream is unmaintained and receives no security updates, see https://blogs.gnome.org/mcatanzaro/2022/11/04/stop-using-qtwebkit/"
];
};
}