public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120514 from ttuegel/kde-gear-21.04.0

Browse Source 
KDE Gear 21.04.0
This commit is contained in:
Thomas Tuegel 2021-05-12 05:58:30 -05:00 committed by GitHub
commit f99ac85c52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 1023 additions and 983 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -100,6 +100,18 @@
Now nginx uses the zlib-ng library by default. Now nginx uses the zlib-ng library by default.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
KDE Gear (formerly KDE Applications) is upgraded to 21.04, see its
<link xlink:href="https://kde.org/announcements/gear/21.04/">release
notes</link> for details.
</para>
<para>
The <code>kdeApplications</code> package set is now <code>kdeGear</code>,
in keeping with the new name. The old name remains for compatibility, but
it is deprecated.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

4
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -8,7 +8,7 @@ let
cfg = xcfg.desktopManager.plasma5; cfg = xcfg.desktopManager.plasma5;
libsForQt5 = pkgs.plasma5Packages; libsForQt5 = pkgs.plasma5Packages;
inherit (libsForQt5) kdeApplications kdeFrameworks plasma5; inherit (libsForQt5) kdeGear kdeFrameworks plasma5;
inherit (pkgs) writeText; inherit (pkgs) writeText;
pulseaudio = config.hardware.pulseaudio; pulseaudio = config.hardware.pulseaudio;
@ -213,7 +213,7 @@ in
environment.systemPackages = environment.systemPackages =
with libsForQt5; with libsForQt5;
with plasma5; with kdeApplications; with kdeFrameworks; with plasma5; with kdeGear; with kdeFrameworks;
[ [
frameworkintegration frameworkintegration
kactivities kactivities

4
pkgs/applications/kde/akonadi-import-wizard.nix
View File

@ -2,7 +2,8 @@
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio, akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio,
kmailtransport, kwallet, mailcommon, mailimporter, messagelib kmailtransport, kwallet, mailcommon, mailimporter, messagelib,
qtkeychain, libsecret
}: }:
mkDerivation { mkDerivation {
@ -15,6 +16,7 @@ mkDerivation {
buildInputs = [ buildInputs = [
akonadi karchive kcontacts kcrash kidentitymanagement kio akonadi karchive kcontacts kcrash kidentitymanagement kio
kmailtransport kwallet mailcommon mailimporter messagelib kmailtransport kwallet mailcommon mailimporter messagelib
qtkeychain libsecret
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

50
pkgs/applications/kde/akonadi/0001-akonadi-paths.patch
View File

@ -1,6 +1,6 @@
From f4d718502ecd8242500078a7783e27caba72871e Mon Sep 17 00:00:00 2001 From ca8ff6e6d527ee968300cce5e8cd148f6a4d256b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:00:03 -0600 Date: Sun, 25 Apr 2021 08:00:10 -0500
Subject: [PATCH 1/3] akonadi paths Subject: [PATCH 1/3] akonadi paths
--- ---
@ -11,32 +11,32 @@ Subject: [PATCH 1/3] akonadi paths
4 files changed, 11 insertions(+), 40 deletions(-) 4 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
index 31e0cf2..6436e87 100644 index 44ceec5..eb5fa50 100644
--- a/src/akonadicontrol/agentmanager.cpp --- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp +++ b/src/akonadicontrol/agentmanager.cpp
@@ -48,7 +48,7 @@ public: @@ -47,7 +47,7 @@ public:
[]() { connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
QCoreApplication::instance()->exit(255); QCoreApplication::instance()->exit(255);
}); });
- start(QStringLiteral("akonadiserver"), args, RestartOnCrash); - start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
+ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash); + start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
} }
~StorageProcessControl() override ~StorageProcessControl() override
@@ -70,7 +70,7 @@ public: @@ -69,7 +69,7 @@ public:
[]() { connect(this, &Akonadi::ProcessControl::unableToStart, this, []() {
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
}); });
- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash); - start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
+ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash); + start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
} }
~AgentServerProcessControl() override ~AgentServerProcessControl() override
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
index c98946c..aa307ca 100644 index 8e92e08..f98dfd8 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp --- a/src/akonadicontrol/agentprocessinstance.cpp
+++ b/src/akonadicontrol/agentprocessinstance.cpp +++ b/src/akonadicontrol/agentprocessinstance.cpp
@@ -49,7 +49,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) @@ -47,7 +47,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
} else { } else {
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier(); const QStringList arguments = QStringList() << executable << identifier();
@ -46,10 +46,10 @@ index c98946c..aa307ca 100644
} }
return true; return true;
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index d595a3a..99324f6 100644 index 1a437ac..3550f9d 100644
--- a/src/server/storage/dbconfigmysql.cpp --- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp
@@ -69,7 +69,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -72,7 +72,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver // determine default settings depending on the driver
QString defaultHostName; QString defaultHostName;
QString defaultOptions; QString defaultOptions;
@ -57,7 +57,7 @@ index d595a3a..99324f6 100644
QString defaultCleanShutdownCommand; QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
@@ -78,16 +77,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -80,16 +79,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif #endif
const bool defaultInternalServer = true; const bool defaultInternalServer = true;
@ -75,7 +75,7 @@ index d595a3a..99324f6 100644
if (!mysqladminPath.isEmpty()) { if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown") defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
@@ -97,10 +87,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -99,10 +89,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif #endif
} }
@ -88,7 +88,7 @@ index d595a3a..99324f6 100644
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@@ -117,7 +107,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -119,7 +109,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString(); mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -97,7 +97,7 @@ index d595a3a..99324f6 100644
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup(); settings.endGroup();
@@ -127,9 +117,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -129,9 +119,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// intentionally not namespaced as we are the only one in this db instance when using internal mode // intentionally not namespaced as we are the only one in this db instance when using internal mode
mDatabaseName = QStringLiteral("akonadi"); mDatabaseName = QStringLiteral("akonadi");
} }
@ -107,7 +107,7 @@ index d595a3a..99324f6 100644
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
@@ -139,9 +126,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings) @@ -141,9 +128,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions); settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@ -117,7 +117,7 @@ index d595a3a..99324f6 100644
settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@@ -214,7 +198,7 @@ bool DbConfigMysql::startInternalServer() @@ -215,7 +199,7 @@ bool DbConfigMysql::startInternalServer()
#endif #endif
// generate config file // generate config file
@ -127,10 +127,10 @@ index d595a3a..99324f6 100644
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) { if (globalConfig.isEmpty()) {
diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
index dd273fc..05288d9 100644 index 4df61da..e3469c4 100644
--- a/src/server/storage/dbconfigpostgresql.cpp --- a/src/server/storage/dbconfigpostgresql.cpp
+++ b/src/server/storage/dbconfigpostgresql.cpp +++ b/src/server/storage/dbconfigpostgresql.cpp
@@ -127,9 +127,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) @@ -125,9 +125,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver // determine default settings depending on the driver
QString defaultHostName; QString defaultHostName;
QString defaultOptions; QString defaultOptions;
@ -140,7 +140,7 @@ index dd273fc..05288d9 100644
QString defaultPgData; QString defaultPgData;
#ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
@@ -140,12 +138,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) @@ -138,12 +136,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
if (mInternalServer) { if (mInternalServer) {
@ -154,7 +154,7 @@ index dd273fc..05288d9 100644
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
} }
@@ -164,20 +158,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) @@ -162,20 +156,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString(); mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -177,7 +177,7 @@ index dd273fc..05288d9 100644
qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath; qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString(); mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
if (mPgData.isEmpty()) { if (mPgData.isEmpty()) {
@@ -194,7 +182,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings) @@ -192,7 +180,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Port"), mHostPort); settings.setValue(QStringLiteral("Port"), mHostPort);
} }
settings.setValue(QStringLiteral("Options"), mConnectionOptions); settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@ -186,5 +186,5 @@ index dd273fc..05288d9 100644
settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup(); settings.endGroup();
-- --
2.29.2 2.31.1

