Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III
2015-11-05 10:07:28 -08:00
362 changed files with 16069 additions and 19241 deletions

View File

@@ -1,217 +0,0 @@
# Maintainer's Notes:
#
# Minor updates:
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
# releases updates that include only the changed packages; in this case,
# multiple URLs can be provided and the results will be merged.
# 2. Run ./manifest.sh and ./dependencies.sh.
# 3. Build and enjoy.
#
# Major updates:
# We prefer not to immediately overwrite older versions with major updates, so
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ pkgs, newScope, qt5 ? null, debug ? false }:
let inherit (pkgs) autonix stdenv symlinkJoin; in
with autonix; let inherit (stdenv) lib; in
let
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
in
let
qt5 = qt5_;
super =
let json = builtins.fromJSON (builtins.readFile ./packages.json);
mirrorUrl = n: pkg: pkg // {
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
};
renames = builtins.fromJSON (builtins.readFile ./renames.json);
propagated = [ "extra-cmake-modules" ];
native = [
"bison"
"extra-cmake-modules"
"flex"
"kdoctools"
"ki18n"
"libxslt"
"perl"
"pythoninterp"
];
user = [
"qt5"
"qt5core"
"qt5dbus"
"qt5gui"
"qt5qml"
"qt5quick"
"qt5svg"
"qt5webkitwidgets"
"qt5widgets"
"qt5x11extras"
"shareddesktopontologies"
"sharedmimeinfo"
];
in lib.fold (f: attrs: f attrs) json [
(lib.mapAttrs kdePackage)
(userEnvDeps user)
(nativeDeps native)
(propagateDeps propagated)
(renameDeps renames)
(lib.mapAttrs mirrorUrl)
];
kdePackage = name: pkg:
let defaultOverride = drv: drv // {
setupHook = ./setup-hook.sh;
cmakeFlags =
(drv.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with stdenv.lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
};
callPackage = newScope {
inherit (stdenv) mkDerivation;
inherit (pkgs) fetchurl;
inherit scope;
};
in mkPackage callPackage defaultOverride name pkg;
scope =
# packages in this collection
self //
# packages pinned to this version of Qt 5
{
dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
qt5 = qt5.base;
qt5core = qt5.base;
qt5dbus = qt5.base;
qt5gui = qt5.base;
qt5linguisttools = qt5.tools;
qt5qml = [qt5.declarative qt5.graphicaleffects];
qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
qt5script = qt5.script;
qt5svg = qt5.svg;
qt5webkitwidgets = qt5.webkit;
qt5widgets = qt5.base;
qt5x11extras = qt5.x11extras;
qt5xmlpatterns = qt5.xmlpatterns;
} //
# packages from the nixpkgs collection
(with pkgs;
{
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xorg zlib;
boost = boost155;
gif = giflib;
glib2 = glib;
jpeg = libjpeg;
libintl = gettext;
liblzma = lzma;
pythoninterp = python;
pythonlibrary = python;
sharedmimeinfo = shared_mime_info;
}
);
self = super // {
extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
buildInputs = [];
nativeBuildInputs = [];
propagatedBuildInputs = [];
propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
propagatedUserEnvPkgs = [];
cmakeFlags = ["-DBUILD_TESTING=OFF"];
patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
meta = {
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
});
frameworkintegration = extendDerivation super.frameworkintegration {
buildInputs = [ scope.xorg.libXcursor ];
};
kauth = extendDerivation super.kauth {
buildInputs = [ scope.polkit_qt5 ];
patches = [ ./kauth/kauth-policy-install.patch ];
};
kcmutils = extendDerivation super.kcmutils {
patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
};
kconfigwidgets = extendDerivation super.kconfigwidgets {
patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
};
kdelibs4support = extendDerivation super.kdelibs4support {
buildInputs = [ scope.networkmanager scope.xorg.libSM ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
];
};
kdoctools = extendDerivation super.kdoctools {
propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
"-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
];
patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
};
ki18n = extendDerivation super.ki18n {
propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
};
kimageformats = extendDerivation super.kimageformats {
NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
};
kinit = extendDerivation super.kinit {
patches = [./kinit/0001-kinit-libpath.patch];
};
kpackage = extendDerivation super.kpackage {
patches = [ ./kpackage/0001-allow-external-paths.patch ];
};
kservice = extendDerivation super.kservice {
buildInputs = [ scope.kwindowsystem ];
patches = [
./kservice/kservice-kbuildsycoca-follow-symlinks.patch
./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
];
};
ktexteditor = extendDerivation super.ktexteditor {
patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
};
networkmanager-qt = extendDerivation super.networkmanager-qt {
propagatedBuildInputs = [ scope.networkmanager ];
};
};
in self

View File

@@ -1,22 +0,0 @@
#!/bin/sh
# This script rebuilds dependencies.nix.
# You must run manifest.sh first to download the packages.
# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
# If you are working on the packages, this is probably what you want.
# You can also pass the path to a source tree where you have built
# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
# probably what you want.
manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
autonixDepsKf5=""
if [[ -z $1 ]]; then
autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
else
autonixDepsKF5="$1/dist/build/kf5-deps"
fi
exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"

View File

@@ -1,13 +0,0 @@
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index c63241b..2243f94 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
desktopFileNames.append(it.next());
}

View File

