Merge branch 'kde-frameworks-5.18'

This commit is contained in:
Thomas Tuegel 2016-01-10 14:10:59 -06:00
commit 521817fd76
98 changed files with 642 additions and 684 deletions

View File

@ -1,25 +0,0 @@
From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 28 Jan 2015 07:15:30 -0600
Subject: [PATCH 1/2] allow external paths
---
src/kpackage/package.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
index 539b21a..977a026 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate()
: QSharedData(),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{
--
2.5.2

View File

@ -1,39 +0,0 @@
From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:50:28 -0500
Subject: [PATCH 2/2] qdiriterator follow symlinks
---
src/kpackage/packageloader.cpp | 2 +-
src/kpackage/private/packagejobthread.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
index eb5ed47..94217f6 100644
--- a/src/kpackage/packageloader.cpp
+++ b/src/kpackage/packageloader.cpp
@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
} else {
//qDebug() << "Not cached";
// If there's no cache file, fall back to listing the directory
- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop"));
QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
index ca523b3..1cfa792 100644
--- a/src/kpackage/private/packagejobthread.cpp
+++ b/src/kpackage/private/packagejobthread.cpp
@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest)
QJsonArray plugins;
int i = 0;
- QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
it.next();
const QString path = it.fileInfo().absoluteFilePath();
--
2.5.2

View File