14
pkgs/applications/kde/akonadi/0002-akonadi-timestamps.patch
View File

@ -1,6 +1,6 @@
From badd4be311afd37a99126c60490f1ae5daced6c4 Mon Sep 17 00:00:00 2001 From f6c446cf6fab2edbd2606b4c6100903e9437362a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:00:15 -0600 Date: Sun, 25 Apr 2021 08:01:02 -0500
Subject: [PATCH 2/3] akonadi timestamps Subject: [PATCH 2/3] akonadi timestamps
--- ---
@ -8,19 +8,19 @@ Subject: [PATCH 2/3] akonadi timestamps
1 file changed, 1 insertion(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index 99324f6..3c170a8 100644 index 3550f9d..e9e8887 100644
--- a/src/server/storage/dbconfigmysql.cpp --- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp
@@ -240,8 +240,7 @@ bool DbConfigMysql::startInternalServer() @@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer()
bool confUpdate = false; bool confUpdate = false;
QFile actualFile(actualConfig); QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual // update conf only if either global (or local) is newer than actual
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) || - if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified())
- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { - || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
+ if (true) { + if (true) {
QFile globalFile(globalConfig); QFile globalFile(globalConfig);
QFile localFile(localConfig); QFile localFile(localConfig);
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
-- --
2.29.2 2.31.1

10
pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
View File

@ -1,6 +1,6 @@
From 82bfa975af60757374ffad787e56a981d6df0f98 Mon Sep 17 00:00:00 2001 From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Jan 2021 11:01:24 -0600 Date: Sun, 25 Apr 2021 08:01:21 -0500
Subject: [PATCH 3/3] akonadi revert make relocatable Subject: [PATCH 3/3] akonadi revert make relocatable
--- ---
@ -9,10 +9,10 @@ Subject: [PATCH 3/3] akonadi revert make relocatable
2 files changed, 3 insertions(+), 6 deletions(-) 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bb5fec..35720b4 100644 index 4e8cc81..63161b7 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -343,9 +343,6 @@ configure_package_config_file( @@ -368,9 +368,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@ -41,5 +41,5 @@ index bcf7320..1574319 100644
# set the directories # set the directories
if(NOT AKONADI_INSTALL_DIR) if(NOT AKONADI_INSTALL_DIR)
-- --
2.29.2 2.31.1

7
pkgs/applications/kde/akonadi/default.nix
View File

@ -1,5 +1,5 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam, substituteAll,
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
@ -33,8 +33,7 @@ mkDerivation {
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
''-DNIXPKGS_POSTGRES_INITDB=\"\"'' ''-DNIXPKGS_POSTGRES_INITDB=\"\"''
''-DNIX_OUT=\"${placeholder "out"}\"''
''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory
]; ];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\""
'';
} }

14
pkgs/applications/kde/default.nix
View File

@ -30,6 +30,9 @@ still shows most of the available features is in `./gwenview.nix`.
}: }:
let let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
mirror = "mirror://kde"; mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; }; srcs = import ./srcs.nix { inherit fetchurl mirror; };
@ -45,10 +48,13 @@ let
outputs = args.outputs or [ "out" ]; outputs = args.outputs or [ "out" ];
meta = { meta =
platforms = lib.platforms.linux; let meta = args.meta or {}; in
homepage = "http://www.kde.org"; meta // {
} // (args.meta or {}); homepage = meta.homepage or "http://www.kde.org";
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
}); });
packages = self: with self; packages = self: with self;