@@ -1,13 +0,0 @@
diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
index 53a331e..80fbb01 100644
--- a/src/khelpclient.cpp
+++ b/src/khelpclient.cpp
@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
QString docPath;
const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
Q_FOREACH (const QString &dir, desktopDirs) {
- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString desktopPath(it.next());
KDesktopFile desktopFile(desktopPath);

View File

@@ -1,13 +0,0 @@
diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
index 69b1427..9c37a49 100644
--- a/src/kbuildsycoca/kbuildsycoca.cpp
+++ b/src/kbuildsycoca/kbuildsycoca.cpp
@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
QStringList relFiles;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString filePath = it.next();
Q_ASSERT(filePath.startsWith(dir)); // due to the line below...

View File

@@ -1,13 +0,0 @@
diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
index 2eb1275..e39a36f 100644
--- a/src/kbuildsycoca/vfolder_menu.cpp
+++ b/src/kbuildsycoca/vfolder_menu.cpp
@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
}
if (!relative) {
- QString resolved = QDir(dir).canonicalPath();
+ QString resolved = QDir::cleanPath(dir);
if (!resolved.isEmpty()) {
dir = resolved;
}

View File

@@ -1,48 +0,0 @@
From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 15 Feb 2015 19:09:17 -0600
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 3f02e8c..d1a865b 100644
--- a/src/syntax/data/katehighlightingindexer.cpp
+++ b/src/syntax/data/katehighlightingindexer.cpp
@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
int main(int argc, char *argv[])
{
- // get app instance
- QCoreApplication app(argc, argv);
-
// ensure enough arguments are passed
- if (app.arguments().size() < 3)
+ if (argc < 3)
return 1;
// open schema
QXmlSchema schema;
- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
return 2;
- const QString hlFilenamesListing = app.arguments().value(3);
+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
if (hlFilenamesListing.isEmpty()) {
return 1;
}
@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
return anyError;
// create outfile, after all has worked!
- QFile outFile(app.arguments().at(1));
+ QFile outFile(QString::fromLocal8Bit(argv[1]));
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
return 7;
--
2.1.4

File diff suppressed because it is too large Load Diff

View File

@@ -1,22 +0,0 @@
#!/bin/sh
set -x
origin="$(pwd)"
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/frameworks/5.10/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
$AUTONIX_DEPS_KF5 manifest.json
rm manifest.json

View File

@@ -1,13 +0,0 @@
diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
index 07b3c90..84417e3 100644
--- a/src/plasma/package.cpp
+++ b/src/plasma/package.cpp
@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
servicePrefix("plasma-applet-"),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{

View File

@@ -1,70 +0,0 @@
{
"kf5widgetsaddons": "kwidgetsaddons",
"kf5texteditor": "ktexteditor",
"kf5designerplugin": "kdesignerplugin",
"kf5bookmarks": "kbookmarks",
"kf5frameworkintegration": "frameworkintegration",
"kf5package": "kpackage",
"kf5archive": "karchive",
"kf5plasma": "plasma-framework",
"kf5kcmutils": "kcmutils",
"kf5configwidgets": "kconfigwidgets",
"ctest": "attica",
"kf5kio": "kio",
"kf5networkmanagerqt": "networkmanager-qt",
"kf5coreaddons": "kcoreaddons",
"kf5guiaddons": "kguiaddons",
"kf5jobwidgets": "kjobwidgets",
"kf5modemmanagerqt": "modemmanager-qt",
"kf5runner": "krunner",
"kf5globalaccel": "kglobalaccel",
"kf5dbusaddons": "kdbusaddons",
"kf5crash": "kcrash",
"kf5itemviews": "kitemviews",
"kf5doctools": "kdoctools",
"kf5i18n": "ki18n",
"kf5webkit": "kdewebkit",
"kf5newstuff": "knewstuff",
"kded": "kded",
"kf5notifications": "knotifications",
"kf5activitiesexperimentalstats": "kactivities",
"kf5dnssd": "kdnssd",
"kf5notifyconfig": "knotifyconfig",
"kf5iconthemes": "kiconthemes",
"kf5js": "kjs",
"kf5kde4support": "kdelibs4support",
"kf5parts": "kparts",
"backend": "plasma-framework",
"kf5completion": "kcompletion",
"kf5threadweaver": "threadweaver",
"kf5mediaplayer": "kmediaplayer",
"kf5plasmaquick": "plasma-framework",
"kf5wallet": "kwallet",
"kf5xmlgui": "kxmlgui",
"kf5attica": "attica",
"kf5declarative": "kdeclarative",
"kf5config": "kconfig",
"kf5init": "kinit",
"kf5textwidgets": "ktextwidgets",
"kf5jsembed": "kjsembed",
"kf5codecs": "kcodecs",
"kf5service": "kservice",
"kf5sonnet": "sonnet",
"kf5kdelibs4support": "kdelibs4support",
"kf5pty": "kpty",
"kf5solid": "solid",
"kf5auth": "kauth",
"ecm": "extra-cmake-modules",
"kf5activities": "kactivities",
"kf5plotting": "kplotting",
"kf5people": "kpeople",
"kf5emoticons": "kemoticons",
"kf5kross": "kross",
"kf5su": "kdesu",
"kf5khtml": "khtml",
"kf5unitconversion": "kunitconversion",
"kf5idletime": "kidletime",
"kf5windowsystem": "kwindowsystem",
"kf5xmlrpcclient": "kxmlrpcclient",
"kf5itemmodels": "kitemmodels"
}

View File

@@ -1 +0,0 @@
addToSearchPath XDG_DATA_DIRS @out@/share

View File

@@ -1,228 +0,0 @@
# Maintainer's Notes:
#
# Minor updates:
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
# releases updates that include only the changed packages; in this case,
# multiple URLs can be provided and the results will be merged.
# 2. Run ./manifest.sh and ./dependencies.sh.
# 3. Build and enjoy.
#
# Major updates:
# We prefer not to immediately overwrite older versions with major updates, so
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ pkgs, newScope, qt5 ? null, debug ? false }:
let inherit (pkgs) autonix stdenv symlinkJoin; in
with autonix; let inherit (stdenv) lib; in
let
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
in
let
qt5 = qt5_;
super =
let json = builtins.fromJSON (builtins.readFile ./packages.json);
mirrorUrl = n: pkg: pkg // {
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
};
renames = builtins.fromJSON (builtins.readFile ./renames.json);
propagated = [ "extra-cmake-modules" ];
native = [
"bison"
"extra-cmake-modules"
"flex"
"kdoctools"
"ki18n"
"libxslt"
"perl"
"pythoninterp"
];
user = [
"qt5"
"qt5core"
"qt5dbus"
"qt5gui"
"qt5qml"
"qt5quick"
"qt5svg"
"qt5webkitwidgets"
"qt5widgets"
"qt5x11extras"
"shareddesktopontologies"
"sharedmimeinfo"
];
in lib.fold (f: attrs: f attrs) json [
(lib.mapAttrs kdePackage)
(userEnvDeps user)
(nativeDeps native)
(propagateDeps propagated)
(renameDeps renames)
(lib.mapAttrs mirrorUrl)
];
kdePackage = name: pkg:
let defaultOverride = drv: drv // {
setupHook = ./setup-hook.sh;
cmakeFlags =
(drv.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with stdenv.lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
};
callPackage = newScope {
inherit (stdenv) mkDerivation;
inherit (pkgs) fetchurl;
inherit scope;
};
in mkPackage callPackage defaultOverride name pkg;
scope =
# packages in this collection
self //
# packages pinned to this version of Qt 5
{
dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
qt5 = qt5.base;
qt5core = qt5.base;
qt5dbus = qt5.base;
qt5gui = qt5.base;
qt5linguisttools = qt5.tools;
qt5qml = [qt5.declarative qt5.graphicaleffects];
qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
qt5script = qt5.script;
qt5svg = qt5.svg;
qt5webkitwidgets = qt5.webkit;
qt5widgets = qt5.base;
qt5x11extras = qt5.x11extras;
qt5xmlpatterns = qt5.xmlpatterns;
} //
# packages from the nixpkgs collection
(with pkgs;
{
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xorg zlib;
boost = boost155;
gif = giflib;
glib2 = glib;
jpeg = libjpeg;
libintl = gettext;
liblzma = lzma;
pythoninterp = python;
pythonlibrary = python;
sharedmimeinfo = shared_mime_info;
}
);
self = super // {
bluez-qt = overrideDerivation super.bluez-qt (drv: {
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
'';
});
extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
buildInputs = [];
nativeBuildInputs = [];
propagatedBuildInputs = [];
propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
propagatedUserEnvPkgs = [];
cmakeFlags = ["-DBUILD_TESTING=OFF"];
patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
meta = {
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
});
frameworkintegration = extendDerivation super.frameworkintegration {
buildInputs = [ scope.xorg.libXcursor ];
};
kauth = extendDerivation super.kauth {
buildInputs = [ scope.polkit_qt5 ];
patches = [ ./kauth/kauth-policy-install.patch ];
};
kcmutils = extendDerivation super.kcmutils {
patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
};
kconfigwidgets = extendDerivation super.kconfigwidgets {
patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
};
kdelibs4support = extendDerivation super.kdelibs4support {
buildInputs = [ scope.networkmanager scope.xorg.libSM ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
];
};
kdoctools = extendDerivation super.kdoctools {
propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
"-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
];
patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
};
ki18n = extendDerivation super.ki18n {
propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
};
kimageformats = extendDerivation super.kimageformats {
NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
};
kinit = extendDerivation super.kinit {
patches = [./kinit/0001-kinit-libpath.patch];
};
kpackage = extendDerivation super.kpackage {
patches = [ ./kpackage/0001-allow-external-paths.patch ];
};
kservice = extendDerivation super.kservice {
buildInputs = [ scope.kwindowsystem ];
patches = [
./kservice/kservice-kbuildsycoca-follow-symlinks.patch
./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
];
};
ktexteditor = extendDerivation super.ktexteditor {
patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
};
kwallet = extendDerivation super.kwallet {
buildInputs = [ scope.kdoctools ];
};
networkmanager-qt = extendDerivation super.networkmanager-qt {
propagatedBuildInputs = [ scope.networkmanager ];
};
};
in self

View File

@@ -1,22 +0,0 @@
#!/bin/sh
# This script rebuilds dependencies.nix.
# You must run manifest.sh first to download the packages.
# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
# If you are working on the packages, this is probably what you want.
# You can also pass the path to a source tree where you have built
# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
# probably what you want.
manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
autonixDepsKf5=""
if [[ -z $1 ]]; then
autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
else
autonixDepsKF5="$1/dist/build/kf5-deps"
fi
exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"

View File

@@ -1,74 +0,0 @@
From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 20 Feb 2015 23:17:39 -0600
Subject: [PATCH] extra-cmake-modules paths
---
kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
1 file changed, 4 insertions(+), 33 deletions(-)
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index b7cd34d..2f868ac 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -193,37 +193,8 @@
# (To distribute this file outside of extra-cmake-modules, substitute the full
# License text for the above reference.)
-# Figure out what the default install directory for libraries should be.
-# This is based on the logic in GNUInstallDirs, but simplified (the
-# GNUInstallDirs code deals with re-configuring, but that is dealt with
-# by the _define_* macros in this module).
+# The default library directory on NixOS is *always* /lib.
set(_LIBDIR_DEFAULT "lib")
-# Override this default 'lib' with 'lib64' iff:
-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
-# - we are NOT on debian
-# - we are on a 64 bits system
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
-# See http://wiki.debian.org/Multiarch
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
- AND NOT CMAKE_CROSSCOMPILING)
- if (EXISTS "/etc/debian_version") # is this a debian system ?
- if(CMAKE_LIBRARY_ARCHITECTURE)
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
- endif()
- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
- message(AUTHOR_WARNING
- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
- "Please enable at least one language before including KDEInstallDirs.")
- else()
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(_LIBDIR_DEFAULT "lib64")
- endif()
- endif()
- endif()
-endif()
set(_gnu_install_dirs_vars
BINDIR
@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
"QtQuick2 imports"
QML_INSTALL_DIR)
else()
- _define_relative(QTPLUGINDIR LIBDIR "plugins"
+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
"Qt plugins"
QT_PLUGIN_INSTALL_DIR)
- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
"QtQuick1 imports"
IMPORTS_INSTALL_DIR)
- _define_relative(QMLDIR LIBDIR "qml"
+ _define_relative(QMLDIR LIBDIR "qt5/qml"
"QtQuick2 imports"
QML_INSTALL_DIR)
endif()
--
2.3.0

View File

@@ -1,13 +0,0 @@
diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
index e859ec7..9a8ab18 100644
--- a/KF5AuthConfig.cmake.in
+++ b/KF5AuthConfig.cmake.in
@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")

View File

@@ -1,13 +0,0 @@
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index c63241b..2243f94 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
desktopFileNames.append(it.next());
}

View File

@@ -1,13 +0,0 @@
diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
index 53a331e..80fbb01 100644
--- a/src/khelpclient.cpp
+++ b/src/khelpclient.cpp
@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
QString docPath;
const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
Q_FOREACH (const QString &dir, desktopDirs) {
- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString desktopPath(it.next());
KDesktopFile desktopFile(desktopPath);

View File

@@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c4863c..f731775 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
)
-find_package(DocBookXML4 "4.5")
set_package_properties(DocBookXML4 PROPERTIES
TYPE REQUIRED

View File

@@ -1,42 +0,0 @@
From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 13 Jun 2015 08:57:55 -0500
Subject: [PATCH] kinit libpath
---
src/kdeinit/kinit.cpp | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
index 9e775b6..0ac5646 100644
--- a/src/kdeinit/kinit.cpp
+++ b/src/kdeinit/kinit.cpp
@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
if (!libpath.isEmpty()) {
if (!l.load()) {
if (libpath_relative) {
- // NB: Because Qt makes the actual dlopen() call, the
- // RUNPATH of kdeinit is *not* respected - see
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
- // - so we try hacking it in ourselves
- QString install_lib_dir = QFile::decodeName(
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
- libpath = install_lib_dir + libpath;
- l.setFileName(libpath);
+ // Use QT_PLUGIN_PATH to find shared library directories
+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
+ // shared libraries should be in /lib/qt5/plugins/../../
+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
+ const QString up = QString::fromLocal8Bit("/../../");
+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
+ Q_FOREACH (const QString &path, paths) {
+ l.setFileName(path + up + libpath);
l.load();
+ if (l.isLoaded()) break;
+ }
}
}
if (!l.isLoaded()) {
--
2.4.2

View File

@@ -1,25 +0,0 @@
From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 28 Jan 2015 07:15:30 -0600
Subject: [PATCH] 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 eb4a09b..f70f1a1 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
: QSharedData(),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{
--
2.1.4

View File

@@ -1,13 +0,0 @@
diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
index 69b1427..9c37a49 100644
--- a/src/kbuildsycoca/kbuildsycoca.cpp
+++ b/src/kbuildsycoca/kbuildsycoca.cpp
@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
QStringList relFiles;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString filePath = it.next();
Q_ASSERT(filePath.startsWith(dir)); // due to the line below...

View File

@@ -1,13 +0,0 @@
diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
index 2eb1275..e39a36f 100644
--- a/src/kbuildsycoca/vfolder_menu.cpp
+++ b/src/kbuildsycoca/vfolder_menu.cpp
@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
}
if (!relative) {
- QString resolved = QDir(dir).canonicalPath();
+ QString resolved = QDir::cleanPath(dir);
if (!resolved.isEmpty()) {
dir = resolved;
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,22 +0,0 @@
#!/bin/sh
set -x
origin="$(pwd)"
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/frameworks/5.12/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
$AUTONIX_DEPS_KF5 manifest.json
rm manifest.json

View File

@@ -1,13 +0,0 @@
diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
index 07b3c90..84417e3 100644
--- a/src/plasma/package.cpp
+++ b/src/plasma/package.cpp
@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
servicePrefix("plasma-applet-"),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{

View File

@@ -1,71 +0,0 @@
{
"kf5widgetsaddons": "kwidgetsaddons",
"kf5texteditor": "ktexteditor",
"kf5designerplugin": "kdesignerplugin",
"kf5bookmarks": "kbookmarks",
"kf5frameworkintegration": "frameworkintegration",
"kf5package": "kpackage",
"kf5archive": "karchive",
"kf5plasma": "plasma-framework",
"kf5kcmutils": "kcmutils",
"kf5configwidgets": "kconfigwidgets",
"ctest": "attica",
"kf5kio": "kio",
"kf5networkmanagerqt": "networkmanager-qt",
"kf5coreaddons": "kcoreaddons",
"kf5guiaddons": "kguiaddons",
"kf5jobwidgets": "kjobwidgets",
"kf5modemmanagerqt": "modemmanager-qt",
"kf5runner": "krunner",
"kf5globalaccel": "kglobalaccel",
"kf5dbusaddons": "kdbusaddons",
"kf5crash": "kcrash",
"kf5itemviews": "kitemviews",
"kf5doctools": "kdoctools",
"kf5i18n": "ki18n",
"kf5webkit": "kdewebkit",
"kf5newstuff": "knewstuff",
"kded": "kded",
"kf5notifications": "knotifications",
"kf5activitiesexperimentalstats": "kactivities",
"kf5dnssd": "kdnssd",
"kf5notifyconfig": "knotifyconfig",
"kf5iconthemes": "kiconthemes",
"kf5js": "kjs",
"kf5kde4support": "kdelibs4support",
"kf5parts": "kparts",
"backend": "plasma-framework",
"kf5completion": "kcompletion",
"kf5threadweaver": "threadweaver",
"kf5mediaplayer": "kmediaplayer",
"kf5plasmaquick": "plasma-framework",
"kf5wallet": "kwallet",
"kf5xmlgui": "kxmlgui",
"kf5attica": "attica",
"kf5declarative": "kdeclarative",
"kf5config": "kconfig",
"kf5init": "kinit",
"kf5textwidgets": "ktextwidgets",
"kf5jsembed": "kjsembed",
"kf5codecs": "kcodecs",
"kf5service": "kservice",
"kf5sonnet": "sonnet",
"kf5kdelibs4support": "kdelibs4support",
"kf5pty": "kpty",
"kf5solid": "solid",
"kf5auth": "kauth",
"ecm": "extra-cmake-modules",
"kf5activities": "kactivities",
"kf5plotting": "kplotting",
"kf5people": "kpeople",
"kf5emoticons": "kemoticons",
"kf5kross": "kross",
"kf5su": "kdesu",
"kf5khtml": "khtml",
"kf5unitconversion": "kunitconversion",
"kf5idletime": "kidletime",
"kf5bluezqt": "bluez-qt",
"kf5windowsystem": "kwindowsystem",
"kf5xmlrpcclient": "kxmlrpcclient",
"kf5itemmodels": "kitemmodels"
}

View File

@@ -1 +0,0 @@
addToSearchPath XDG_DATA_DIRS @out@/share

View File

@@ -1,49 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kauth
, kconfig
, kcoreaddons
, kcrash
, kdbusaddons
, kfilemetadata
, ki18n
, kidletime
, kio
, lmdb
, qtbase
, qtquick1
, solid
}:
kdeFramework {
name = "baloo";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kauth
kconfig
kcrash
kdbusaddons
ki18n
kidletime
kio
lmdb
qtquick1
solid
];
propagatedBuildInputs = [
kcoreaddons
kfilemetadata
qtbase
];
postInstall = ''
wrapKDEProgram "$out/bin/baloo_file"
wrapKDEProgram "$out/bin/baloo_file_extractor"
wrapKDEProgram "$out/bin/balooctl"
wrapKDEProgram "$out/bin/baloosearch"
wrapKDEProgram "$out/bin/balooshow"
wrapKDEProgram "$out/bin/baloo-monitor"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,74 +0,0 @@
From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 20 Feb 2015 23:17:39 -0600
Subject: [PATCH] extra-cmake-modules paths
---
kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
1 file changed, 4 insertions(+), 33 deletions(-)
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index b7cd34d..2f868ac 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -193,37 +193,8 @@
# (To distribute this file outside of extra-cmake-modules, substitute the full
# License text for the above reference.)
-# Figure out what the default install directory for libraries should be.
-# This is based on the logic in GNUInstallDirs, but simplified (the
-# GNUInstallDirs code deals with re-configuring, but that is dealt with
-# by the _define_* macros in this module).
+# The default library directory on NixOS is *always* /lib.
set(_LIBDIR_DEFAULT "lib")
-# Override this default 'lib' with 'lib64' iff:
-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
-# - we are NOT on debian
-# - we are on a 64 bits system
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
-# See http://wiki.debian.org/Multiarch
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
- AND NOT CMAKE_CROSSCOMPILING)
- if (EXISTS "/etc/debian_version") # is this a debian system ?
- if(CMAKE_LIBRARY_ARCHITECTURE)
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
- endif()
- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
- message(AUTHOR_WARNING
- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
- "Please enable at least one language before including KDEInstallDirs.")
- else()
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(_LIBDIR_DEFAULT "lib64")
- endif()
- endif()
- endif()
-endif()
set(_gnu_install_dirs_vars
BINDIR
@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
"QtQuick2 imports"
QML_INSTALL_DIR)
else()
- _define_relative(QTPLUGINDIR LIBDIR "plugins"
+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
"Qt plugins"
QT_PLUGIN_INSTALL_DIR)
- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
"QtQuick1 imports"
IMPORTS_INSTALL_DIR)
- _define_relative(QMLDIR LIBDIR "qml"
+ _define_relative(QMLDIR LIBDIR "qt5/qml"
"QtQuick2 imports"
QML_INSTALL_DIR)
endif()
--
2.3.0

View File

@@ -1,4 +0,0 @@
wrapKDEProgram() {
KSERVICE_BUILD_KDESYCOCA=${KDESYCOCA:+1}
wrapQtProgram "$1" ${KDESYCOCA:+--set KDESYCOCA "$KDESYCOCA"} "$@"
}

View File

@@ -1,34 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kbookmarks
, kcompletion
, kconfig
, kconfigwidgets
, ki18n
, kiconthemes
, kio
, knotifications
, kwidgetsaddons
, libXcursor
, qtx11extras
}:
kdeFramework {
name = "frameworkintegration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kbookmarks
kcompletion
kconfig
ki18n
kio
knotifications
kwidgetsaddons
libXcursor
qtx11extras
];
propagatedBuildInputs = [ kconfigwidgets kiconthemes ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,42 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, boost
, kcmutils
, kconfig
, kcoreaddons
, kdbusaddons
, kdeclarative
, kglobalaccel
, ki18n
, kio
, kservice
, kwindowsystem
, kxmlgui
, qtdeclarative
}:
kdeFramework {
name = "kactivities";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
boost
kcmutils
kconfig
kcoreaddons
kdbusaddons
kdeclarative
kglobalaccel
ki18n
kio
kservice
kwindowsystem
kxmlgui
qtdeclarative
];
postInstall = ''
wrapKDEProgram "$out/bin/kactivitymanagerd"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,13 +0,0 @@
diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
index e859ec7..9a8ab18 100644
--- a/KF5AuthConfig.cmake.in
+++ b/KF5AuthConfig.cmake.in
@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")

View File

@@ -1,31 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kconfigwidgets
, kcoreaddons
, kdeclarative
, ki18n
, kiconthemes
, kitemviews
, kpackage
, kservice
, kxmlgui
}:
kdeFramework {
name = "kcmutils";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons
kdeclarative
ki18n
kiconthemes
kitemviews
kpackage
kxmlgui
];
propagatedBuildInputs = [ kconfigwidgets kservice ];
patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,24 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kauth
, kcodecs
, kconfig
, kdoctools
, kguiaddons
, ki18n
, kwidgetsaddons
}:
kdeFramework {
name = "kconfigwidgets";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kguiaddons ki18n ];
propagatedBuildInputs = [ kauth kconfig kcodecs kwidgetsaddons ];
patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ];
postInstall = ''
wrapKDEProgram "$out/bin/preparetips5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,30 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, epoxy
, kconfig
, kglobalaccel
, kguiaddons
, ki18n
, kiconthemes
, kio
, kpackage
, kwidgetsaddons
, kwindowsystem
, pkgconfig
, qtdeclarative
}:
kdeFramework {
name = "kdeclarative";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem
];
propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
postInstall = ''
wrapKDEProgram "$out/bin/kpackagelauncherqml"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,58 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, docbook_xml_dtd_45
, kauth
, karchive
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kcrash
, kdbusaddons
, kdesignerplugin
, kdoctools
, kemoticons
, kglobalaccel
, kguiaddons
, ki18n
, kiconthemes
, kio
, kitemmodels
, kinit
, knotifications
, kparts
, kservice
, ktextwidgets
, kunitconversion
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, networkmanager
, qtsvg
, qtx11extras
, xlibs
}:
# TODO: debug docbook detection
kdeFramework {
name = "kdelibs4support";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcompletion kconfig kglobalaccel ki18n kio kservice kwidgetsaddons
kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
];
propagatedBuildInputs = [
kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
kdesignerplugin kemoticons kguiaddons kiconthemes kitemmodels
kinit knotifications kparts ktextwidgets kunitconversion
kwindowsystem
];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,22 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kconfig
, kcoreaddons
, ki18n
, kio
, kjobwidgets
, kparts
, kservice
, kwallet
, qtwebkit
}:
kdeFramework {
name = "kdewebkit";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ];
propagatedBuildInputs = [ qtwebkit ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c4863c..f731775 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
)
-find_package(DocBookXML4 "4.5")
set_package_properties(DocBookXML4 PROPERTIES
TYPE REQUIRED

View File

@@ -1,22 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, attr
, ebook_tools
, exiv2
, ffmpeg
, karchive
, ki18n
, popplerQt
, qtbase
, taglib
}:
kdeFramework {
name = "kfilemetadata";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ];
propagatedBuildInputs = [ qtbase ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,35 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, giflib
, karchive
, kcodecs
, kglobalaccel
, ki18n
, kiconthemes
, kio
, kjs
, knotifications
, kparts
, ktextwidgets
, kwallet
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, perl
, phonon
, qtx11extras
, sonnet
}:
kdeFramework {
name = "khtml";
nativeBuildInputs = [ extra-cmake-modules perl ];
buildInputs = [
giflib karchive kglobalaccel kiconthemes knotifications kwallet
kwidgetsaddons kwindowsystem kxmlgui phonon qtx11extras sonnet
];
propagatedBuildInputs = [ kcodecs ki18n kio kjs kparts ktextwidgets ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,16 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kconfigwidgets
, ki18n
, kitemviews
, qtsvg
}:
kdeFramework {
name = "kiconthemes";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,42 +0,0 @@
From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 13 Jun 2015 08:57:55 -0500
Subject: [PATCH] kinit libpath
---
src/kdeinit/kinit.cpp | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
index 9e775b6..0ac5646 100644
--- a/src/kdeinit/kinit.cpp
+++ b/src/kdeinit/kinit.cpp
@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
if (!libpath.isEmpty()) {
if (!l.load()) {
if (libpath_relative) {
- // NB: Because Qt makes the actual dlopen() call, the
- // RUNPATH of kdeinit is *not* respected - see
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
- // - so we try hacking it in ourselves
- QString install_lib_dir = QFile::decodeName(
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
- libpath = install_lib_dir + libpath;
- l.setFileName(libpath);
+ // Use QT_PLUGIN_PATH to find shared library directories
+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
+ // shared libraries should be in /lib/qt5/plugins/../../
+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
+ const QString up = QString::fromLocal8Bit("/../../");
+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
+ Q_FOREACH (const QString &path, paths) {
+ l.setFileName(path + up + libpath);
l.load();
+ if (l.isLoaded()) break;
+ }
}
}
if (!l.isLoaded()) {
--
2.4.2

View File

@@ -1,48 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, acl
, karchive
, kbookmarks
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdoctools
, ki18n
, kiconthemes
, kitemviews
, kjobwidgets
, knotifications
, kservice
, ktextwidgets
, kwallet
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, qtscript
, qtx11extras
, solid
}:
kdeFramework {
name = "kio";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
acl karchive kconfig kcoreaddons kdbusaddons ki18n kiconthemes
knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem
qtscript qtx11extras
];
propagatedBuildInputs = [
kbookmarks kcompletion kconfigwidgets kitemviews kjobwidgets kservice kxmlgui solid
];
postInstall = ''
wrapKDEProgram "$out/bin/kcookiejar5"
wrapKDEProgram "$out/bin/ktelnetservice5"
wrapKDEProgram "$out/bin/ktrash5"
wrapKDEProgram "$out/bin/kmailservice5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,21 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kdoctools
, ki18n
, kjs
, qtsvg
}:
kdeFramework {
name = "kjsembed";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtsvg ];
propagatedBuildInputs = [ ki18n kjs ];
postInstall = ''
wrapKDEProgram "$out/bin/kjscmd5"
wrapKDEProgram "$out/bin/kjsconsole"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,29 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, attica
, karchive
, kcompletion
, kconfig
, kcoreaddons
, ki18n
, kiconthemes
, kio
, kitemviews
, kservice
, ktextwidgets
, kwidgetsaddons
, kxmlgui
}:
kdeFramework {
name = "knewstuff";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
kitemviews ktextwidgets kwidgetsaddons
];
propagatedBuildInputs = [ attica kservice kxmlgui ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,17 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcompletion
, kconfig
, ki18n
, kio
, phonon
}:
kdeFramework {
name = "knotifyconfig";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcompletion kconfig ki18n kio phonon ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,25 +0,0 @@
From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 28 Jan 2015 07:15:30 -0600
Subject: [PATCH] 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 eb4a09b..f70f1a1 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
: QSharedData(),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{
--
2.1.4

View File

@@ -1,22 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, karchive
, kconfig
, kcoreaddons
, kdoctools
, ki18n
}:
kdeFramework {
name = "kpackage";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ karchive kconfig ki18n ];
propagatedBuildInputs = [ kcoreaddons ];
patches = [ ./0001-allow-external-paths.patch ];
postInstall = ''
wrapKDEProgram "$out/bin/kpackagetool5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,27 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kconfig
, kcoreaddons
, ki18n
, kiconthemes
, kio
, kjobwidgets
, knotifications
, kservice
, ktextwidgets
, kwidgetsaddons
, kxmlgui
}:
kdeFramework {
name = "kparts";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications
kservice kwidgetsaddons
];
propagatedBuildInputs = [ kio ktextwidgets kxmlgui ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,20 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcoreaddons
, ki18n
, kitemviews
, kservice
, kwidgetsaddons
, qtdeclarative
}:
kdeFramework {
name = "kpeople";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,24 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kconfig
, kcoreaddons
, ki18n
, kio
, kservice
, plasma-framework
, qtquick1
, solid
, threadweaver
}:
kdeFramework {
name = "krunner";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons ki18n kio kservice qtquick1 solid threadweaver
];
propagatedBuildInputs = [ plasma-framework ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,25 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kconfig
, kcoreaddons
, kcrash
, kdbusaddons
, kdoctools
, ki18n
, kwindowsystem
}:
kdeFramework {
name = "kservice";
setupHook = ./setup-hook.sh;
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
propagatedBuildInputs = [ kconfig ];
patches = [
./kservice-kbuildsycoca-follow-symlinks.patch
./kservice-kbuildsycoca-no-canonicalize-path.patch
];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,13 +0,0 @@
diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
index 69b1427..9c37a49 100644
--- a/src/kbuildsycoca/kbuildsycoca.cpp
+++ b/src/kbuildsycoca/kbuildsycoca.cpp
@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
QStringList relFiles;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString filePath = it.next();
Q_ASSERT(filePath.startsWith(dir)); // due to the line below...

View File

@@ -1,13 +0,0 @@
diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
index 2eb1275..e39a36f 100644
--- a/src/kbuildsycoca/vfolder_menu.cpp
+++ b/src/kbuildsycoca/vfolder_menu.cpp
@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
}
if (!relative) {
- QString resolved = QDir(dir).canonicalPath();
+ QString resolved = QDir::cleanPath(dir);
if (!resolved.isEmpty()) {
dir = resolved;
}

View File

@@ -1,13 +0,0 @@
export KDESYCOCA="$out/var/cache/kservices5/$name.sycoca"
KSERVICE_BUILD_KDESYCOCA=
buildKdeSycoca() {
if [[ -n "$KSERVICE_BUILD_KDESYCOCA" ]]; then
echo "building kdesycoca database in $KDESYCOCA"
mkdir -p "$(dirname $KDESYCOCA)"
kbuildsycoca5 --nosignal
fi
}
preFixupPhases+=" buildKdeSycoca"

View File

@@ -1,48 +0,0 @@
From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 15 Feb 2015 19:09:17 -0600
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 3f02e8c..d1a865b 100644
--- a/src/syntax/data/katehighlightingindexer.cpp
+++ b/src/syntax/data/katehighlightingindexer.cpp
@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
int main(int argc, char *argv[])
{
- // get app instance
- QCoreApplication app(argc, argv);
-
// ensure enough arguments are passed
- if (app.arguments().size() < 3)
+ if (argc < 3)
return 1;
// open schema
QXmlSchema schema;
- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
return 2;
- const QString hlFilenamesListing = app.arguments().value(3);
+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
if (hlFilenamesListing.isEmpty()) {
return 1;
}
@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
return anyError;
// create outfile, after all has worked!
- QFile outFile(app.arguments().at(1));
+ QFile outFile(QString::fromLocal8Bit(argv[1]));
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
return 7;
--
2.1.4

View File

@@ -1,27 +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 ki18n kiconthemes kio kparts
qtscript qtxmlpatterns sonnet
];
patches = [ ./0001-no-qcoreapplication.patch ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,23 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcompletion
, kconfig
, kconfigwidgets
, ki18n
, kiconthemes
, kservice
, kwindowsystem
, sonnet
}:
kdeFramework {
name = "ktextwidgets";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem
];
propagatedBuildInputs = [ ki18n sonnet ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,30 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kconfig
, kcoreaddons
, kdbusaddons
, kdoctools
, ki18n
, kiconthemes
, knotifications
, kservice
, kwidgetsaddons
, kwindowsystem
, libgcrypt
}:
kdeFramework {
name = "kwallet";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kdbusaddons ki18n kiconthemes knotifications
kservice kwidgetsaddons kwindowsystem libgcrypt
];
postInstall = ''
wrapKDEProgram "$out/bin/kwalletd5"
wrapKDEProgram "$out/bin/kwallet-query"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,25 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, attica
, kconfig
, kconfigwidgets
, kglobalaccel
, ki18n
, kiconthemes
, kitemviews
, ktextwidgets
, kwindowsystem
, sonnet
}:
kdeFramework {
name = "kxmlgui";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes
kitemviews ktextwidgets kwindowsystem sonnet
];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,40 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
, kactivities
, karchive
, kconfig
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdeclarative
, kdoctools
, kglobalaccel
, kguiaddons
, ki18n
, kiconthemes
, kio
, knotifications
, kpackage
, kservice
, kwindowsystem
, kxmlgui
, qtscript
, qtx11extras
}:
kdeFramework {
name = "plasma-framework";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kactivities karchive kconfig kconfigwidgets kcoreaddons
kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes
kio knotifications kwindowsystem kxmlgui qtscript qtx11extras
];
propagatedBuildInputs = [ kpackage kservice ];
postInstall = ''
wrapKDEProgram "$out/bin/plasmapkg2"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,14 +0,0 @@
{ kdeFramework, lib
, extra-cmake-modules
}:
kdeFramework {
name = "solid";
nativeBuildInputs = [ extra-cmake-modules ];
postInstall = ''
wrapKDEProgram "$out/bin/solid-hardware5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,549 +0,0 @@
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
attica = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/attica-5.14.0.tar.xz";
sha256 = "0n5znf19112i1j2mwvyzc3g75bc83fdr1p7vljw670fjy2wm1fjy";
name = "attica-5.14.0.tar.xz";
};
};
baloo = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/baloo-5.14.0.tar.xz";
sha256 = "0q72ij44r827259mw26q9f6518nj6jbawa94m8m2vrqdhcfjn25d";
name = "baloo-5.14.0.tar.xz";
};
};
bluez-qt = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/bluez-qt-5.14.0.tar.xz";
sha256 = "136kjw4d91k85pkj90hs01nnqq51apppzbhjl7mx3xjqd2f15ljz";
name = "bluez-qt-5.14.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/extra-cmake-modules-5.14.0.tar.xz";
sha256 = "1c6frrvs8j56fyj0d9gcbqq3phhxmvn5ciy6bvj8vch3lynxrvyg";
name = "extra-cmake-modules-5.14.0.tar.xz";
};
};
frameworkintegration = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/frameworkintegration-5.14.0.tar.xz";
sha256 = "194vhbjbjpdc8v69g1i08qcm8ywxfxm4ryc75dpp20117jfy9xy8";
name = "frameworkintegration-5.14.0.tar.xz";
};
};
kactivities = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kactivities-5.14.0.tar.xz";
sha256 = "0q6c06qjypg3iy8x60wvyhm5n8fvdkcw5ibvns0zxxa8vw13l6z9";
name = "kactivities-5.14.0.tar.xz";
};
};
kapidox = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kapidox-5.14.0.tar.xz";
sha256 = "14ai2n5ajm8sqdv0yy5hr0fg1ks9mvkf3diij7zjfzqi315wav6q";
name = "kapidox-5.14.0.tar.xz";
};
};
karchive = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/karchive-5.14.0.tar.xz";
sha256 = "1sary49lwp09vrgwndaz3lhp6j3zkllxklbvm5s05i9mjxzgqww4";
name = "karchive-5.14.0.tar.xz";
};
};
kauth = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kauth-5.14.0.tar.xz";
sha256 = "1kfqp6jrgx1wlznplr29spi08927cmiln718wzpzvzy8h3sfjc0l";
name = "kauth-5.14.0.tar.xz";
};
};
kbookmarks = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kbookmarks-5.14.0.tar.xz";
sha256 = "12kv62ykys5rvmsia955nxv7m4xd551z762bjvvwjq3zds8pj5p3";
name = "kbookmarks-5.14.0.tar.xz";
};
};
kcmutils = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kcmutils-5.14.0.tar.xz";
sha256 = "0c71b8gqja1qv8lkb7yn0z7qrgvnmhvhb751k9xsiabp306apx5f";
name = "kcmutils-5.14.0.tar.xz";
};
};
kcodecs = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kcodecs-5.14.0.tar.xz";
sha256 = "0prhj43h7dh4811f3kfp6n0wvskczg42q17lbfn6p0d5qa0bz07y";
name = "kcodecs-5.14.0.tar.xz";
};
};
kcompletion = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kcompletion-5.14.0.tar.xz";
sha256 = "14ba77fmcf4ldqbwc86frai9hz9jsz9663b0v8r3aca0mg7k096v";
name = "kcompletion-5.14.0.tar.xz";
};
};
kconfig = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kconfig-5.14.0.tar.xz";
sha256 = "1c2rw3blgc7rmkaybr9jc3dfc1vzhvskrll7bc8xdm82b5m1850x";
name = "kconfig-5.14.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kconfigwidgets-5.14.0.tar.xz";
sha256 = "103c2vd05ccmyzqf7yznz8d0vhd94c1381p5ajvibvzfv9cs4djg";
name = "kconfigwidgets-5.14.0.tar.xz";
};
};
kcoreaddons = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kcoreaddons-5.14.0.tar.xz";
sha256 = "0xm2n7gvzq674cwi8gb8zkawj9pkaiv1qi63a76hl9vylidrm26q";
name = "kcoreaddons-5.14.0.tar.xz";
};
};
kcrash = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kcrash-5.14.0.tar.xz";
sha256 = "18cc444wwfdfbr0m1064l34azl6f560f5npcz5spvz0yydlh0fs4";
name = "kcrash-5.14.0.tar.xz";
};
};
kdbusaddons = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kdbusaddons-5.14.0.tar.xz";
sha256 = "009rzlr5a8znn4f31gz6zwi93mla09jy3rs336i7f6b111ha4yqy";
name = "kdbusaddons-5.14.0.tar.xz";
};
};
kdeclarative = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kdeclarative-5.14.0.tar.xz";
sha256 = "1d87s26crv94w0g88xkqand3a1d02dcr9glbvpx1xxpz64mybvr4";
name = "kdeclarative-5.14.0.tar.xz";
};
};
kded = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kded-5.14.0.tar.xz";
sha256 = "03s95pq283vjng106bs9lrj1i2fcb1pnp58cnk1fr6w3w8fp6daq";
name = "kded-5.14.0.tar.xz";
};
};
kdelibs4support = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/portingAids/kdelibs4support-5.14.0.tar.xz";
sha256 = "1qdw5alnf643bw0pzq3yjwajl87000xpbs8h4k2c1872rmqq1m8r";
name = "kdelibs4support-5.14.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kdesignerplugin-5.14.0.tar.xz";
sha256 = "1bb79szygplysckx7p4x66inbn9i2hmf6p7ikynbvkzph33zm375";
name = "kdesignerplugin-5.14.0.tar.xz";
};
};
kdesu = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kdesu-5.14.0.tar.xz";
sha256 = "1l232jhl6x7b6xqw21qw0s342c6n2gnldsdd5fmh6grx4vv556nn";
name = "kdesu-5.14.0.tar.xz";
};
};
kdewebkit = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kdewebkit-5.14.0.tar.xz";
sha256 = "0pz0z43mgcp4m5kdcqjl6x0cwafl0j2nidayj3vhaxcj40kn4k8l";
name = "kdewebkit-5.14.0.tar.xz";
};
};
kdnssd = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kdnssd-5.14.0.tar.xz";
sha256 = "0cc0adzn4pc0s6mdv71bv6h8k7x0q941f6xdmj7jpcz2q6lycav1";
name = "kdnssd-5.14.0.tar.xz";
};
};
kdoctools = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kdoctools-5.14.0.tar.xz";
sha256 = "06477pk0wni40c88c1v6rcl1yy91msfs399djb0i0ipkjnbj8gbs";
name = "kdoctools-5.14.0.tar.xz";
};
};
kemoticons = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kemoticons-5.14.0.tar.xz";
sha256 = "1dsr9hbqjrwn44zm9i5anm8sy8jb90yjyv4s219kll5rkrbxk0zr";
name = "kemoticons-5.14.0.tar.xz";
};
};
kfilemetadata = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kfilemetadata-5.14.0.tar.xz";
sha256 = "1ixn5yc7j4s3nvn03h7whkxsg15gf1cqnd3z2qxngvyvchzqhsd2";
name = "kfilemetadata-5.14.0.tar.xz";
};
};
kglobalaccel = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kglobalaccel-5.14.0.tar.xz";
sha256 = "0cr62as4n3k34dbdcarmhkxkcznnkp65q57sy6k29a68jxgxq6c3";
name = "kglobalaccel-5.14.0.tar.xz";
};
};
kguiaddons = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kguiaddons-5.14.0.tar.xz";
sha256 = "0658nn4lb59vzn6b9kmasl2a4g58c81cran6kz0fwc82d2310ncn";
name = "kguiaddons-5.14.0.tar.xz";
};
};
khtml = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/portingAids/khtml-5.14.0.tar.xz";
sha256 = "1hj406v06isggbzvsw47ws510iz128jv5ggxw64p9pcibs3wb5j2";
name = "khtml-5.14.0.tar.xz";
};
};
ki18n = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/ki18n-5.14.0.tar.xz";
sha256 = "0pwpxda5k7hl6njzzaj68brm1slfffprncgwknhaxksizprdh1qz";
name = "ki18n-5.14.0.tar.xz";
};
};
kiconthemes = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kiconthemes-5.14.0.tar.xz";
sha256 = "0mhykdhzab112h5pb2s2sma821x57mnr3ydwq96qjr7xhdib8dwr";
name = "kiconthemes-5.14.0.tar.xz";
};
};
kidletime = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kidletime-5.14.0.tar.xz";
sha256 = "07qhmyld01xcidbhkwscz5x8xvnnbphz7hfiqkn20d0n6kmlfbr8";
name = "kidletime-5.14.0.tar.xz";
};
};
kimageformats = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kimageformats-5.14.0.tar.xz";
sha256 = "13s25pxxjddbbzvf9l0pcrjcwkkc108318v7yglqrm58ankq8pyy";
name = "kimageformats-5.14.0.tar.xz";
};
};
kinit = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kinit-5.14.0.tar.xz";
sha256 = "1g6wvpd7kzmnayfax2ph7sng1blaa91fclzfxpvwnxqpayzj2z6a";
name = "kinit-5.14.0.tar.xz";
};
};
kio = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kio-5.14.0.tar.xz";
sha256 = "1brirg53khh8wyyd3sbnas82924idxbbc81wqk8433ryv645i8ra";
name = "kio-5.14.0.tar.xz";
};
};
kitemmodels = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kitemmodels-5.14.0.tar.xz";
sha256 = "0phf2278fpiyippz347l18gw3kgfvmdm2mv2wx56rsfy5inih8qf";
name = "kitemmodels-5.14.0.tar.xz";
};
};
kitemviews = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kitemviews-5.14.0.tar.xz";
sha256 = "1yk8djnrw4z5dw7xmwwsgz3fw1n3c1yjkggkgjy75659656psac1";
name = "kitemviews-5.14.0.tar.xz";
};
};
kjobwidgets = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kjobwidgets-5.14.0.tar.xz";
sha256 = "0ibxbhh335b8j5603z500fw4mnk776jj364ha9c1n4qdd7ar5yi0";
name = "kjobwidgets-5.14.0.tar.xz";
};
};
kjs = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/portingAids/kjs-5.14.0.tar.xz";
sha256 = "1xwp9jpwmkc5h1rab6bda6ffib064qn1wpmz6hdhrgzp77v5ljw4";
name = "kjs-5.14.0.tar.xz";
};
};
kjsembed = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/portingAids/kjsembed-5.14.0.tar.xz";
sha256 = "09vlq2d0nzhw1fiy7nww0ixa15ciwc6i9f4xqay746xy9f5i30vl";
name = "kjsembed-5.14.0.tar.xz";
};
};
kmediaplayer = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/portingAids/kmediaplayer-5.14.0.tar.xz";
sha256 = "1mcvrffg9lfvhy6qs9v1caxf523zh2jy1mhd88m34p7sfdxp8azm";
name = "kmediaplayer-5.14.0.tar.xz";
};
};
knewstuff = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/knewstuff-5.14.0.tar.xz";
sha256 = "0yprn590g5y0gcvmlk5p79v2svn29zyhgq9lmp5qzhh7wgz8jp26";
name = "knewstuff-5.14.0.tar.xz";
};
};
knotifications = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/knotifications-5.14.0.tar.xz";
sha256 = "0w0b9wb5zpwjhzph5cqfvcgxz2dafi33f3jgwmdw9sm2cgmwavgb";
name = "knotifications-5.14.0.tar.xz";
};
};
knotifyconfig = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/knotifyconfig-5.14.0.tar.xz";
sha256 = "04872agypbnj3kc6q0xa5ndzd7lzny5zp1llad0x10k7spvwk0rb";
name = "knotifyconfig-5.14.0.tar.xz";
};
};
kpackage = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kpackage-5.14.0.tar.xz";
sha256 = "0rvm9vwlirk38wbjyp8kkvs2m03mb1bby63zakbd7y2x5l26hyd5";
name = "kpackage-5.14.0.tar.xz";
};
};
kparts = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kparts-5.14.0.tar.xz";
sha256 = "149mck84rlbvw0am7jqbs6irhhabp8xd49m1b5avgdqfrkjsrrz5";
name = "kparts-5.14.0.tar.xz";
};
};
kpeople = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kpeople-5.14.0.tar.xz";
sha256 = "08khnnywj7f3xkgr7yclz7wdhq4lyi9xfm7f7lzsfk6vpvzn84p5";
name = "kpeople-5.14.0.tar.xz";
};
};
kplotting = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kplotting-5.14.0.tar.xz";
sha256 = "1d3fii89ziqnjv864qp7v9r5wd9v2qb56n6m5v9j0pz8gysc2fyp";
name = "kplotting-5.14.0.tar.xz";
};
};
kpty = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kpty-5.14.0.tar.xz";
sha256 = "0lyayl4z6a1fn1lr1plikx22crdalnr1sv66nwhld7dh9j3lgd6j";
name = "kpty-5.14.0.tar.xz";
};
};
kross = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/portingAids/kross-5.14.0.tar.xz";
sha256 = "1s7icj7xsnj8sxg99ahv3h8rbv6xnkyqpybxgaj9xs6k738rjclv";
name = "kross-5.14.0.tar.xz";
};
};
krunner = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/portingAids/krunner-5.14.0.tar.xz";
sha256 = "0lxsbg4r0hxq9cgj2c8bs5yyzaxbpn73nsxhh1a9ivjcdbdz52x3";
name = "krunner-5.14.0.tar.xz";
};
};
kservice = {
version = "5.14.3";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kservice-5.14.3.tar.xz";
sha256 = "0x3lbzs39vxyndh3v3kcwbp9127llfxyjgbm6yga1mff29ld57g7";
name = "kservice-5.14.3.tar.xz";
};
};
ktexteditor = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/ktexteditor-5.14.0.tar.xz";
sha256 = "1r3zshqn7f7z81i2zzswc0a4158q21jgk5ydlx82v5w41lgsng9z";
name = "ktexteditor-5.14.0.tar.xz";
};
};
ktextwidgets = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/ktextwidgets-5.14.0.tar.xz";
sha256 = "0nm6jaqx2jrwmqds3hdpkxmzl03vz46f147q0q659gashq9i6nlr";
name = "ktextwidgets-5.14.0.tar.xz";
};
};
kunitconversion = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kunitconversion-5.14.0.tar.xz";
sha256 = "080y8lxggb1dm4hjv0qb6baklb42mngz7ic3fdp9nc7jrsfbn4qq";
name = "kunitconversion-5.14.0.tar.xz";
};
};
kwallet = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kwallet-5.14.0.tar.xz";
sha256 = "1sk1mami15wygx7rmq2p445qdvx7yq10rhvbxgwclmvd4lj8vnly";
name = "kwallet-5.14.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kwidgetsaddons-5.14.0.tar.xz";
sha256 = "0vqrz54f57qz2jls7iw3hsfgglidfjhk88rkpr0sam449hmqxw2v";
name = "kwidgetsaddons-5.14.0.tar.xz";
};
};
kwindowsystem = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kwindowsystem-5.14.0.tar.xz";
sha256 = "0fgqbrm1ngisjz11ccwvjb05v9v8fy85hvxaqnak0xysmvsw4sq1";
name = "kwindowsystem-5.14.0.tar.xz";
};
};
kxmlgui = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kxmlgui-5.14.0.tar.xz";
sha256 = "1j3m37h6lxkk3bs2klqqlqlpnrlqvc1a3yd1hn8sr5sn279src30";
name = "kxmlgui-5.14.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/kxmlrpcclient-5.14.0.tar.xz";
sha256 = "13s1np7sjjkmnih5r6rszqs3pvq0m4wq9za73cwhwnmlha7m3q0s";
name = "kxmlrpcclient-5.14.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/modemmanager-qt-5.14.0.tar.xz";
sha256 = "1njg0gmzmj6g1w6d7id44g6dw7bki8xsq3sk0p7jqh1lcnsww4ck";
name = "modemmanager-qt-5.14.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/networkmanager-qt-5.14.0.tar.xz";
sha256 = "1j2srgz4z2jd6b0iyb1rj979k0jz9hk8k7wx23146cvgrr4h4s86";
name = "networkmanager-qt-5.14.0.tar.xz";
};
};
plasma-framework = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/plasma-framework-5.14.0.tar.xz";
sha256 = "16yghp353l9apndwqcaa310cxhm6vn0c2amggzvpr5fdwa3jb6mh";
name = "plasma-framework-5.14.0.tar.xz";
};
};
solid = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/solid-5.14.0.tar.xz";
sha256 = "0znrmpw9nr2yccqs1xr0kai3sfhi175gfr006h4h88kfr0gc9s4i";
name = "solid-5.14.0.tar.xz";
};
};
sonnet = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/sonnet-5.14.0.tar.xz";
sha256 = "06nn9zxxvj7sf6pdg35vay1f022c2binhl8p7i29w7vmxnxdg4w9";
name = "sonnet-5.14.0.tar.xz";
};
};
threadweaver = {
version = "5.14.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.14/threadweaver-5.14.0.tar.xz";
sha256 = "01vdqhlg5jp14dhalpggy359hw9620309zbssp0pdv7bflnwl0n3";
name = "threadweaver-5.14.0.tar.xz";
};
};
}

View File

@@ -0,0 +1,25 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
}:
kdeFramework {
name = "baloo";
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [
kconfig kcrash kdbusaddons lmdb qtquick1 solid
];
propagatedBuildInputs = [
kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
];
postInstall = ''
wrapQtProgram "$out/bin/baloo_file"
wrapQtProgram "$out/bin/baloo_file_extractor"
wrapQtProgram "$out/bin/balooctl"
wrapQtProgram "$out/bin/baloosearch"
wrapQtProgram "$out/bin/balooshow"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -9,7 +9,7 @@
let
inherit (pkgs) lib stdenv;
inherit (pkgs) lib makeSetupHook stdenv;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };

View File

@@ -2,9 +2,10 @@
kdeFramework {
name = "extra-cmake-modules";
setupHook = ./setup-hook.sh;
patches = [ ./0001-extra-cmake-modules-paths.patch ];
setupHook = ./setup-hook.sh;
# It is OK to propagate these inputs as long as
# extra-cmake-modules is never a propagated input
# of some other derivation.

View File

@@ -0,0 +1,27 @@
addMimePkg() {
local propagated
if [[ -d "$1/share/mime" ]]; then
propagated=
for pkg in $propagatedBuildInputs; do
if [[ "z$pkg" == "z$1" ]]; then
propagated=1
fi
done
if [[ -z $propagated ]]; then
propagatedBuildInputs="$propagatedBuildInputs $1"
fi
propagated=
for pkg in $propagatedUserEnvPkgs; do
if [[ "z$pkg" == "z$1" ]]; then
propagated=1
fi
done
if [[ -z $propagated ]]; then
propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
fi
fi
}
envHooks+=(addMimePkg)

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.14/"
RELEASE_URL="http://download.kde.org/stable/frameworks/5.15/"
EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp

View File

@@ -0,0 +1,17 @@
{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
, kwidgetsaddons, libXcursor, qtx11extras
}:
kdeFramework {
name = "frameworkintegration";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kbookmarks kcompletion kconfig knotifications kwidgetsaddons
libXcursor
];
propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -0,0 +1,22 @@
{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
}:
kdeFramework {
name = "kactivities";
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [
boost kcmutils kconfig kcoreaddons kdbusaddons kservice
kxmlgui
];
propagatedBuildInputs = [
kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
];
postInstall = ''
wrapQtProgram "$out/bin/kactivitymanagerd"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,13 +1,25 @@
From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:43:53 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
src/kpluginselector.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index c63241b..2243f94 100644
index 9c3431d..d6b1ee2 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
desktopFileNames.append(it.next());
}
--
2.5.2

View File

@@ -0,0 +1,17 @@
{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
, kpackage, kservice, kxmlgui
}:
kdeFramework {
name = "kcmutils";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kcoreaddons kiconthemes kitemviews kpackage kxmlgui
];
propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,13 +1,14 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeQtWrapper
}:
kdeFramework {
name = "kconfig";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
postInstall = ''
wrapKDEProgram "$out/bin/kreadconfig5"
wrapKDEProgram "$out/bin/kwriteconfig5"
wrapQtProgram "$out/bin/kreadconfig5"
wrapQtProgram "$out/bin/kwriteconfig5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View File

@@ -1,3 +1,12 @@
From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:47:01 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
src/khelpclient.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
index 53a331e..80fbb01 100644
--- a/src/khelpclient.cpp
@@ -11,3 +20,6 @@ index 53a331e..80fbb01 100644
while (it.hasNext()) {
const QString desktopPath(it.next());
KDesktopFile desktopFile(desktopPath);
--
2.5.2

View File

@@ -0,0 +1,17 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
}:
kdeFramework {
name = "kconfigwidgets";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ kguiaddons ];
propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
postInstall = ''
wrapQtProgram "$out/bin/preparetips5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -8,7 +8,8 @@
kdeFramework {
name = "kcrash";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
buildInputs = [ kcoreaddons ];
propagatedBuildInputs = [ kwindowsystem qtx11extras ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};

View File

@@ -1,14 +1,15 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeQtWrapper
, qtx11extras
}:
kdeFramework {
name = "kdbusaddons";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtx11extras ];
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
propagatedBuildInputs = [ qtx11extras ];
postInstall = ''
wrapKDEProgram "$out/bin/kquitapp5"
wrapQtProgram "$out/bin/kquitapp5"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];

View File

@@ -0,0 +1,22 @@
{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
, qtdeclarative
}:
kdeFramework {
name = "kdeclarative";
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [
epoxy kguiaddons kiconthemes kwidgetsaddons
];
propagatedBuildInputs = [
kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
];
postInstall = ''
wrapQtProgram "$out/bin/kpackagelauncherqml"
'';
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -0,0 +1,32 @@
{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
, kinit, knotifications, kparts, kservice, ktextwidgets
, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
, networkmanager, qtsvg, qtx11extras, xlibs
}:
# TODO: debug docbook detection
kdeFramework {
name = "kdelibs4support";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcompletion kconfig kservice kwidgetsaddons
kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
];
propagatedBuildInputs = [
kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
kunitconversion kwindowsystem
];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -21,9 +21,10 @@ kdeFramework {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons
kxmlgui sonnet
kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
kxmlgui
];
propagatedBuildInputs = [ kio sonnet ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};

View File

@@ -1,16 +1,12 @@
{ kdeFramework, lib
, extra-cmake-modules
, kcoreaddons
, ki18n
, kpty
{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
, kservice
}:
kdeFramework {
name = "kdesu";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons ki18n kservice ];
propagatedBuildInputs = [ kpty ];
buildInputs = [ kcoreaddons kservice ];
propagatedBuildInputs = [ ki18n kpty ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};

View File

@@ -0,0 +1,13 @@
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
}:
kdeFramework {
name = "kdewebkit";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
propagatedBuildInputs = [ ki18n kio qtwebkit ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
}

View File

@@ -1,18 +1,14 @@
{ kdeFramework, lib
, extra-cmake-modules
, docbook_xml_dtd_45
, docbook5_xsl
, karchive
, ki18n
, perl
, perlPackages
{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
}:
kdeFramework {
name = "kdoctools";
setupHook = ./setup-hook.sh;
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive ki18n ];
propagatedNativeBuildInputs = [ perl perlPackages.URI ];
buildInputs = [ karchive ];
propagatedBuildInputs = [ ki18n ];
propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"

View File

@@ -0,0 +1,5 @@
addXdgData() {
addToSearchPath XDG_DATA_DIRS "$1/share"
}
envHooks+=(addXdgData)

Some files were not shown because too many files have changed in this diff Show More