From b31a63d2e50ab96ad5f063568a292e2b44a162d6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 05:59:45 -0600 Subject: [PATCH 01/25] pinentry_qt5: build with C++11 for Qt 5.7 --- pkgs/tools/security/pinentry/qt5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix index 18648633a09..375187a5146 100644 --- a/pkgs/tools/security/pinentry/qt5.nix +++ b/pkgs/tools/security/pinentry/qt5.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { (mkEnable true "pinentry-qt") ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + nativeBuildInputs = [ pkgconfig ]; meta = { From a0b0dd2a3255a69b0208fd8453db99754534d080 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 06:01:12 -0600 Subject: [PATCH 02/25] modemmanager-qt: mark broken on Qt 5.5 --- .../development/libraries/kde-frameworks/modemmanager-qt.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index b4d05678dc2..ea2e112ff67 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -5,7 +5,10 @@ kdeFramework { name = "modemmanager-qt"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ modemmanager ]; From e7b2300a0c88edd981e44c7a1c4257970702b365 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 06:01:52 -0600 Subject: [PATCH 03/25] threadweaver: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/threadweaver.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index bf36a21e9ec..4df3ff510cb 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -4,7 +4,10 @@ kdeFramework { name = "threadweaver"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From 3acf24e67ec030f2687af9d91fb24141a6bbb541 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:35:52 -0600 Subject: [PATCH 04/25] networkmanager-qt: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/networkmanager-qt.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 9d765eac95c..80085bb2072 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -5,7 +5,10 @@ kdeFramework { name = "networkmanager-qt"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ networkmanager ]; From e5283531c4b1a0baacf2178b408c774d8ea48536 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:36:54 -0600 Subject: [PATCH 05/25] kdnssd: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kdnssd.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index ad86b660c74..18a435139f6 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -5,7 +5,10 @@ kdeFramework { name = "kdnssd"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ avahi ]; buildInputs = [ qtbase ]; From 5f372535cda5d6fe1820b32aa9854184c5e3760d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:37:22 -0600 Subject: [PATCH 06/25] kidletime: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kidletime.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 758260517e7..bfec344ca11 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -6,7 +6,10 @@ kdeFramework { name = "kidletime"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qtx11extras ]; } From fca36b617d2d62336735a6a9692f88513eaff826 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:38:57 -0600 Subject: [PATCH 07/25] ipe: build with C++11 for Qt 5.7 --- pkgs/applications/graphics/ipe/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index c1c1861cd3d..4a99d0ea4a1 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sed -i -e 's/install -s/install/' common.mak || die ''; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; # build with Qt 5.7 + IPEPREFIX="$$out"; URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; LUA_PACKAGE = "lua"; From e77114e72bc90e0d86ddd5b38bd0d723f9aba4aa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:40:01 -0600 Subject: [PATCH 08/25] kitemmodels: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kitemmodels.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index d6538e57698..e2f0633da8c 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -4,7 +4,10 @@ kdeFramework { name = "kitemmodels"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From 29d0bf7434ba3faa49ef97b6959485a096704a5c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:40:40 -0600 Subject: [PATCH 09/25] kplotting: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kplotting.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 3fa8283d06c..e132a45976f 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -4,7 +4,10 @@ kdeFramework { name = "kplotting"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From 34df5c5684f87284ccf4ba16ad558d0721da515d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:41:16 -0600 Subject: [PATCH 10/25] bluez-qt: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/bluez-qt.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 93c945b58ca..261d9471a77 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -1,11 +1,14 @@ { kdeFramework, lib , extra-cmake-modules -, qtdeclarative +, qtbase, qtdeclarative }: kdeFramework { name = "bluez-qt"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtdeclarative ]; preConfigure = '' From 78b6a1ad141df4b92b9a9aa226ccfc573b7ce6fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:41:58 -0600 Subject: [PATCH 11/25] kwayland: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/kwayland.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index b5255022a86..d34687def3e 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,15 +1,16 @@ -{ kdeFramework -, extra-cmake-modules -, qtbase, wayland +{ + kdeFramework, lib, + extra-cmake-modules, + qtbase, wayland }: kdeFramework { name = "kwayland"; - nativeBuildInputs = [ - extra-cmake-modules - ]; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; - propagatedBuildInputs = [ - wayland - ]; + propagatedBuildInputs = [ wayland ]; } From e1bd5c96ea501aa837aa0e8b21a3eac3c13f9655 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:42:31 -0600 Subject: [PATCH 12/25] syntax-highlighting: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/syntax-highlighting.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index 155e9fb8961..f199321e674 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -4,7 +4,10 @@ kdeFramework { name = "syntax-highlighting"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules perl qttools ]; buildInputs = [ qtbase ]; } From 6ddaa3f7461c914dcccb66749a909083ed87f251 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:43:04 -0600 Subject: [PATCH 13/25] solid: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/solid.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index 330b64035a1..d32acf598eb 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,12 +1,15 @@ { kdeFramework, lib, bison, extra-cmake-modules, flex, - qtdeclarative, qttools + qtbase, qtdeclarative, qttools }: kdeFramework { name = "solid"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ bison extra-cmake-modules flex qttools ]; propagatedBuildInputs = [ qtdeclarative ]; } From be580f91d8a3395d0baa8c2603cad572894e57ba Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:43:32 -0600 Subject: [PATCH 14/25] kcodecs: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kcodecs.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 482c30b7b57..fa1679519cc 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -2,7 +2,10 @@ kdeFramework { name = "kcodecs"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; } From ffa8be8a0a66e7a721d1b1b9b2bd7b94e34f2512 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:44:16 -0600 Subject: [PATCH 15/25] kguiaddons: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/kguiaddons.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 6ebfd1104f7..f93aa0967f6 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,11 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras +{ + kdeFramework, lib, + extra-cmake-modules, + qtbase, qtx11extras, }: kdeFramework { name = "kguiaddons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtx11extras ]; } From c1630b533770dd7c499aecb742239f13ad34699a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:44:43 -0600 Subject: [PATCH 16/25] kdbusaddons: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kdbusaddons.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index bc5aeff556d..2bbbf65f898 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,8 +1,11 @@ -{ kdeFramework, lib, extra-cmake-modules, qttools, qtx11extras }: +{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }: kdeFramework { name = "kdbusaddons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtx11extras ]; } From 420884558334bf3b0826d3178b8c3b9ae94ffad8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:45:09 -0600 Subject: [PATCH 17/25] kitemviews: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kitemviews.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index f114c007038..df420f8f4b9 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -4,7 +4,10 @@ kdeFramework { name = "kitemviews"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; } From eb340b5753b2d3820f52f6a2e23b96bbec6f1685 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:46:08 -0600 Subject: [PATCH 18/25] ki18n: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/ki18n.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 2698a97fd33..68f29c8314f 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,15 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, gettext -, python -, qtdeclarative -, qtscript +{ + kdeFramework, lib, + extra-cmake-modules, gettext, python, + qtbase, qtdeclarative, qtscript, }: kdeFramework { name = "ki18n"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtdeclarative qtscript ]; propagatedNativeBuildInputs = [ gettext python ]; + propagatedBuildInputs = [ qtdeclarative qtscript ]; } From 49f554aae005f825eda28890e78120ffbab78fe7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:46:35 -0600 Subject: [PATCH 19/25] kcoreaddons: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index f5d04a30b1a..4d35c0bbdea 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -2,7 +2,10 @@ kdeFramework { name = "kcoreaddons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ shared_mime_info ]; From b682464f4e0eba3111f2b5fe0ea14a3d4923ce5d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:47:07 -0600 Subject: [PATCH 20/25] kwidgetsaddons: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index c5c0063c463..ce16e280faa 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -4,7 +4,10 @@ kdeFramework { name = "kwidgetsaddons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; } From 9cd0754191fb91024b91e19fabefc02004437fd8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:47:29 -0600 Subject: [PATCH 21/25] karchive: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/karchive.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index ca3321bef84..71561b1109c 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -2,7 +2,10 @@ kdeFramework { name = "karchive"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From a8cc6d909b4e571fe8a5ea2e036ee9d86e8165d4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:47:53 -0600 Subject: [PATCH 22/25] kconfig: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/kconfig.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 981256e75bf..f6d38cd2336 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -2,7 +2,10 @@ kdeFramework { name = "kconfig"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase ]; } From a821be7a0646adbb5c14dc94b0ace74992cad8f6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:48:14 -0600 Subject: [PATCH 23/25] sonnet: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/sonnet.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 190f2bae1b8..ae3e72e2a46 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -5,7 +5,10 @@ kdeFramework { name = "sonnet"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ hunspell qtbase ]; } From a7d3a084b901bf8128da7e8b196c581827aef26b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:48:43 -0600 Subject: [PATCH 24/25] attica: mark broken on Qt 5.5 --- pkgs/development/libraries/kde-frameworks/attica.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 6533a05b160..6c120c20d3a 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -2,7 +2,10 @@ kdeFramework { name = "attica"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; } From cff0e06ed70be6115a98551234e80f2516f20aa1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 28 Feb 2017 07:49:25 -0600 Subject: [PATCH 25/25] kwindowsystem: mark broken on Qt 5.5 --- .../libraries/kde-frameworks/kwindowsystem.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix index e55c4021b9e..4bfd813ff93 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix @@ -1,11 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qttools, qtx11extras +{ + kdeFramework, lib, + extra-cmake-modules, + qtbase, qttools, qtx11extras }: kdeFramework { name = "kwindowsystem"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + broken = builtins.compareVersions qtbase.version "5.6.0" < 0; + }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtx11extras ]; }