2
pkgs/applications/kde/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.3/src -A '*.tar.xz' ) WGET_ARGS=( http://download.kde.org/stable/release-service/21.04.0/src -A '*.tar.xz' )

4
pkgs/applications/kde/kcachegrind.nix
View File

@ -1,8 +1,8 @@
{ {
mkDerivation, lib, mkDerivation, lib,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
karchive, ki18n, kio, perl, python3, php, qttools karchive, ki18n, kio, perl, python3, php, qttools,
, kdbusaddons kdbusaddons
}: }:
mkDerivation { mkDerivation {

2
pkgs/applications/kde/kdeconnect-kde.nix
View File

@ -21,6 +21,7 @@
, qca-qt5 , qca-qt5
, qtgraphicaleffects , qtgraphicaleffects
, qtmultimedia , qtmultimedia
, qtquickcontrols2
, qtx11extras , qtx11extras
, sshfs , sshfs
}: }:
@ -46,6 +47,7 @@ mkDerivation {
qca-qt5 qca-qt5
qtgraphicaleffects qtgraphicaleffects
qtmultimedia qtmultimedia
qtquickcontrols2
qtx11extras qtx11extras
]; ];

2
pkgs/applications/kde/kdenlive/default.nix
View File

@ -26,6 +26,7 @@
, phonon-backend-gstreamer , phonon-backend-gstreamer
, qtdeclarative , qtdeclarative
, qtmultimedia , qtmultimedia
, qtnetworkauth
, qtquickcontrols2 , qtquickcontrols2
, qtscript , qtscript
, rttr , rttr
@ -61,6 +62,7 @@ mkDerivation {
phonon-backend-gstreamer phonon-backend-gstreamer
qtdeclarative qtdeclarative
qtmultimedia qtmultimedia
qtnetworkauth
qtquickcontrols2 qtquickcontrols2
qtscript qtscript
shared-mime-info shared-mime-info

6
pkgs/applications/kde/kdepim-runtime/default.nix
View File

@ -5,7 +5,8 @@
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns, pimcommon, libkgapi, libsecret,
qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns,
}: }:
mkDerivation { mkDerivation {
@ -19,6 +20,7 @@ mkDerivation {
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns pimcommon libkgapi libsecret
qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns
]; ];
} }

