From efbf00b210919fd96e8025c159718154d2683a17 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 3 Jan 2019 01:52:29 +0100 Subject: [PATCH 1/3] qt511.qtdeclarative: fix CMake `qmlcachegen` path This package contains several CMake files used for setting up its provided tools for use in other projects build with CMake. While packaging *ktouch* I found out that the ${_qt5Core_install_prefix} variable doesn't expand at all, rendering the path to the `qmlcachegen` binary useless. As a fix, the command itself is used instead of the path to the binary. (cherry picked from commit 4b76c4605ecc61e22a0fce8e90a7b2f484db7f42) --- .../libraries/qt-5/5.11/qtdeclarative.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch index 8f5b5d4790fb..cfa68eb8102c 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch @@ -18,6 +18,19 @@ index 005db4248..685c5b1b2 100644 // env import paths if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); +diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +index 56cb3fb55..74509d601 100644 +--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake ++++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) + + find_package(Qt5 COMPONENTS Qml Core) + +- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen") ++ set(compiler_path "qmlcachegen") + + get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) + diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 537eaf62e..e21de58f6 100644 --- a/tools/qmlcachegen/qmlcache.prf From 61f0e7fddf41cba88c18f0d213ac169c70f9b3be Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 3 Jan 2019 02:08:18 +0100 Subject: [PATCH 2/3] ktouch: init at 18.08.0 packaging the `ktouch` touch typing tutor. Due to Qt impurities, it needs to be installed in a profile to find it runtime dependencies. (cherry picked from commit e93bd1d4457d021312ecc42d32fa124bd4d23624) --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/ktouch.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/ktouch.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 072b66e55638..7ed161741741 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -139,6 +139,7 @@ let kruler = callPackage ./kruler.nix {}; ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; + ktouch = callPackage ./ktouch.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; libgravatar = callPackage ./libgravatar.nix {}; libkcddb = callPackage ./libkcddb.nix {}; diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix new file mode 100644 index 000000000000..75e72c0ba180 --- /dev/null +++ b/pkgs/applications/kde/ktouch.nix @@ -0,0 +1,26 @@ +{ mkDerivation, lib +, extra-cmake-modules, kdoctools +, kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n +, kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons +, kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts +, qtx11extras, qtgraphicaleffects, xorg +}: + + + mkDerivation { + name = "ktouch"; + meta = { + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.schmittlauch ]; + description = "A touch typing tutor from the KDE software collection"; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools qtdeclarative ]; + buildInputs = [ + kconfig kconfigwidgets kcoreaddons kdeclarative ki18n + kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons + kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts + qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e958ee79d7d..462c1cc2d828 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17237,7 +17237,7 @@ with pkgs; akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kpkpass kitinerary - kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; + kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; From 7b8eb4948baf5fd1a4b31db9288e2fd63a6fdfb5 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 16 Jan 2019 01:21:03 +0000 Subject: [PATCH 3/3] libjpeg-turbo: fix CVE-2018-20330 (#53950) (cherry picked from commit b0757da432ffc4b1e5b696b51ae81b36feb2d285) --- pkgs/development/libraries/libjpeg-turbo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 89763f489f0b..ebcf51dfd030 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5"; }) + (fetchpatch { + name = "CVE-2018-20330.patch"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff"; + sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji"; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ];