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

Merge pull request #111957 from ttuegel/kde-applications-20.12.1 

KDE Applications 20.12.1
This commit is contained in:
Thomas Tuegel 2021-02-11 10:02:26 -06:00 committed by GitHub
parent 939c9aa22c 6546690e97
commit 7a5b84cfa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 1096 additions and 1016 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/kde/akonadi-contacts.nix
View File

@ -2,9 +2,9 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules,
qtwebengine,
grantlee,
grantlee, grantleetheme,
kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison,
akonadi, akonadi-mime, kcontacts, kmime,
akonadi, akonadi-mime, kcontacts, kmime, libkleo,
}:
mkDerivation {
@ -16,9 +16,9 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtwebengine
grantlee
grantlee grantleetheme
kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison
akonadi-mime kcontacts kmime
akonadi-mime kcontacts kmime libkleo
];
propagatedBuildInputs = [ akonadi ];
outputs = [ "out" "dev" ];

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

@ -1,6 +1,6 @@
From 90969b9b36400d47b1afe761fb8468c1acb8a04a Mon Sep 17 00:00:00 2001
From f4d718502ecd8242500078a7783e27caba72871e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:41:19 -0500
Date: Sun, 31 Jan 2021 11:00:03 -0600
Subject: [PATCH 1/3] akonadi paths
---
@ -11,10 +11,10 @@ Subject: [PATCH 1/3] akonadi paths
4 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
index 23b4a1f..c13b658 100644
index 31e0cf2..6436e87 100644
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
@@ -61,7 +61,7 @@ public:
@@ -48,7 +48,7 @@ public:
[]() {
QCoreApplication::instance()->exit(255);
});
@ -23,7 +23,7 @@ index 23b4a1f..c13b658 100644
}
~StorageProcessControl() override
@@ -84,7 +84,7 @@ public:
@@ -70,7 +70,7 @@ public:
[]() {
qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
});
@ -33,10 +33,10 @@ index 23b4a1f..c13b658 100644
~AgentServerProcessControl() override
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
index 4e58f7e..e8bb532 100644
index c98946c..aa307ca 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp
+++ b/src/akonadicontrol/agentprocessinstance.cpp
@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
@@ -49,7 +49,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
} else {
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier();
@ -46,10 +46,10 @@ index 4e58f7e..e8bb532 100644
}
return true;
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index cac40f5..527649b 100644
index d595a3a..99324f6 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -69,7 +69,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@ -57,7 +57,7 @@ index cac40f5..527649b 100644
QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN
@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -78,16 +77,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif
const bool defaultInternalServer = true;
@ -75,7 +75,7 @@ index cac40f5..527649b 100644
if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -97,10 +87,10 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
#endif
}
@ -88,7 +88,7 @@ index cac40f5..527649b 100644
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -117,7 +107,7 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -97,7 +97,7 @@ index cac40f5..527649b 100644
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup();
@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &settings)
@@ -127,9 +117,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
mDatabaseName = QStringLiteral("akonadi");
}
@ -107,17 +107,17 @@ index cac40f5..527649b 100644
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &settings)
settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
- if (!mMysqldPath.isEmpty()) {
- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
- }
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
settings.sync();
@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer()
@@ -139,9 +126,6 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
- if (!mMysqldPath.isEmpty()) {
- settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
- }
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
settings.sync();
@@ -214,7 +198,7 @@ bool DbConfigMysql::startInternalServer()
#endif
// generate config file
@ -127,10 +127,10 @@ index cac40f5..527649b 100644
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) {
diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
index 09cdbd5..1c8996b 100644
index dd273fc..05288d9 100644
--- a/src/server/storage/dbconfigpostgresql.cpp
+++ b/src/server/storage/dbconfigpostgresql.cpp
@@ -141,9 +141,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
@@ -127,9 +127,7 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
// determine default settings depending on the driver
QString defaultHostName;
QString defaultOptions;
@ -140,7 +140,7 @@ index 09cdbd5..1c8996b 100644
QString defaultPgData;
#ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
@@ -154,12 +152,8 @@ bool DbConfigPostgresql::init(QSettings &settings)
@@ -140,12 +138,8 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
if (mInternalServer) {
@ -154,7 +154,7 @@ index 09cdbd5..1c8996b 100644
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
}
@@ -178,20 +172,14 @@ bool DbConfigPostgresql::init(QSettings &settings)
@@ -164,20 +158,14 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -177,14 +177,14 @@ index 09cdbd5..1c8996b 100644
qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
if (mPgData.isEmpty()) {
@@ -207,7 +195,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
settings.setValue(QStringLiteral("Port"), mHostPort);
}
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
- settings.setValue(QStringLiteral("ServerPath"), mServerPath);
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
@@ -194,7 +182,6 @@ bool DbConfigPostgresql::init(QSettings &settings, bool storeSettings)
settings.setValue(QStringLiteral("Port"), mHostPort);
}
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
- settings.setValue(QStringLiteral("ServerPath"), mServerPath);
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup();
--
2.25.4
2.29.2

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

@ -1,6 +1,6 @@
From b8c6a2a017321649db8fec553a644b8da2300514 Mon Sep 17 00:00:00 2001
From badd4be311afd37a99126c60490f1ae5daced6c4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:41:35 -0500
Date: Sun, 31 Jan 2021 11:00:15 -0600
Subject: [PATCH 2/3] akonadi timestamps
---
@ -8,10 +8,10 @@ Subject: [PATCH 2/3] akonadi timestamps
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index 527649b..08c3dd4 100644
index 99324f6..3c170a8 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer()
@@ -240,8 +240,7 @@ bool DbConfigMysql::startInternalServer()
bool confUpdate = false;
QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual
@ -22,5 +22,5 @@ index 527649b..08c3dd4 100644
QFile localFile(localConfig);
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
--
2.25.4
2.29.2

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

@ -1,6 +1,6 @@
From 7afe018382cf68b477b35f87b666424d62d19ef4 Mon Sep 17 00:00:00 2001
From 82bfa975af60757374ffad787e56a981d6df0f98 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:41:55 -0500
Date: Sun, 31 Jan 2021 11:01:24 -0600
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(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d927471..83a74c0 100644
index 4bb5fec..35720b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,9 +330,6 @@ configure_package_config_file(
@@ -343,9 +343,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@ -23,29 +23,23 @@ index d927471..83a74c0 100644
install(FILES
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
index 421e1df..e3abf27 100644
index bcf7320..1574319 100644
--- a/KF5AkonadiConfig.cmake.in
+++ b/KF5AkonadiConfig.cmake.in
@@ -24,8 +24,8 @@ if(BUILD_TESTING)
find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
endif()
@@ -1,10 +1,10 @@
@PACKAGE_INIT@
-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
find_dependency(Boost "@Boost_MINIMUM_VERSION@")
@@ -33,7 +33,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
####################################################################################
# CMAKE_AUTOMOC
# set the directories
if(NOT AKONADI_INSTALL_DIR)
--
2.25.4
2.29.2

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

@ -3,7 +3,7 @@
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
signond,
signond, lzma,
}:
mkDerivation {
@ -21,7 +21,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin
ki18n kiconthemes kio kwindowsystem accounts-qt qttools signond
ki18n kiconthemes kio kwindowsystem lzma accounts-qt qttools signond
];
propagatedBuildInputs = [ boost kitemmodels ];
outputs = [ "out" "dev" ];

11
pkgs/applications/kde/calendarsupport.nix
View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam, fetchpatch,
extra-cmake-modules, kdoctools,
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils,
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
}:
@ -11,16 +11,9 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
patches = [
# Patch for Qt 5.15.2 until version 20.12.0
(fetchpatch {
url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch";
sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
akonadi akonadi-mime akonadi-notes kcalutils kholidays pimcommon qttools
];
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
outputs = [ "out" "dev" ];

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

@ -109,10 +109,9 @@ let
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
kdenlive = callPackage ./kdenlive.nix {};
kdenlive = callPackage ./kdenlive {};
kdepim-runtime = callPackage ./kdepim-runtime {};
kdepim-addons = callPackage ./kdepim-addons.nix {};
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
kdialog = callPackage ./kdialog.nix {};
kdiamond = callPackage ./kdiamond.nix {};

3
pkgs/applications/kde/dolphin.nix
View File

@ -5,7 +5,7 @@
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid,
wayland, qtwayland
wayland, qtbase, qtwayland
}:
mkDerivation {
@ -13,6 +13,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
broken = lib.versionOlder qtbase.version "5.14";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedUserEnvPkgs = [ baloo ];

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

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

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

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ffmpeg_3, kio
ffmpeg_3, kio, taglib
}:
mkDerivation {
@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ffmpeg_3 kio ];
buildInputs = [ ffmpeg_3 kio taglib ];
}

3
pkgs/applications/kde/filelight.nix
View File

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kio, kparts, kxmlgui, qtscript, solid
kio, kparts, kxmlgui, qtbase, qtscript, solid
}:
mkDerivation {
@ -9,6 +9,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ fridh vcunat ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [

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

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
akonadi, akonadi-mime, calendarsupport, eventviews,
kdiagram, kldap, kmime, pimcommon, qtbase
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
akonadi akonadi-mime calendarsupport eventviews kdiagram
kldap kmime pimcommon qtbase
];
outputs = [ "out" "dev" ];

11
pkgs/applications/kde/kaddressbook.nix
View File

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam, fetchpatch,
extra-cmake-modules, kdoctools,
akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,
kcrash, kdbusaddons, ki18n, kontactinterface, kparts,
kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison,
qgpgme, qtbase,
}:
@ -13,17 +13,10 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
patches = [
# Patch for Qt 5.15.2 until version 20.12.0
(fetchpatch {
url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch";
sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash
kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit
kdbusaddons ki18n kontactinterface kparts kpimtextedit
kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
];
}

18
pkgs/applications/kde/kalarm.nix
View File

@ -3,12 +3,13 @@
extra-cmake-modules,
kauth, kcodecs, kcompletion, kconfig, kconfigwidgets, kdbusaddons, kdoctools,
kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio,
knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon,
kguiaddons, ki18n, kiconthemes, kidletime, kjobwidgets, kcmutils,
kdelibs4support, kio, knotifications, knotifyconfig, kservice, kwidgetsaddons,
kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
pimcommon, kpimtextedit, kdepim-apps-libs, messagelib,
pimcommon, kpimtextedit, messagelib,
qtx11extras,
@ -24,12 +25,13 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kauth kcodecs kcompletion kconfig kconfigwidgets kdbusaddons kdoctools
kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio
knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon
kguiaddons ki18n kiconthemes kidletime kjobwidgets kcmutils kdelibs4support
kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem
kxmlgui phonon
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils
kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime
pimcommon kpimtextedit kdepim-apps-libs messagelib
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore
kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport
kmime pimcommon kpimtextedit messagelib
qtx11extras
];

3
pkgs/applications/kde/kdebugsettings.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
gettext,
kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
python
qtbase, python
}:
mkDerivation {
@ -11,6 +11,7 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = [ lib.maintainers.rittelle ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

5
pkgs/applications/kde/kdenetwork-filesharing.nix
View File

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcoreaddons, ki18n, kio, kwidgetsaddons, samba
kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qtbase,
}:
mkDerivation {
@ -9,7 +9,8 @@ mkDerivation {
meta = {
license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
broken = lib.versionOlder qtbase.version "5.13";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
}

0
pkgs/applications/kde/kdenlive.nix → pkgs/applications/kde/kdenlive/default.nix
View File

0
pkgs/applications/kde/ffmpeg-path.patch → pkgs/applications/kde/kdenlive/ffmpeg-path.patch
View File

0
pkgs/applications/kde/mlt-path.patch → pkgs/applications/kde/kdenlive/mlt-path.patch
View File

4
pkgs/applications/kde/kdepim-addons.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, shared-mime-info,
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface
}:
@ -18,7 +18,7 @@ mkDerivation {
buildInputs = [
akonadi-import-wizard akonadi-notes calendarsupport eventviews
incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface
];

20
pkgs/applications/kde/kdepim-apps-libs/default.nix
View File

@ -1,20 +0,0 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets,
kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,
}:
mkDerivation {
pname = "kdepim-apps-libs";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
kcontacts ki18n kiconthemes kio libkleo pimcommon prison
];
outputs = [ "out" "dev" ];
}

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

@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim,
kconfigwidgets, kcoreaddons, kdelibs4support, libkdepim,
kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
@ -19,7 +19,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n
kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n
kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim
knotifications knotifyconfig kontactinterface kparts kpty kservice
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar

10
pkgs/applications/kde/kompare.nix
View File

@ -12,15 +12,5 @@ mkDerivation {
buildInputs = [
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
];
patches = [
(fetchpatch {
# Portaway from Obsolete methods of QPrinter
# Part of v20.12.0
url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch";
sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU=";
})
];
outputs = [ "out" "dev" ];
}

3
pkgs/applications/kde/konqueror.nix
View File

@ -2,7 +2,7 @@
, mkDerivation
, extra-cmake-modules, kdoctools
, kdelibs4support, kcmutils, khtml, kdesu
, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
, qtbase, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
}:
mkDerivation {
@ -24,5 +24,6 @@ mkDerivation {
meta = {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ ];
broken = lib.versionOlder qtbase.version "5.13";
};
}

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

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
qtwebengine,
kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
akonadi, grantleetheme, kontactinterface, kpimtextedit,
mailcommon, libkdepim, pimcommon
}:
@ -17,7 +17,7 @@ mkDerivation {
buildInputs = [
qtwebengine
kcmutils kcrash kdbusaddons kparts kwindowsystem
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
akonadi grantleetheme kontactinterface kpimtextedit
mailcommon libkdepim pimcommon
];
}

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

@ -5,7 +5,7 @@
phonon,
knewstuff,
akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search,
calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs,
calendarsupport, eventviews, incidenceeditor, kcalutils,
kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface,
kpimtextedit, pimcommon,
}:
@ -22,7 +22,7 @@ mkDerivation {
phonon
knewstuff
akonadi-calendar akonadi-contacts akonadi-notes akonadi-search
calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs
calendarsupport eventviews incidenceeditor kcalutils
kholidays kidentitymanagement kldap kmailtransport kontactinterface
kpimtextedit pimcommon
];

2
pkgs/applications/kde/kpat.nix
View File

@ -5,6 +5,7 @@
, shared-mime-info
, libkdegames
, freecell-solver
, black-hole-solver
}:
mkDerivation {
@ -14,6 +15,7 @@ mkDerivation {
shared-mime-info
];
buildInputs = [
black-hole-solver
knewstuff
libkdegames
freecell-solver

3
pkgs/applications/kde/krdc.nix
View File

@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools, makeWrapper,
kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
kwindowsystem, libvncserver, freerdp
kwindowsystem, libvncserver, freerdp, qtbase,
}:
mkDerivation {
@ -21,5 +21,6 @@ mkDerivation {
license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
broken = lib.versionOlder qtbase.version "5.14";
};
}

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

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
pimcommon, qca-qt5, qtwebengine, syntax-highlighting
}:
@ -17,7 +17,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap
kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5
syntax-highlighting
];

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

File diff suppressed because it is too large Load Diff

21
pkgs/development/libraries/rinutils/default.nix Normal file
View File

@ -0,0 +1,21 @@
{
stdenv, lib, fetchurl,
cmake, perl,
}:
stdenv.mkDerivation rec {
pname = "rinutils";
version = "0.8.0";
meta = with lib; {
homepage = "https://github.com/shlomif/rinutils";
license = licenses.mit;
};
src = fetchurl {
url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "1q09aihm5m42xiq2prpa9mf0srwiirzgzblkp5nl74i7zg6pg5hx";
};
nativeBuildInputs = [ cmake perl ];
}

30
pkgs/games/black-hole-solver/default.nix Normal file
View File

@ -0,0 +1,30 @@
{
stdenv, lib, fetchurl,
cmake, perl, pkg-config, python3,
rinutils, PathTiny,
}:
stdenv.mkDerivation rec {
pname = "black-hole-solver";
version = "1.10.1";
meta = with lib; {
homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/";
description = "A solver for Solitaire variants Golf, Black Hole, and All in a Row.";
license = licenses.mit;
};
src = fetchurl {
url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz";
sha256 = "1qhihmk4fwz6n16c7bnxnh3v7jhbb7xhkc9wk9484bp0k4x9bq9n";
};
nativeBuildInputs = [ cmake perl pkg-config python3 ];
buildInputs = [ rinutils PathTiny ];
prePatch = ''
patchShebangs ./scripts
'';
}

6
pkgs/top-level/all-packages.nix
View File

@ -16464,6 +16464,8 @@ in
readosm = callPackage ../development/libraries/readosm { };
rinutils = callPackage ../development/libraries/rinutils { };
kissfft = callPackage ../development/libraries/kissfft { };
lambdabot = callPackage ../development/tools/haskell/lambdabot {
@ -26453,6 +26455,10 @@ in
lua = lua5;
};
black-hole-solver = callPackage ../games/black-hole-solver {
inherit (perlPackages) PathTiny;
};
blackshades = callPackage ../games/blackshades { };
blobby = callPackage ../games/blobby { };