4
pkgs/applications/kde/kldap.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
cyrus_sasl, ki18n, kio, kmbox, openldap cyrus_sasl, ki18n, kio, kmbox, libsecret, openldap, qtkeychain
}: }:
mkDerivation { mkDerivation {
@ -11,7 +11,7 @@ mkDerivation {
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ ki18n kio kmbox ]; buildInputs = [ ki18n kio kmbox libsecret qtkeychain ];
propagatedBuildInputs = [ cyrus_sasl openldap ]; propagatedBuildInputs = [ cyrus_sasl openldap ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

5
pkgs/applications/kde/kmail.nix
View File

@ -7,7 +7,8 @@
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon, kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,
messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi, kdepim-addons messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi, kdepim-addons,
qtkeychain, libsecret
}: }:
mkDerivation { mkDerivation {
@ -24,7 +25,7 @@ mkDerivation {
knotifications knotifyconfig kontactinterface kparts kpty kservice knotifications knotifyconfig kontactinterface kparts kpty kservice
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
kdepim-addons kdepim-addons qtkeychain libsecret
]; ];
propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
} }

7
pkgs/applications/kde/kmailtransport.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils, akonadi, akonadi-mime, cyrus_sasl, kcmutils,
ki18n, kio, kmime, kwallet, ksmtp, libkgapi, ki18n, kio, kmime, kwallet, ksmtp, libkgapi,
kcalendarcore, kcontacts kcalendarcore, kcontacts, qtkeychain, libsecret
}: }:
mkDerivation { mkDerivation {
@ -13,7 +13,10 @@ mkDerivation {
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalendarcore kcontacts ]; buildInputs = [
akonadi kcmutils ki18n kio ksmtp libkgapi kcalendarcore kcontacts
qtkeychain libsecret
];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

4
pkgs/applications/kde/pim-sieve-editor.nix
View File

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit, kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit,
kmailtransport, pimcommon, libksieve kmailtransport, libksieve, pimcommon, qtkeychain, libsecret
}: }:
mkDerivation { mkDerivation {
@ -14,6 +14,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport
pimcommon libksieve libksieve pimcommon qtkeychain libsecret
]; ];
} }

1800
pkgs/applications/kde/srcs.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/tools/analysis/qcachegrind/default.nix
View File

@ -17,7 +17,7 @@ in stdenv.mkDerivation {
postInstall = '' postInstall = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -p converters/dprof2calltree $out/bin/dprof2calltree cp -p converters/dprof2calltree $out/bin/dprof2calltree
cp -p converters/hotshot2calltree.cmake $out/bin/hotshot2calltree cp -p converters/hotshot2calltree.in $out/bin/hotshot2calltree
cp -p converters/memprof2calltree $out/bin/memprof2calltree cp -p converters/memprof2calltree $out/bin/memprof2calltree
cp -p converters/op2calltree $out/bin/op2calltree cp -p converters/op2calltree $out/bin/op2calltree
cp -p converters/pprof2calltree $out/bin/pprof2calltree cp -p converters/pprof2calltree $out/bin/pprof2calltree

13
pkgs/top-level/qt5-packages.nix
View File

@ -35,17 +35,20 @@ let
}; };
in (lib.makeOverridable mkPlasma5 attrs); in (lib.makeOverridable mkPlasma5 attrs);
kdeApplications = let kdeGear = let
mkApplications = import ../applications/kde; mkGear = import ../applications/kde;
attrs = { attrs = {
inherit libsForQt5; inherit libsForQt5;
inherit (pkgs) lib fetchurl; inherit (pkgs) lib fetchurl;
}; };
in (lib.makeOverridable mkApplications attrs); in (lib.makeOverridable mkGear attrs);
in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // { in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
inherit kdeFrameworks plasma5 kdeApplications qt5; inherit kdeFrameworks plasma5 kdeGear qt5;
# Alias for backwards compatibility. Added 2021-05-07.
kdeApplications = kdeGear;
### LIBRARIES ### LIBRARIES