@ -1,18 +0,0 @@
{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig
, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript
, qtxmlpatterns, sonnet
}:
kdeFramework {
name = "ktexteditor";
nativeBuildInputs = [ extra-cmake-modules perl ];
buildInputs = [
karchive kconfig kguiaddons kiconthemes kparts qtscript
qtxmlpatterns
];
propagatedBuildInputs = [ ki18n kio sonnet ];
patches = [ ./0001-no-qcoreapplication.patch ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@ -1,565 +0,0 @@
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
attica = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/attica-5.17.0.tar.xz";
sha256 = "0n5f8754705ga3s158nn56haakajcpx7hms3pjn32jc1n95h06nf";
name = "attica-5.17.0.tar.xz";
};
};
baloo = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/baloo-5.17.0.tar.xz";
sha256 = "01gkn69i63ppjrswpqw1vdfc590vn4xlld1zmjzprbfs2ryni2k0";
name = "baloo-5.17.0.tar.xz";
};
};
bluez-qt = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/bluez-qt-5.17.0.tar.xz";
sha256 = "1jh60gs2lqwg1x609lh3lrgqjfg179r40j59wgmzrm5bfvc5zsk5";
name = "bluez-qt-5.17.0.tar.xz";
};
};
breeze-icons = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/breeze-icons-5.17.0.tar.xz";
sha256 = "120x15mps8gy4c4vzrcwvfcmjv7qka7q92lyqk76g70v6yh29q84";
name = "breeze-icons-5.17.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/extra-cmake-modules-5.17.0.tar.xz";
sha256 = "01blad3rwffsgd21xkkk653kbqv2gvh0ckmvpil9x9fc0w7gwmqs";
name = "extra-cmake-modules-5.17.0.tar.xz";
};
};
frameworkintegration = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/frameworkintegration-5.17.0.tar.xz";
sha256 = "1f8clq6wszb74qal6402r66izansn9cz1x5j13v8ajwqb7rr8gvl";
name = "frameworkintegration-5.17.0.tar.xz";
};
};
kactivities = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kactivities-5.17.0.tar.xz";
sha256 = "0lnx3kbgna9pq1bdzzygng0l7rkwyvr2gkxm5abhbw290dvq0xas";
name = "kactivities-5.17.0.tar.xz";
};
};
kapidox = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kapidox-5.17.0.tar.xz";
sha256 = "1cd32n36w8hfggng61m50jflb9lpv4ba74aq1g64c1grbfjad3k1";
name = "kapidox-5.17.0.tar.xz";
};
};
karchive = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/karchive-5.17.0.tar.xz";
sha256 = "1ry7vwgc1np9pw1b8791lji09n1y6afyifqlv112riifq7ljmld1";
name = "karchive-5.17.0.tar.xz";
};
};
kauth = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kauth-5.17.0.tar.xz";
sha256 = "0v7vgh4hmfk3h3083jwx3n11xz22j6vn50naffzwwixqlrqa7qy3";
name = "kauth-5.17.0.tar.xz";
};
};
kbookmarks = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kbookmarks-5.17.0.tar.xz";
sha256 = "0rk70ag21lpym9lw4dd9rlq77lfi2v2y076g6000hhrqjnvdbcya";
name = "kbookmarks-5.17.0.tar.xz";
};
};
kcmutils = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kcmutils-5.17.0.tar.xz";
sha256 = "176b8ai490ipc1p8zqzi3ymsqzazb7awgnrd81b4fr3fzcm3q8zh";
name = "kcmutils-5.17.0.tar.xz";
};
};
kcodecs = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kcodecs-5.17.0.tar.xz";
sha256 = "12nic57sx69zvj9ihw3ifiwnf9giqq57kgp892kcz5q42wjqzvj3";
name = "kcodecs-5.17.0.tar.xz";
};
};
kcompletion = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kcompletion-5.17.0.tar.xz";
sha256 = "0d8mx3kr29lp1fk0n8pmmzlzrw9fa3czayn46xdwf1dr2pjj4a2g";
name = "kcompletion-5.17.0.tar.xz";
};
};
kconfig = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kconfig-5.17.0.tar.xz";
sha256 = "1kdagw6wisqnfj6iq77r0nkc04cvhj4n454s3w3az0bhk23b4nrj";
name = "kconfig-5.17.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kconfigwidgets-5.17.0.tar.xz";
sha256 = "0fvrk5ap4lr8i2nlphsy3z7kv39h28v33yja2r54pa4207kq4cy2";
name = "kconfigwidgets-5.17.0.tar.xz";
};
};
kcoreaddons = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kcoreaddons-5.17.0.tar.xz";
sha256 = "0pd6siicagcjd4vbn30rhrlwy6r3iiyjpl2pim1njr6fvsb0687n";
name = "kcoreaddons-5.17.0.tar.xz";
};
};
kcrash = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kcrash-5.17.0.tar.xz";
sha256 = "0v1v4ksfswc3fg7piqiw0fln30vilk5pbqq2wphbwbgn5im91m7d";
name = "kcrash-5.17.0.tar.xz";
};
};
kdbusaddons = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kdbusaddons-5.17.0.tar.xz";
sha256 = "1n4k97206v7hdkrd2p8vhy1bnr194zvamw3vpvhfxgq4pr4a96dm";
name = "kdbusaddons-5.17.0.tar.xz";
};
};
kdeclarative = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kdeclarative-5.17.0.tar.xz";
sha256 = "12p5dkdww32d5gk71aw7x5xpa3gj1ag60vj17b9v3zmax0a2g84k";
name = "kdeclarative-5.17.0.tar.xz";
};
};
kded = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kded-5.17.0.tar.xz";
sha256 = "1sly9dviv0q99045p13xswjr78x2x5fzwj4qad66w6cyv67i0khk";
name = "kded-5.17.0.tar.xz";
};
};
kdelibs4support = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/portingAids/kdelibs4support-5.17.0.tar.xz";
sha256 = "03i7r60zjd10cam0q0kld0x43a8fn281bgn25fysw7604f92x7rx";
name = "kdelibs4support-5.17.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kdesignerplugin-5.17.0.tar.xz";
sha256 = "0v47sia41gsf9gaf5jgvfgf2wzszfa76abzplqrmlgvrymi1fk1z";
name = "kdesignerplugin-5.17.0.tar.xz";
};
};
kdesu = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kdesu-5.17.0.tar.xz";
sha256 = "188k34x4z1s948f3qdy4c5pascdzshrqnbsx0ppnjlgxhv8sx108";
name = "kdesu-5.17.0.tar.xz";
};
};
kdewebkit = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kdewebkit-5.17.0.tar.xz";
sha256 = "1p3nanp1i09hpxp9gfvjyqcrfjf7ypxpfhpd381az96pjs35dixc";
name = "kdewebkit-5.17.0.tar.xz";
};
};
kdnssd = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kdnssd-5.17.0.tar.xz";
sha256 = "05njhdpmp28c46271laxjy87v6miwzf7xm1886b9q0v47cpin2p1";
name = "kdnssd-5.17.0.tar.xz";
};
};
kdoctools = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kdoctools-5.17.0.tar.xz";
sha256 = "0qbzj68rfg9xc3nabhrnaqm9ysgbrdhdgm8ag64ixk6b4x6hjmr8";
name = "kdoctools-5.17.0.tar.xz";
};
};
kemoticons = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kemoticons-5.17.0.tar.xz";
sha256 = "0cxzjfsl1ph3nl6ycsgyaz22rb4nc15n2glcgnmrqchh67xxzv13";
name = "kemoticons-5.17.0.tar.xz";
};
};
kfilemetadata = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kfilemetadata-5.17.0.tar.xz";
sha256 = "1a6865v1cz31i8a63hhjzp1lw5b78p0r7ypml6syxlblpg2y9mzh";
name = "kfilemetadata-5.17.0.tar.xz";
};
};
kglobalaccel = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kglobalaccel-5.17.0.tar.xz";
sha256 = "0dm8xljqgxay98dcqdgvmhcf0fanv3iiw23nk4vyzis6n8nv04hz";
name = "kglobalaccel-5.17.0.tar.xz";
};
};
kguiaddons = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kguiaddons-5.17.0.tar.xz";
sha256 = "1r15ll4c27zp78p9i18izxrpmf41hynz16z0fmz8jgcdnxgx0d74";
name = "kguiaddons-5.17.0.tar.xz";
};
};
khtml = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/portingAids/khtml-5.17.0.tar.xz";
sha256 = "0mz5mb7mh2nxih2avy2ncmchlyzg8pignnl4lbr5cnfc7y79g7i4";
name = "khtml-5.17.0.tar.xz";
};
};
ki18n = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/ki18n-5.17.0.tar.xz";
sha256 = "07chysr2x579ll6qwxmirmcy5b06wf0578l8xmvgc9q4wk0m0m73";
name = "ki18n-5.17.0.tar.xz";
};
};
kiconthemes = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kiconthemes-5.17.0.tar.xz";
sha256 = "1fgwgwmrb0pav30s7wc30src92cvfw6cxqz2q14n5flz7kg1d0k3";
name = "kiconthemes-5.17.0.tar.xz";
};
};
kidletime = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kidletime-5.17.0.tar.xz";
sha256 = "06ig3wca3k1kdq0w1pl5syvcgrrshyws6xal7qswr6vsf6jd7n95";
name = "kidletime-5.17.0.tar.xz";
};
};
kimageformats = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kimageformats-5.17.0.tar.xz";
sha256 = "0dw007wc50fhgpm1sv8qxs3y8xwwgcz33nd8p7yg8bxqfgjmhzbs";
name = "kimageformats-5.17.0.tar.xz";
};
};
kinit = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kinit-5.17.0.tar.xz";
sha256 = "18agcc5z8g0vsk97wh4p09185m5vz52wdsia7rg8f5fb4wkzrn5i";
name = "kinit-5.17.0.tar.xz";
};
};
kio = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kio-5.17.0.tar.xz";
sha256 = "1dfh2kbp00kv5b94p4xjimh4fhlwmcgac7wsi1g2pvrbw7gsi48l";
name = "kio-5.17.0.tar.xz";
};
};
kitemmodels = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kitemmodels-5.17.0.tar.xz";
sha256 = "19zq1d7ymfzlz3nx4a9hvlfssa7x0rdh8pg8i9rchalals6239ny";
name = "kitemmodels-5.17.0.tar.xz";
};
};
kitemviews = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kitemviews-5.17.0.tar.xz";
sha256 = "1k3f1j3sw86jl5y3ak767ldb2fraspldjh6i98926wingqq3y8p3";
name = "kitemviews-5.17.0.tar.xz";
};
};
kjobwidgets = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kjobwidgets-5.17.0.tar.xz";
sha256 = "02j7fm0g0dc6grvgjhx269b5p4xil7k8z1m8amkjpc7v3j3vkyrw";
name = "kjobwidgets-5.17.0.tar.xz";
};
};
kjs = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/portingAids/kjs-5.17.0.tar.xz";
sha256 = "0988qcgiqc4mla3x12mb8xaw0mhy2kmdi94xw634az03mwghljh4";
name = "kjs-5.17.0.tar.xz";
};
};
kjsembed = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/portingAids/kjsembed-5.17.0.tar.xz";
sha256 = "0am27pdc2pdjisc82iinq68lw8r12a0zb9n6ywa1mlqbrvr5sqgs";
name = "kjsembed-5.17.0.tar.xz";
};
};
kmediaplayer = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/portingAids/kmediaplayer-5.17.0.tar.xz";
sha256 = "1idzbddyfrf05kbqqm1hcyy53qrnvg9sb0f29rqp33mq36y63rxg";
name = "kmediaplayer-5.17.0.tar.xz";
};
};
knewstuff = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/knewstuff-5.17.0.tar.xz";
sha256 = "1ljr1syg7810ww0wlqq2p7xdqn9sfz7kkxr8vdw4627gjqr50l5s";
name = "knewstuff-5.17.0.tar.xz";
};
};
knotifications = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/knotifications-5.17.0.tar.xz";
sha256 = "0k2g0vmlhandp9zihj5sbs06yanmpy06h2pq5d2hn569anvpxr0r";
name = "knotifications-5.17.0.tar.xz";
};
};
knotifyconfig = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/knotifyconfig-5.17.0.tar.xz";
sha256 = "1lfa23vag5j294ry5c0n59rs04k1mb5yr7vi69al2pw6xmnkbw6n";
name = "knotifyconfig-5.17.0.tar.xz";
};
};
kpackage = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kpackage-5.17.0.tar.xz";
sha256 = "03z3hcibzkzymva935gx39bbrl61jw8wnxqxh2f56z7qmm7sj9x7";
name = "kpackage-5.17.0.tar.xz";
};
};
kparts = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kparts-5.17.0.tar.xz";
sha256 = "08dh17z5345gmvaacrllpx9zdfayndfxl8ykhzpp3gvx0ssrswwx";
name = "kparts-5.17.0.tar.xz";
};
};
kpeople = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kpeople-5.17.0.tar.xz";
sha256 = "0d7j2j92r2iwkabnqm6f6wm5d4j69r4z1859pc9l4rhh4f0qy9g3";
name = "kpeople-5.17.0.tar.xz";
};
};
kplotting = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kplotting-5.17.0.tar.xz";
sha256 = "0i8gcvf2fiaxxqjan1lil9is8v5bfd4yi9zyl7bzijcishckrkmx";
name = "kplotting-5.17.0.tar.xz";
};
};
kpty = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kpty-5.17.0.tar.xz";
sha256 = "1csgwp9y33sfgzn4mwinqznfmsd2cm1iia6qm0xpmf8n39rassxc";
name = "kpty-5.17.0.tar.xz";
};
};
kross = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/portingAids/kross-5.17.0.tar.xz";
sha256 = "0bjkp8ibaw1zr71dbfz09qbaragmzh3slyp8mm6ypaixgfvprklx";
name = "kross-5.17.0.tar.xz";
};
};
krunner = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/portingAids/krunner-5.17.0.tar.xz";
sha256 = "0ghxbmkpi20kbrsn6kib3na3gdnsn5akfzazfwh8q00dhabhin4k";
name = "krunner-5.17.0.tar.xz";
};
};
kservice = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kservice-5.17.0.tar.xz";
sha256 = "0nz46n6yj3h6ml0gvn2j7malvxn4p96q9xh9f2i7j1jwl3c5j4b8";
name = "kservice-5.17.0.tar.xz";
};
};
ktexteditor = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/ktexteditor-5.17.0.tar.xz";
sha256 = "16shf6zq019pmg8avnlvn4l5w71h4y6v3511rckn8kqdrz3wb4pr";
name = "ktexteditor-5.17.0.tar.xz";
};
};
ktextwidgets = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/ktextwidgets-5.17.0.tar.xz";
sha256 = "1940a2s084hwf359rr3vrlzdz09iyn3nlpch24wgff728i28mc73";
name = "ktextwidgets-5.17.0.tar.xz";
};
};
kunitconversion = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kunitconversion-5.17.0.tar.xz";
sha256 = "0yc3k0d91m5ql75azabqqsihy3hai3x0hzwby8wwm5by20mq1bjf";
name = "kunitconversion-5.17.0.tar.xz";
};
};
kwallet = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kwallet-5.17.0.tar.xz";
sha256 = "0552cd4m6nf439vrbwljxmb030h1ndmldvnl4p5r0g8h8jd12siv";
name = "kwallet-5.17.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kwidgetsaddons-5.17.0.tar.xz";
sha256 = "151jywz4z375kgx362i39gf5xb7fdayz9kly738vzwx4vx253xvn";
name = "kwidgetsaddons-5.17.0.tar.xz";
};
};
kwindowsystem = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kwindowsystem-5.17.0.tar.xz";
sha256 = "180b567ixiv487fdw2hp0jgs7cckm8f82y0mny5zvi25l39gjq54";
name = "kwindowsystem-5.17.0.tar.xz";
};
};
kxmlgui = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kxmlgui-5.17.0.tar.xz";
sha256 = "0rbxk9f918wmq1ijxcpjf6rl31p1f0f85f8rjk5aln3gh65b1zdn";
name = "kxmlgui-5.17.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/kxmlrpcclient-5.17.0.tar.xz";
sha256 = "1zj7c6b72cnnkds73938xyy87padbv0ah3jfqxdfb1yd5zxba7cs";
name = "kxmlrpcclient-5.17.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/modemmanager-qt-5.17.0.tar.xz";
sha256 = "1q3abgr527lcrzy40anm3sjy9j8ycga4g1gkqz201lwa1wp22zr3";
name = "modemmanager-qt-5.17.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/networkmanager-qt-5.17.0.tar.xz";
sha256 = "08aafz3y2lnnl5dmzj4s1nfjwhy3mda20pkxjyw1vk8l3s8nhs1l";
name = "networkmanager-qt-5.17.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/oxygen-icons5-5.17.0.tar.xz";
sha256 = "18m5hfz4zappnz45f230sgjbl52fsjxli6d5dvm6998bhcyvv1y9";
name = "oxygen-icons5-5.17.0.tar.xz";
};
};
plasma-framework = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/plasma-framework-5.17.0.tar.xz";
sha256 = "0pi91pg9h0s4xziw9m8mc65b8ryhgjnv14zalmbwyr63qn7bkfjh";
name = "plasma-framework-5.17.0.tar.xz";
};
};
solid = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/solid-5.17.0.tar.xz";
sha256 = "1igdqk5cgrxq4is55zdskkc0kbcyp9vjfdrvr9xxhs0lxgizccx3";
name = "solid-5.17.0.tar.xz";
};
};
sonnet = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/sonnet-5.17.0.tar.xz";
sha256 = "0f7bzdcknc7kc4133q0c3zc1j78yf29kh8i7c0qg01zv1iafbbsv";
name = "sonnet-5.17.0.tar.xz";
};
};
threadweaver = {
version = "5.17.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.17/threadweaver-5.17.0.tar.xz";
sha256 = "1cf7qrzw4saai0z6l7bzhfc8clhngcgxla5zbpj28l6130lha8sw";
name = "threadweaver-5.17.0.tar.xz";
};
};
}

View File

@ -4,7 +4,7 @@
set -x
# The trailing slash at the end is necessary!
RELEASE_URL="http://download.kde.org/stable/frameworks/5.17/"
RELEASE_URL="http://download.kde.org/stable/frameworks/5.18/"
EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp

View File

@ -1,6 +1,6 @@
{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons
, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
, kinit, knotifications, kparts, kservice, ktextwidgets
, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
@ -13,7 +13,7 @@ kdeFramework {
name = "kdelibs4support";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcompletion kconfig kservice kwidgetsaddons
kcompletion kconfig kded kservice kwidgetsaddons
kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
];
propagatedBuildInputs = [

View File

@ -0,0 +1,13 @@
Index: kpackage-5.18.0/src/kpackage/package.cpp
===================================================================
--- kpackage-5.18.0.orig/src/kpackage/package.cpp
+++ kpackage-5.18.0/src/kpackage/package.cpp
@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
: QSharedData(),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{

View File

@ -1,4 +1,4 @@
{ kdeFramework, lib
{ kdeFramework, lib, copyPathsToStore
, extra-cmake-modules
, karchive
, kconfig
@ -13,10 +13,7 @@ kdeFramework {
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ karchive kconfig ];
propagatedBuildInputs = [ kcoreaddons ki18n ];
patches = [
./0001-allow-external-paths.patch
./0002-qdiriterator-follow-symlinks.patch
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
postInstall = ''
wrapQtProgram "$out/bin/kpackagetool5"
'';

View File

@ -0,0 +1,26 @@
Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
===================================================================
--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
+++ kpackage-5.18.0/src/kpackage/packageloader.cpp
@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
} else {
//qDebug() << "Not cached";
// If there's no cache file, fall back to listing the directory
- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
===================================================================
--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
QJsonArray plugins;
- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
+ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
it.next();
const QString path = it.fileInfo().absoluteFilePath();

View File

@ -0,0 +1,2 @@
allow-external-paths.patch
qdiriterator-follow-symlinks.patch

View File

@ -0,0 +1,22 @@
{ kdeFramework, lib, copyPathsToStore
, extra-cmake-modules, makeQtWrapper, perl
, karchive, kconfig, kguiaddons, kiconthemes, kparts
, libgit2
, qtscript, qtxmlpatterns
, ki18n, kio, sonnet
}:
kdeFramework {
name = "ktexteditor";
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
buildInputs = [
karchive kconfig kguiaddons kiconthemes kparts
libgit2
qtscript qtxmlpatterns
];
propagatedBuildInputs = [ ki18n kio sonnet ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@ -1,17 +1,8 @@
From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 09:08:59 -0500
Subject: [PATCH] no qcoreapplication
---
src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
index 3c63140..e3d5efe 100644
--- a/src/syntax/data/katehighlightingindexer.cpp
+++ b/src/syntax/data/katehighlightingindexer.cpp
@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName)
Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
===================================================================
--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
int main(int argc, char *argv[])
{
@ -34,7 +25,7 @@ index 3c63140..e3d5efe 100644
if (hlFilenamesListing.isEmpty()) {
return 1;
}
@@ -147,7 +144,7 @@ int main(int argc, char *argv[])
@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
return anyError;
// create outfile, after all has worked!
@ -43,6 +34,3 @@ index 3c63140..e3d5efe 100644
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
return 7;
--
2.5.2

View File

@ -0,0 +1 @@
no-qcoreapplication.patch

View File

@ -0,0 +1,565 @@
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
attica = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/attica-5.18.0.tar.xz";
sha256 = "1n6pkaak9xf7nyi0b1wr8fm5qkv7mgpsws9igd7g2xqvvqzyp5xw";
name = "attica-5.18.0.tar.xz";
};
};
baloo = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/baloo-5.18.0.tar.xz";
sha256 = "0sdnd6v01rcgq7v2jny0655jrghfamwyj0win7xfhx1622dfi8l8";
name = "baloo-5.18.0.tar.xz";
};
};
bluez-qt = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/bluez-qt-5.18.0.tar.xz";
sha256 = "17vx77w4fwdi7y394s2pqph2vmfs8n0107rmz4q7aa62q9iwdrbr";
name = "bluez-qt-5.18.0.tar.xz";
};
};
breeze-icons = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/breeze-icons-5.18.0.tar.xz";
sha256 = "0a4iqr5zrb56aln5hdsk5zrl23w8w8y5nmrxb093h205r36hfw4z";
name = "breeze-icons-5.18.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/extra-cmake-modules-5.18.0.tar.xz";
sha256 = "1kp0pysa154cbp1ysgyqk03w8s335v3wmfrx4pshyfpg1s24k83y";
name = "extra-cmake-modules-5.18.0.tar.xz";
};
};
frameworkintegration = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/frameworkintegration-5.18.0.tar.xz";
sha256 = "06hw885mk0i2173lfdqz3hyp1fx2bndpj00hk32s3i2ggnn2y1rv";
name = "frameworkintegration-5.18.0.tar.xz";
};
};
kactivities = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kactivities-5.18.0.tar.xz";
sha256 = "0nqa63ds7vj87zg2gz1mx42c30l3ypfk4ghhgxwziab315bpcpmr";
name = "kactivities-5.18.0.tar.xz";
};
};
kapidox = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kapidox-5.18.0.tar.xz";
sha256 = "1hackjnpxijqqpn9cvnwcn9yc0jni21qgjccj74025ihdgigp70s";
name = "kapidox-5.18.0.tar.xz";
};
};
karchive = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/karchive-5.18.0.tar.xz";
sha256 = "0ph59w8y49b3znaj9c1qk0zwkg0pmjjcyr4jlv5w56mh0zkq37h5";
name = "karchive-5.18.0.tar.xz";
};
};
kauth = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kauth-5.18.0.tar.xz";
sha256 = "14kvy7cbw31sc48f0aldpi52wxhwd69prwadvjhqwy912s8kr04n";
name = "kauth-5.18.0.tar.xz";
};
};
kbookmarks = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kbookmarks-5.18.0.tar.xz";
sha256 = "0qi2f612s756qh5ldibscfhcq8q802vgr2497fm9xl95kfqmcg1n";
name = "kbookmarks-5.18.0.tar.xz";
};
};
kcmutils = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kcmutils-5.18.0.tar.xz";
sha256 = "1m53308icq1x1877afcxlhygl56dsl50fiwmfjf0g5pfmnql3qfp";
name = "kcmutils-5.18.0.tar.xz";
};
};
kcodecs = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kcodecs-5.18.0.tar.xz";
sha256 = "1injdpz7kdf2j6is2w3v3xgd9ahgls0j632q03q7qa48xp4wx64h";
name = "kcodecs-5.18.0.tar.xz";
};
};
kcompletion = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kcompletion-5.18.0.tar.xz";
sha256 = "0gkj4gplm7qwx4nqhhph5h3jp4h8b22ssmw0vvv6bpsnq7idk76b";
name = "kcompletion-5.18.0.tar.xz";
};
};
kconfig = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kconfig-5.18.0.tar.xz";
sha256 = "1s7fvhflsvv8zwb9cr50m3hxh0d4z5grh0nkri5ngzqb123wi91n";
name = "kconfig-5.18.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kconfigwidgets-5.18.0.tar.xz";
sha256 = "08i12040prs2nxybxbbf3w0n91c9p0c64j8fz18axi4yszrmv8im";
name = "kconfigwidgets-5.18.0.tar.xz";
};
};
kcoreaddons = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kcoreaddons-5.18.0.tar.xz";
sha256 = "05y8pan8hdn6qj2si9v9igjrx00l7bqzhdm2qq9vbjrv5xj8axzf";
name = "kcoreaddons-5.18.0.tar.xz";
};
};
kcrash = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kcrash-5.18.0.tar.xz";
sha256 = "0rk27zr0mb4jlicm1s175x139avzi0q4jk3mlczfg4rkrxzgbx5w";
name = "kcrash-5.18.0.tar.xz";
};
};
kdbusaddons = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kdbusaddons-5.18.0.tar.xz";
sha256 = "0l9ww3zaz1x6bk9axmm6zlj1dcn0gr0z61v9lw5y31rypxclhza8";
name = "kdbusaddons-5.18.0.tar.xz";
};
};
kdeclarative = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kdeclarative-5.18.0.tar.xz";
sha256 = "0mpvwn26msg3sc9z1r1vnw32rkl842jxpvpx2vg8kwcd9snwx9a6";
name = "kdeclarative-5.18.0.tar.xz";
};
};
kded = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kded-5.18.0.tar.xz";
sha256 = "0y5sn7yxalylcwcz2j4h349lll2vkf44bw3n6w2cbqqf5wnr2za5";
name = "kded-5.18.0.tar.xz";
};
};
kdelibs4support = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/portingAids/kdelibs4support-5.18.0.tar.xz";
sha256 = "0flhhjnnm2wh6869q8gxk45wlpq0679xlklzqlxvqx7a4kxdl8d8";
name = "kdelibs4support-5.18.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kdesignerplugin-5.18.0.tar.xz";
sha256 = "163lfx8vxxdhxbn090k5r4m9vy940kfwvsyjsi8v0pp9ww49g13n";
name = "kdesignerplugin-5.18.0.tar.xz";
};
};
kdesu = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kdesu-5.18.0.tar.xz";
sha256 = "0dqjmvi440p4n62w9y3qw4n7fcivyg3d54fv9nrf1sx87vdw7r83";
name = "kdesu-5.18.0.tar.xz";
};
};
kdewebkit = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kdewebkit-5.18.0.tar.xz";
sha256 = "1ahr62xfk085kb9p2axx04gf7bpnr0vv2d4kpc4s0xrj3xi0alnl";
name = "kdewebkit-5.18.0.tar.xz";
};
};
kdnssd = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kdnssd-5.18.0.tar.xz";
sha256 = "12vplqfsc3zks1grmb5i4hdww0g51lv54nb1drpj42mzyi1q1v1l";
name = "kdnssd-5.18.0.tar.xz";
};
};
kdoctools = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kdoctools-5.18.0.tar.xz";
sha256 = "10h74lb4597fs1h88x60ykpkz47pgfa4k04h4i5l0qb5vb1jlw7d";
name = "kdoctools-5.18.0.tar.xz";
};
};
kemoticons = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kemoticons-5.18.0.tar.xz";
sha256 = "0lba6rzmij20ndkq0vw9zkxbjq6g98may3ypyj0kc82d3sw9hkhs";
name = "kemoticons-5.18.0.tar.xz";
};
};
kfilemetadata = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kfilemetadata-5.18.0.tar.xz";
sha256 = "19b8nh5x8c0w516afh8ln72vi5dk91wl8bcsqd84h3s6gw55rsm4";
name = "kfilemetadata-5.18.0.tar.xz";
};
};
kglobalaccel = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kglobalaccel-5.18.0.tar.xz";
sha256 = "1v22rh8c103zl63cgg4gx430qw29f9yn9k5219pcw5n57jx0n5c1";
name = "kglobalaccel-5.18.0.tar.xz";
};
};
kguiaddons = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kguiaddons-5.18.0.tar.xz";
sha256 = "153mjbiwg4p65c2msj8j3pycn5gys39ahg9ik7jqg7w4cjcl2jxz";
name = "kguiaddons-5.18.0.tar.xz";
};
};
khtml = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/portingAids/khtml-5.18.0.tar.xz";
sha256 = "0kgin1bhbx95kypsg1k318qjxz3258x3a6kkdbky3cvfmq8r5ka5";
name = "khtml-5.18.0.tar.xz";
};
};
ki18n = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/ki18n-5.18.0.tar.xz";
sha256 = "14vlq49a0bp1vpjb2zxkgqsd5yjmb0azri2iq9sgxxx1v6gyy9h9";
name = "ki18n-5.18.0.tar.xz";
};
};
kiconthemes = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kiconthemes-5.18.0.tar.xz";
sha256 = "10pj2q28y57ng26xg2211v9vy91hqqmcyxh90q1qj89clykimwid";
name = "kiconthemes-5.18.0.tar.xz";
};
};
kidletime = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kidletime-5.18.0.tar.xz";
sha256 = "0726nq508rpzjxvfp354jd8n14m49grv6nfv09q2zyw02cf6n9bi";
name = "kidletime-5.18.0.tar.xz";
};
};
kimageformats = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kimageformats-5.18.0.tar.xz";
sha256 = "1y6zc04sx4sqyfavr8nf05a1p4kyb8ic335iy5s869r6zrvljpnc";
name = "kimageformats-5.18.0.tar.xz";
};
};
kinit = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kinit-5.18.0.tar.xz";
sha256 = "142xm7yglssw771340bs0lk1xgsr53218zh87v6n9hchrd34zg08";
name = "kinit-5.18.0.tar.xz";
};
};
kio = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kio-5.18.0.tar.xz";
sha256 = "020gvxs5xp9v4pra814200nv79c9b9j59skbrxq9cazhnywnnlns";
name = "kio-5.18.0.tar.xz";
};
};
kitemmodels = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kitemmodels-5.18.0.tar.xz";
sha256 = "0r5r7ia1lwqll6bz92k4qgj737hsg6pfhxmycr6g88b9fiab1qw4";
name = "kitemmodels-5.18.0.tar.xz";
};
};
kitemviews = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kitemviews-5.18.0.tar.xz";
sha256 = "10pbh0fpzrh0ijbadjx81690p9iw34rs2waks99fc0jy3hamny3b";
name = "kitemviews-5.18.0.tar.xz";
};
};
kjobwidgets = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kjobwidgets-5.18.0.tar.xz";
sha256 = "0gxvh9wxnfkrxm9zc7yx579vlxs3xmihfyqs92fpkjhy2shfd2sg";
name = "kjobwidgets-5.18.0.tar.xz";
};
};
kjs = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/portingAids/kjs-5.18.0.tar.xz";
sha256 = "0z89l2yhs3vld1qbd6v506lksmxvwrzgdq77aghy3mbkfgz3jd62";
name = "kjs-5.18.0.tar.xz";
};
};
kjsembed = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/portingAids/kjsembed-5.18.0.tar.xz";
sha256 = "0mpq7aywspm6l13afrr2dis8ygyld5il21g90ij0fc1jwp95zk3d";
name = "kjsembed-5.18.0.tar.xz";
};
};
kmediaplayer = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/portingAids/kmediaplayer-5.18.0.tar.xz";
sha256 = "07m3agz73yzmfn8ykg0f6a2c39rkzchzqc1iam2zfydqxyvh4bxb";
name = "kmediaplayer-5.18.0.tar.xz";
};
};
knewstuff = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/knewstuff-5.18.0.tar.xz";
sha256 = "0mda1n0py6nm9wp89z5hkhhk9ah5sjrkzl1dshd4lq77f7p7i1g4";
name = "knewstuff-5.18.0.tar.xz";
};
};
knotifications = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/knotifications-5.18.0.tar.xz";
sha256 = "1npir2v4irhm6xmzf60aj5388slq6fw7jbcwjjscldrwk2ca06hz";
name = "knotifications-5.18.0.tar.xz";
};
};
knotifyconfig = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/knotifyconfig-5.18.0.tar.xz";
sha256 = "0q2735m2m1wrnp7g4ycnbjy7qgpjxc5fvx9zrwnd0jl5rmdw4sbb";
name = "knotifyconfig-5.18.0.tar.xz";
};
};
kpackage = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kpackage-5.18.0.tar.xz";
sha256 = "14q2ssf3g7ljakzpq7q9q2zbm8jqk01ybjx4s16qpw9gakcrbli9";
name = "kpackage-5.18.0.tar.xz";
};
};
kparts = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kparts-5.18.0.tar.xz";
sha256 = "1q4xd4dy40mh4a8vgpvdamy1242isjy9ma94cf95qqc6qgjnqxhy";
name = "kparts-5.18.0.tar.xz";
};
};
kpeople = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kpeople-5.18.0.tar.xz";
sha256 = "0d0mp2qz3f1bki6rfw8x6zc0rmv4n43mi06k3vh30qpiaj7crl5k";
name = "kpeople-5.18.0.tar.xz";
};
};
kplotting = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kplotting-5.18.0.tar.xz";
sha256 = "1jiqx9gdv69frfh8vanphp6lzc3vxn2q1lhibi7v03qkc2qaw5cc";
name = "kplotting-5.18.0.tar.xz";
};
};
kpty = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kpty-5.18.0.tar.xz";
sha256 = "1baz1xs22r4qli74sqwpcjmxnfrd0iqyyzg1fmljr8fvs4pdy1x1";
name = "kpty-5.18.0.tar.xz";
};
};
kross = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/portingAids/kross-5.18.0.tar.xz";
sha256 = "1ky13yqxhkghxqd21jrnrpjfnrkgspv0p3dfij994rkaqq8rm1r6";
name = "kross-5.18.0.tar.xz";
};
};
krunner = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/portingAids/krunner-5.18.0.tar.xz";
sha256 = "14c51kiwr49dbdxg8y6ivmmfr9h6p8jjd32k35pi4gpi2vlh29pf";
name = "krunner-5.18.0.tar.xz";
};
};
kservice = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kservice-5.18.0.tar.xz";
sha256 = "0pbs1n2i7vjgjh7j87ps8gkzmj5igw1aib1aq089m4hfrl8pbrq8";
name = "kservice-5.18.0.tar.xz";
};
};
ktexteditor = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/ktexteditor-5.18.0.tar.xz";
sha256 = "0fx82s5y1wya3v36qq3agmfrnff9a7v94fhifvfiwmhk2ddwwg3v";
name = "ktexteditor-5.18.0.tar.xz";
};
};
ktextwidgets = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/ktextwidgets-5.18.0.tar.xz";
sha256 = "1wflqfmgqa3lh3apf22sami6caclvyv7li6qiskwfkzkb0a6x373";
name = "ktextwidgets-5.18.0.tar.xz";
};
};
kunitconversion = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kunitconversion-5.18.0.tar.xz";
sha256 = "0gpmndyly977dzfyfhrd0q434c0qr1sinh75dwf9clmqw576jl6i";
name = "kunitconversion-5.18.0.tar.xz";
};
};
kwallet = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kwallet-5.18.0.tar.xz";
sha256 = "0w69y0xdvvrvcydv160z7s03y1n5vxjj3sfk530zc6bjszplvxis";
name = "kwallet-5.18.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kwidgetsaddons-5.18.0.tar.xz";
sha256 = "06fqz7cwczp5sahg54zi46rf9jf2si88w5yizp61z8yv57kvpvk1";
name = "kwidgetsaddons-5.18.0.tar.xz";
};
};
kwindowsystem = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kwindowsystem-5.18.0.tar.xz";
sha256 = "01hzd4r8y4hdpynnh32qf418hxzbd67fkdq6a4vabl384aipnmk7";
name = "kwindowsystem-5.18.0.tar.xz";
};
};
kxmlgui = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kxmlgui-5.18.0.tar.xz";
sha256 = "0yimy0r73sv8z4wq0mkdx24icjrzmy5bciblwlnzagd61f8j8qri";
name = "kxmlgui-5.18.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/kxmlrpcclient-5.18.0.tar.xz";
sha256 = "0h88pc3h5z3q58b7qxdn69klwr0p9ffbirzncyvxjrhr7dq36nv9";
name = "kxmlrpcclient-5.18.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/modemmanager-qt-5.18.0.tar.xz";
sha256 = "09k07wxkn511sa4hwmrs6jfx4lnnw3zcac5dzz43hhsmw74yj9az";
name = "modemmanager-qt-5.18.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/networkmanager-qt-5.18.0.tar.xz";
sha256 = "11j818ws5jz23hyilfpf3npk893hs388v1xpwhh0lkjwm60wkzln";
name = "networkmanager-qt-5.18.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/oxygen-icons5-5.18.0.tar.xz";
sha256 = "11zmxc9n7x6iwdckwxwjji0497yjcsjli7pzr8d049lbc7xsjvi8";
name = "oxygen-icons5-5.18.0.tar.xz";
};
};
plasma-framework = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/plasma-framework-5.18.0.tar.xz";
sha256 = "1lxhlzx3jcqzx90kjl8w8p53nrgrkjiz1xf92ah3mygjyvi5rlh8";
name = "plasma-framework-5.18.0.tar.xz";
};
};
solid = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/solid-5.18.0.tar.xz";
sha256 = "0ilki4s3f3gjsdj6z41a8k4h2b52w8xrh2api0sqj0ifk2yhx6wh";
name = "solid-5.18.0.tar.xz";
};
};
sonnet = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/sonnet-5.18.0.tar.xz";
sha256 = "1780jvsfkasabdbk9xjhjcihcc6mxxipi2rsq2001flxnnx4kykg";
name = "sonnet-5.18.0.tar.xz";
};
};
threadweaver = {
version = "5.18.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.18/threadweaver-5.18.0.tar.xz";
sha256 = "00c9vvyhyysg0cdlmvpls0h3pdbbhhwfxlm9l9i9r3j8x6rigm54";
name = "threadweaver-5.18.0.tar.xz";
};
};
}

View File

@ -14812,7 +14812,7 @@ let
kde5 =
let
frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
frameworks = import ../development/libraries/kde-frameworks-5.18 { inherit pkgs; };
plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
@ -14821,16 +14821,7 @@ let
in
recurseIntoAttrs (lib.makeScope qt55.newScope merged);
kde5_latest =
let
frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
merged = self:
named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
in
recurseIntoAttrs (lib.makeScope qt55.newScope merged);
kde5_latest = kde5;
theme-vertex = callPackage ../misc/themes/vertex { };