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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
That way the tarball job succeeds
This commit is contained in:
John Ericson 2017-08-21 18:42:57 -04:00
commit 0135e61b4c
122 changed files with 1611 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
nixos/modules/services/continuous-integration/gitlab-runner.nix
View File

@ -4,15 +4,65 @@ with lib;
let
cfg = config.services.gitlab-runner;
configFile = pkgs.writeText "config.toml" cfg.configText;
configFile =
if (cfg.configFile == null) then
(pkgs.runCommand "config.toml" {
buildInputs = [ pkgs.remarshal ];
} ''
remarshal -if json -of toml \
< ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \
> $out
'')
else
cfg.configFile;
hasDocker = config.virtualisation.docker.enable;
in
{
options.services.gitlab-runner = {
enable = mkEnableOption "Gitlab Runner";
configText = mkOption {
description = "Verbatim config.toml to use";
configFile = mkOption {
default = null;
description = ''
Configuration file for gitlab-runner.
Use this option in favor of configOptions to avoid placing CI tokens in the nix store.
<option>configFile</option> takes precedence over <option>configOptions</option>.
Warning: Not using <option>configFile</option> will potentially result in secrets
leaking into the WORLD-READABLE nix store.
'';
type = types.nullOr types.path;
};
configOptions = mkOption {
description = ''
Configuration for gitlab-runner
<option>configFile</option> will take precedence over this option.
Warning: all Configuration, especially CI token, will be stored in a
WORLD-READABLE file in the Nix Store.
If you want to protect your CI token use <option>configFile</option> instead.
'';
type = types.attrs;
example = {
concurrent = 2;
runners = [{
name = "docker-nix-1.11";
url = "https://CI/";
token = "TOKEN";
executor = "docker";
builds_dir = "";
docker = {
host = "";
image = "nixos/nix:1.11";
privileged = true;
disable_cache = true;
cache_dir = "";
};
}];
};
};
gracefulTermination = mkOption {

1
nixos/modules/services/web-servers/phpfpm/default.nix
View File

@ -150,7 +150,6 @@ in {
PrivateDevices = true;
ProtectSystem = "full";
ProtectHome = true;
NoNewPrivileges = true;
RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
Type = "notify";
ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";

4
pkgs/applications/audio/mopidy-iris/default.nix
View File

@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec {
name = "mopidy-iris-${version}";
version = "3.1.3";
version = "3.2.0";
src = pythonPackages.fetchPypi {
inherit version;
pname = "Mopidy-Iris";
sha256 = "144q83cfgdwlj5gv9wyi902xfjybsaa9n7d5azs14jpbnmmbj61f";
sha256 = "cb97cb14b2d6836f3c28c5fd0ada44b4a33f2e74380f44bd5d03beffa5f67b30";
};
propagatedBuildInputs = [

37
pkgs/applications/audio/renoise/default.nix
View File

@ -1,36 +1,35 @@
{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }:
{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }:
# To use the full release version:
# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version
# for your machine to some stable location.
# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
# Note: Renoise creates an individual build for each license which screws somewhat with the
# use of functions like requireFile as the hash will be different for every user.
let fileversion = "3_1_0";
in
stdenv.mkDerivation rec {
name = "renoise";
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
src =
if stdenv.system == "x86_64-linux" then
if demo then
if builtins.isNull releasePath then
fetchurl {
url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2";
sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg";
url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2";
sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
}
else
requireFile {
url = "http://backstage.renoise.com/frontend/app/index.html#/login";
name = "rns_3_0_1_linux_x86_64.tar.gz";
sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd";
}
releasePath
else if stdenv.system == "i686-linux" then
if demo then
if builtins.isNull releasePath then
fetchurl {
url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2";
sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58";
url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2";
sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
}
else
requireFile {
url = "http://backstage.renoise.com/frontend/app/index.html#/login";
name = "rns_3_0_1_reg_x86.tar.gz";
sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7";
}
else throw "platform is not suppored by Renoise";
releasePath
else throw "Platform is not supported by Renoise";
installPhase = ''
cp -r Resources $out

8
pkgs/applications/display-managers/sddm/default.nix
View File

@ -14,7 +14,7 @@ let
};
in mkDerivation rec {
name = "sddm-unwrapped-${version}";
name = "sddm-${version}";
src = fetchFromGitHub {
owner = "sddm";
@ -36,11 +36,7 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
buildInputs = [
libxcb libpthreadstubs libXdmcp libXau pam systemd
];
propagatedBuildInputs = [
qtbase qtdeclarative
libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd
];
cmakeFlags = [

20
pkgs/applications/kde/akonadi-calendar.nix Normal file
View File

@ -0,0 +1,20 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts,
kidentitymanagement, kio, kmailtransport,
}:
mkDerivation {
name = "akonadi-calendar";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement
kio kmailtransport
];
outputs = [ "out" "dev" ];
}

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

@ -1,20 +1,24 @@
{
mkDerivation, lib,
mkDerivation, lib, kdepimTeam,
extra-cmake-modules,
akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,
kio, kitemmodels, kmime, ktextwidgets, qtwebengine,
qtwebengine,
grantlee,
kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison,
akonadi, akonadi-mime, kcontacts, kmime,
}:
mkDerivation {
name = "akonadi-contacts";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio
kitemmodels kmime ktextwidgets qtwebengine
qtwebengine
grantlee
kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison
akonadi-mime kcontacts kmime
];
propagatedBuildInputs = [ akonadi ];
outputs = [ "out" "dev" ];

14
pkgs/applications/kde/akonadi-mime.nix
View File

@ -1,18 +1,16 @@
{
mkDerivation, lib,
extra-cmake-modules,
akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime,
shared_mime_info
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared_mime_info,
akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
}:
mkDerivation {
name = "akonadi-mime";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ akonadi shared_mime_info
kdbusaddons ki18n kio kitemmodels kmime ];
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
outputs = [ "out" "dev" ];
}

18
pkgs/applications/kde/akonadi-notes.nix Normal file
View File

@ -0,0 +1,18 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, kcompletion, ki18n, kitemmodels, kmime, kxmlgui
}:
mkDerivation {
name = "akonadi-notes";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi kcompletion ki18n kitemmodels kmime kxmlgui
];
outputs = [ "out" "dev" ];
}

20
pkgs/applications/kde/akonadi-search.nix Normal file
View File

@ -0,0 +1,20 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime,
krunner, qtbase, xapian
}:
mkDerivation {
name = "akonadi-search";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcmutils krunner xapian ];
propagatedBuildInputs = [
akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase
];
outputs = [ "out" "dev" ];
}

20
pkgs/applications/kde/akonadi/akonadi-paths.patch
View File

@ -33,7 +33,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
- }
- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
+ const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
+ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
@ -42,11 +42,11 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
}
- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);
+ mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
+ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);
+ mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK);
+ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@ -55,7 +55,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
- mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
+ mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
+ mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup();
@ -84,7 +84,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
// generate config file
- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
+ const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) {
@ -133,7 +133,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
-
- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
+ defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);
+ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
}
@ -145,7 +145,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
- if (mInternalServer && mServerPath.isEmpty()) {
- mServerPath = defaultServerPath;
- }
+ mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
+ mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL);
qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
if (mInternalServer && mInitDbPath.isEmpty()) {
@ -166,7 +166,7 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier();
- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));
+ const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher");
+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
mController->start(agentLauncherExec, arguments);
}
return true;
@ -179,13 +179,13 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld
connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
if (mAgentServerEnabled) {
mAgentServer = new Akonadi::ProcessControl;
connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
}
#ifndef QT_NO_DEBUG

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

@ -1,28 +1,24 @@
{
mkDerivation, copyPathsToStore, lib,
extra-cmake-modules,
kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
kwindowsystem, kcrash, kio,
boost, kitemmodels, shared_mime_info,
mysql
mkDerivation, copyPathsToStore, lib, kdepimTeam,
extra-cmake-modules, shared_mime_info,
boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,
ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
}:
mkDerivation {
name = "akonadi";
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
maintainers = kdepimTeam;
};
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
buildInputs = [
kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
kwindowsystem kcrash shared_mime_info
kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n
kiconthemes kio kwindowsystem qttools
];
propagatedBuildInputs = [ boost kitemmodels ];
cmakeFlags = [
"-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld"
];
outputs = [ "out" "dev" ];
NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"''
''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"''

21
pkgs/applications/kde/akonadiconsole.nix Normal file
View File

@ -0,0 +1,21 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit,
ktextwidgets, kxmlgui, messagelib, qtbase,
}:
mkDerivation {
name = "akonadiconsole";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
messagelib qtbase
];
}

30
pkgs/applications/kde/akregator.nix Normal file
View File

@ -0,0 +1,30 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtwebengine,
grantlee,
kcmutils, kcrash, kiconthemes, knotifyconfig, kparts, ktexteditor,
kwindowsystem,
akonadi, akonadi-mime, grantleetheme, kontactinterface, libkdepim, libkleo,
messagelib, syndication
}:
mkDerivation {
name = "akregator";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
qtwebengine
grantlee
kcmutils kcrash kiconthemes knotifyconfig kparts ktexteditor kwindowsystem
akonadi akonadi-mime grantleetheme kontactinterface libkdepim libkleo
messagelib syndication
];
outputs = [ "out" "dev" ];
}

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

@ -7,7 +7,7 @@
khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive,
# Archive tools
p7zip, unzipNLS, zip,
p7zip, unzip, zip,
# Unfree tools
unfreeEnableUnrar ? false, unrar,
@ -25,7 +25,7 @@ mkDerivation {
let
PATH =
lib.makeBinPath
([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);
in ''
wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
'';

20
pkgs/applications/kde/build-support/application.nix
View File

@ -1,20 +0,0 @@
{ mkDerivation, lib, srcs }:
args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in
mkDerivation (args // {
name = "${name}-${version}";
inherit src;
outputs = args.outputs or [ "out" "dev" ];
meta = {
platforms = lib.platforms.linux;
homepage = http://www.kde.org;
} // (args.meta or {});
})

20
pkgs/applications/kde/calendarsupport.nix Normal file
View File

@ -0,0 +1,20 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
}:
mkDerivation {
name = "calendarsupport";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools
];
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
outputs = [ "out" "dev" ];
}

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

@ -33,63 +33,121 @@ still shows most of the available features is in `./gwenview.nix`.
let
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
in
let
mkDerivation = args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
mkDerivation =
libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
mkDerivation (args // {
name = "${name}-${version}";
inherit src;
outputs = args.outputs or [ "out" ];
meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
});
packages = self: with self;
let
callPackage = self.newScope {
mkDerivation = import ./build-support/application.nix {
inherit lib;
inherit srcs;
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
};
inherit mkDerivation;
# Team of maintainers assigned to the KDE PIM suite
kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
};
in {
kdelibs = callPackage ./kdelibs { inherit attica phonon; };
akonadi = callPackage ./akonadi {};
akonadi-calendar = callPackage ./akonadi-calendar.nix {};
akonadi-contacts = callPackage ./akonadi-contacts.nix {};
akonadi-mime = callPackage ./akonadi-mime.nix {};
ark = callPackage ./ark/default.nix {};
akonadi-notes = callPackage ./akonadi-notes.nix {};
akonadi-search = callPackage ./akonadi-search.nix {};
akonadiconsole = callPackage ./akonadiconsole.nix {};
akregator = callPackage ./akregator.nix {};
ark = callPackage ./ark {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
calendarsupport = callPackage ./calendarsupport.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
eventviews = callPackage ./eventviews.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
grantleetheme = callPackage ./grantleetheme {};
gwenview = callPackage ./gwenview.nix {};
incidenceeditor = callPackage ./incidenceeditor.nix {};
k3b = callPackage ./k3b.nix {};
kaddressbook = callPackage ./kaddressbook.nix {};
kalarmcal = callPackage ./kalarmcal.nix {};
kate = callPackage ./kate.nix {};
kdenlive = callPackage ./kdenlive.nix {};
kcalc = callPackage ./kcalc.nix {};
kcachegrind = callPackage ./kcachegrind.nix {};
kcalc = callPackage ./kcalc.nix {};
kcalcore = callPackage ./kcalcore.nix {};
kcalutils = callPackage ./kcalutils.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
kcontacts = callPackage ./kcontacts.nix {};
kdav = callPackage ./kdav.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
kdenlive = callPackage ./kdenlive.nix {};
kdepim-runtime = callPackage ./kdepim-runtime.nix {};
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kholidays = callPackage ./kholidays.nix {};
kidentitymanagement = callPackage ./kidentitymanagement.nix {};
kig = callPackage ./kig.nix {};
kimap = callPackage ./kimap.nix {};
kio-extras = callPackage ./kio-extras.nix {};
kldap = callPackage ./kldap.nix {};
kleopatra = callPackage ./kleopatra.nix {};
kmail = callPackage ./kmail.nix {};
kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};
kmailtransport = callPackage ./kmailtransport.nix {};
kmbox = callPackage ./kmbox.nix {};
kmime = callPackage ./kmime.nix {};
kmix = callPackage ./kmix.nix {};
kolourpaint = callPackage ./kolourpaint.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
kontact = callPackage ./kontact.nix {};
kontactinterface = callPackage ./kontactinterface.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
krfb = callPackage ./krfb.nix {};
ktnef = callPackage ./ktnef.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
libgravatar = callPackage ./libgravatar.nix {};
libkcddb = callPackage ./libkcddb.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
libkdepim = callPackage ./libkdepim.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkipi = callPackage ./libkipi.nix {};
libkleo = callPackage ./libkleo.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
libksieve = callPackage ./libksieve.nix {};
mailcommon = callPackage ./mailcommon.nix {};
mailimporter = callPackage ./mailimporter.nix {};
marble = callPackage ./marble.nix {};
mbox-importer = callPackage ./mbox-importer.nix {};
messagelib = callPackage ./messagelib.nix {};
okteta = callPackage ./okteta.nix {};
okular = callPackage ./okular.nix {};
pimcommon = callPackage ./pimcommon.nix {};
pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
syndication = callPackage ./syndication.nix {};
l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
};

18
pkgs/applications/kde/eventviews.nix Normal file
View File

@ -0,0 +1,18 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools,
}:
mkDerivation {
name = "eventviews";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools
];
outputs = [ "out" "dev" ];
}

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

@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ ffmpeg kio ];
buildInputs = [ ffmpeg kio ];
}

20
pkgs/applications/kde/grantleetheme/default.nix Normal file
View File

@ -0,0 +1,20 @@
{
mkDerivation, copyPathsToStore, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
}:
mkDerivation {
name = "grantleetheme";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
output = [ "out" "dev" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase
];
propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ];
}

166
pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch Normal file
View File

@ -0,0 +1,166 @@
Index: grantleetheme-17.04.0/src/grantleetheme_p.h
===================================================================
--- grantleetheme-17.04.0.orig/src/grantleetheme_p.h
+++ grantleetheme-17.04.0/src/grantleetheme_p.h
@@ -47,7 +47,7 @@ public:
QString description;
QString name;
QString dirName;
- QString absolutePath;
+ QStringList absolutePaths;
QString author;
QString email;
Index: grantleetheme-17.04.0/src/grantleetheme.cpp
===================================================================
--- grantleetheme-17.04.0.orig/src/grantleetheme.cpp
+++ grantleetheme-17.04.0/src/grantleetheme.cpp
@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr
, description(other.description)
, name(other.name)
, dirName(other.dirName)
- , absolutePath(other.absolutePath)
+ , absolutePaths(other.absolutePaths)
, author(other.author)
, email(other.email)
, loader(other.loader)
@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine()
void ThemePrivate::setupLoader()
{
- // Get the parent dir with themes, we set the theme directory separately
- QDir dir(absolutePath);
- dir.cdUp();
+ QStringList templateDirs;
+ for (const QString& path : absolutePaths) {
+ QDir dir(path);
+ dir.cdUp();
+ templateDirs << dir.absolutePath();
+ }
loader = QSharedPointer<Grantlee::FileSystemTemplateLoader>::create();
- loader->setTemplateDirs({ dir.absolutePath() });
+ loader->setTemplateDirs(templateDirs);
loader->setTheme(dirName);
if (!sEngine) {
@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons
Grantlee::Context ctx = createContext();
ctx.insert(QStringLiteral("error"), reason);
ctx.insert(QStringLiteral("templateName"), origTemplateName);
- const QString errorString = failedTemplate
- ? failedTemplate->errorString()
- : QStringLiteral("(null template)");
+ const QString errorString = failedTemplate->errorString();
ctx.insert(QStringLiteral("errorMessage"), errorString);
return tpl->render(&ctx);
}
@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
if (group.isValid()) {
d->dirName = dirName;
- d->absolutePath = themePath;
+ d->absolutePaths = QStringList(themePath);
d->name = group.readEntry("Name", QString());
d->description = group.readEntry("Description", QString());
d->themeFileName = group.readEntry("FileName", QString());
@@ -141,7 +142,7 @@ Theme::~Theme()
bool Theme::operator==(const Theme &other) const
{
- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
}
Theme &Theme::operator=(const Theme &other)
@@ -185,7 +186,12 @@ QString Theme::dirName() const
QString Theme::absolutePath() const
{
- return d->absolutePath;
+ return d->absolutePaths.first();
+}
+
+QStringList Theme::absolutePaths() const
+{
+ return d->absolutePaths;
}
QString Theme::author() const
@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem
return result;
}
+void Theme::addThemeDir(const QString& path)
+{
+ QDir dir(path);
+ dir.cdUp();
+ d->absolutePaths << dir.absolutePath();
+}
+
void Theme::addPluginPath(const QString &path)
{
if (!ThemePrivate::sEngine) {
Index: grantleetheme-17.04.0/src/grantleetheme.h
===================================================================
--- grantleetheme-17.04.0.orig/src/grantleetheme.h
+++ grantleetheme-17.04.0/src/grantleetheme.h
@@ -50,11 +50,14 @@ public:
QStringList displayExtraVariables() const;
QString dirName() const;
QString absolutePath() const;
+ QStringList absolutePaths() const;
QString author() const;
QString authorEmail() const;
QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
+ void addThemeDir(const QString&);
+
static void addPluginPath(const QString &path);
private:
Index: grantleetheme-17.04.0/src/grantleethememanager.cpp
===================================================================
--- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp
+++ grantleetheme-17.04.0/src/grantleethememanager.cpp
@@ -142,25 +142,18 @@ public:
for (const QString &directory : qAsConst(themesDirectories)) {
QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
- QStringList alreadyLoadedThemeName;
while (dirIt.hasNext()) {
dirIt.next();
const QString dirName = dirIt.fileName();
GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
if (theme.isValid()) {
QString themeName = theme.name();
- if (alreadyLoadedThemeName.contains(themeName)) {
- int i = 2;
- const QString originalName(theme.name());
- while (alreadyLoadedThemeName.contains(themeName)) {
- themeName = originalName + QStringLiteral(" (%1)").arg(i);
- ++i;
- }
- theme.d->name = themeName;
+ QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName);
+ if (i != themes.end()) {
+ i.value().addThemeDir(dirIt.filePath());
+ } else {
+ themes.insert(dirName, theme);
}
- alreadyLoadedThemeName << themeName;
- themes.insert(dirName, theme);
- //qDebug()<<" theme.name()"<<theme.name();
}
}
watch->addDir(directory);
@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con
GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
if (theme.isValid()) {
if (dirName == themeName) {
- return theme.absolutePath();
+ return theme.absolutePaths().first();
}
}
}

25
pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
index b86fc3a..8af72f4 100644
--- a/src/grantleetheme.cpp
+++ b/src/grantleetheme.cpp
@@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason,
Grantlee::Context ctx = createContext();
ctx.insert(QStringLiteral("error"), reason);
ctx.insert(QStringLiteral("templateName"), origTemplateName);
- ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString());
+ const QString errorString = failedTemplate
+ ? failedTemplate->errorString()
+ : QStringLiteral("(null template)");
+ ctx.insert(QStringLiteral("errorMessage"), errorString);
return tpl->render(&ctx);
}
@@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
}
Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine);
- if (tpl->error()) {
+ if (!tpl || tpl->error()) {
return d->errorTemplate(i18n("Template parsing error"), templateName, tpl);
}

2
pkgs/applications/kde/grantleetheme/series Normal file
View File

@ -0,0 +1,2 @@
grantleetheme_check_null.patch
grantlee-merge-theme-dirs.patch

20
pkgs/applications/kde/incidenceeditor.nix Normal file
View File

@ -0,0 +1,20 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
kdiagram, kldap, kmime, qtbase,
}:
mkDerivation {
name = "incidenceeditor";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
kldap kmime qtbase
];
outputs = [ "out" "dev" ];
}

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

@ -15,7 +15,7 @@ mkDerivation {
maintainers = with maintainers; [ sander phreedom ];
platforms = platforms.linux;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ];
propagatedBuildInputs = [
# qt
qtwebkit

22
pkgs/applications/kde/kaddressbook.nix Normal file
View File

@ -0,0 +1,22 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,
kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison,
qgpgme, qtbase,
}:
mkDerivation {
name = "kaddressbook";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash
kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit
kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
];
}

19
pkgs/applications/kde/kalarmcal.nix Normal file
View File

@ -0,0 +1,19 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
kpimtextedit,
}:
mkDerivation {
name = "kalarmcal";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit
];
outputs = [ "out" "dev" ];
}

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

@ -1,8 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kio, ki18n, karchive, qttools,
perl, python, php
karchive, ki18n, kio, perl, python, php, qttools,
}:
mkDerivation {
@ -12,6 +11,5 @@ mkDerivation {
maintainers = with lib.maintainers; [ orivej ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kio ];
buildInputs = [ perl python php ki18n karchive qttools ];
buildInputs = [ karchive ki18n kio perl python php qttools ];
}

8
pkgs/applications/kde/kcalc.nix
View File

@ -1,7 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
gmp, kconfig, kconfigwidgets, kguiaddons, ki18n, kinit, knotifications,
kxmlgui,
}:
mkDerivation {
@ -11,8 +12,7 @@ mkDerivation {
maintainers = [ lib.maintainers.fridh ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ gmp ];
propagatedBuildInputs = [
kconfig kconfigwidgets kguiaddons kinit knotifications
buildInputs = [
gmp kconfig kconfigwidgets kguiaddons ki18n kinit knotifications kxmlgui
];
}

16
pkgs/applications/kde/kcalcore.nix Normal file
View File

@ -0,0 +1,16 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kdelibs4support, libical
}:
mkDerivation {
name = "kcalcore";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kdelibs4support libical ];
outputs = [ "out" "dev" ];
}

20
pkgs/applications/kde/kcalutils.nix Normal file
View File

@ -0,0 +1,20 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
kidentitymanagement, kpimtextedit,
}:
mkDerivation {
name = "kcalutils";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
kidentitymanagement kpimtextedit
];
outputs = [ "out" "dev" ];
}

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

@ -11,6 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ki18n ];
propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
buildInputs = [ ki18n kwidgetsaddons kxmlgui ];
}

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

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, kdepimTeam,
extra-cmake-modules,
kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
}:
@ -8,8 +8,9 @@ mkDerivation {
name = "kcontacts";
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
outputs = [ "out" "dev" ];
}

16
pkgs/applications/kde/kdav.nix Normal file
View File

@ -0,0 +1,16 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcoreaddons, kio, qtxmlpatterns,
}:
mkDerivation {
name = "kdav";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons kio qtxmlpatterns ];
outputs = [ "out" "dev" ];
}

1
pkgs/applications/kde/kdegraphics-mobipocket.nix
View File

@ -12,4 +12,5 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kio ];
outputs = [ "out" "dev" ];
}

2
pkgs/applications/kde/kdegraphics-thumbnailers.nix
View File

@ -10,5 +10,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kio libkexiv2 libkdcraw ];
buildInputs = [ kio libkexiv2 libkdcraw ];
}

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

@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
}

21
pkgs/applications/kde/kdepim-apps-libs/default.nix Normal file
View File

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

62
pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch Normal file
View File

@ -0,0 +1,62 @@
Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
===================================================================
--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
@@ -50,9 +50,9 @@ public:
mTemplateLoader.clear();
}
- void changeGrantleePath(const QString &path)
+ void changeGrantleePath(const QStringList &paths)
{
- mTemplateLoader->setTemplateDirs(QStringList() << path);
+ mTemplateLoader->setTemplateDirs(paths);
mEngine->addTemplateLoader(mTemplateLoader);
mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
{
- d->changeGrantleePath(path);
+ d->changeGrantleePath(QStringList(path));
}
void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
{
- d->changeGrantleePath(theme.absolutePath());
+ d->changeGrantleePath(theme.absolutePaths());
}
inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
===================================================================
--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
@@ -74,9 +74,9 @@ public:
mTemplateLoader.clear();
}
- void changeGrantleePath(const QString &path)
+ void changeGrantleePath(const QStringList &paths)
{
- mTemplateLoader->setTemplateDirs(QStringList() << path);
+ mTemplateLoader->setTemplateDirs(paths);
mEngine->addTemplateLoader(mTemplateLoader);
mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
{
- d->changeGrantleePath(path);
+ d->changeGrantleePath(QStringList(path));
}
void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
{
- d->changeGrantleePath(theme.absolutePath());
+ d->changeGrantleePath(theme.absolutePaths());
}
void GrantleeContactFormatter::setForceDisableQRCode(bool b)

1
pkgs/applications/kde/kdepim-apps-libs/series Normal file
View File

@ -0,0 +1 @@
kdepim-apps-libs-grantlee-merge-theme-dirs.patch

25
pkgs/applications/kde/kdepim-runtime.nix Normal file
View File

@ -0,0 +1,25 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
shared_mime_info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
qtwebengine,
}:
mkDerivation {
name = "kdepim-runtime";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
];
# Attempts to build some files before dependencies have been generated
enableParallelBuilding = false;
}

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

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcmutils
kcmutils, ki18n, kiconthemes, kio, knotifications, kxmlgui,
}:
mkDerivation {
@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kcmutils ];
buildInputs = [ kcmutils ki18n kiconthemes kio knotifications kxmlgui ];
}

13
pkgs/applications/kde/kgpg.nix
View File

@ -1,19 +1,18 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools, ki18n, makeWrapper,
akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons,
akonadi-contacts, gnupg1, karchive, kcodecs, kcontacts, kcoreaddons,
kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme,
}:
mkDerivation {
name = "kgpg";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
buildInputs = [ gnupg1 gpgme ki18n ];
propagatedBuildInputs = [
akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
kwidgetsaddons kwindowsystem
buildInputs = [
akonadi-contacts gnupg1 karchive kcodecs kcontacts kcoreaddons kcrash
kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice
ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme
];
postFixup = ''
wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}"

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

@ -1,16 +1,15 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
kdelibs4support, khtml, kservice, xapian
grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, kdelibs4support, ki18n,
kinit, khtml, kservice, xapian
}:
mkDerivation {
name = "khelpcenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ ki18n xapian ];
propagatedBuildInputs = [
grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons
kinit kcmutils kservice
buildInputs = [
grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml
ki18n kinit kservice xapian
];
}

16
pkgs/applications/kde/kholidays.nix Normal file
View File

@ -0,0 +1,16 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtbase, qtdeclarative, qttools,
}:
mkDerivation {
name = "kholidays";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtbase qtdeclarative qttools ];
outputs = [ "out" "dev" ];
}

20
pkgs/applications/kde/kidentitymanagement.nix Normal file
View File

@ -0,0 +1,20 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcompletion, kcoreaddons, kemoticons, kiconthemes, kio, kpimtextedit,
ktextwidgets, kxmlgui
}:
mkDerivation {
name = "kidentitymanagement";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcompletion kemoticons kiconthemes kio ktextwidgets kxmlgui
];
propagatedBuildInputs = [ kcoreaddons kpimtextedit ];
outputs = [ "out" "dev" ];
}

9
pkgs/applications/kde/kig.nix
View File

@ -1,8 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kparts, qtsvg, qtxmlpatterns, ktexteditor, boost,
karchive, kcrash
boost, karchive, kcrash, kiconthemes, kparts, ktexteditor, qtsvg,
qtxmlpatterns,
}:
mkDerivation {
@ -12,9 +12,8 @@ mkDerivation {
maintainers = with lib.maintainers; [ raskin ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ boost ];
propagatedBuildInputs = [
kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash
buildInputs = [
boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns
];
}

17
pkgs/applications/kde/kimap.nix Normal file
View File

@ -0,0 +1,17 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
cyrus_sasl, kcoreaddons, ki18n, kio, kmime
}:
mkDerivation {
name = "kimap";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ ki18n kio ];
propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ];
outputs = [ "out" "dev" ];
}

2
pkgs/applications/kde/kio-extras.nix
View File

@ -13,7 +13,7 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
propagatedBuildInputs = [
buildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
kpty libmtp libssh openexr openslp phonon qtsvg samba solid

17
pkgs/applications/kde/kldap.nix Normal file
View File

@ -0,0 +1,17 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
cyrus_sasl, ki18n, kio, kmbox, openldap
}:
mkDerivation {
name = "kldap";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ ki18n kio kmbox ];
propagatedBuildInputs = [ cyrus_sasl openldap ];
outputs = [ "out" "dev" ];
}

19
pkgs/applications/kde/kleopatra.nix Normal file
View File

@ -0,0 +1,19 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime,
knotifications, kwindowsystem, kxmlgui, libkleo
}:
mkDerivation {
name = "kleopatra";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime
knotifications kwindowsystem kxmlgui libkleo
];
}

21
pkgs/applications/kde/kmail-account-wizard.nix Normal file
View File

@ -0,0 +1,21 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, shared_mime_info,
akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
kwallet, libkdepim, libkleo, pimcommon, qttools,
}:
mkDerivation {
name = "kmail-account-wizard";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
buildInputs = [
akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport
knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim
libkleo pimcommon qttools
];
}

29
pkgs/applications/kde/kmail.nix Normal file
View File

@ -0,0 +1,29 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs,
kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,
messagelib, pim-sieve-editor, qtscript, qtwebengine,
}:
mkDerivation {
name = "kmail";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n
kiconthemes kinit kio kldap kmail-account-wizard kmailtransport
knotifications knotifyconfig kontactinterface kparts kpty kservice
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
];
propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
}

17
pkgs/applications/kde/kmailtransport.nix Normal file
View File

@ -0,0 +1,17 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
}:
mkDerivation {
name = "kmailtransport";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ akonadi kcmutils ki18n kio ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}

16
pkgs/applications/kde/kmbox.nix Normal file
View File

@ -0,0 +1,16 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kmime, qtbase,
}:
mkDerivation {
name = "kmbox";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kmime qtbase ];
outputs = [ "out" "dev" ];
}

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

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, ki18n,
kcodecs, qtbase,
}:
@ -8,8 +8,9 @@ mkDerivation {
name = "kmime";
meta = {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules ki18n ];
buildInputs = [ kcodecs qtbase ];
outputs = [ "out" "dev" ];
}

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

@ -12,12 +12,9 @@ mkDerivation {
maintainers = [ lib.maintainers.rongcuid ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
propagatedBuildInputs = [
kglobalaccel kxmlgui kcoreaddons kdelibs4support
plasma-framework
];
cmakeFlags = [
"-DKMIX_KF5_BUILD=1"
buildInputs = [
alsaLib kglobalaccel kxmlgui kcoreaddons kdelibs4support
libcanberra_kde libpulseaudio plasma-framework
];
cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ];
}

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

@ -9,7 +9,7 @@
mkDerivation {
name = "kolourpaint";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
buildInputs = [ kdelibs4support libkexiv2 ];
meta = {
maintainers = [ lib.maintainers.fridh ];
license = with lib.licenses; [ gpl2 ];

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

@ -1,14 +1,15 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kparts, ktexteditor, kwidgetsaddons, libkomparediff2
kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2
}:
mkDerivation {
name = "kompare";
meta = { license = with lib.licenses; [ gpl2 ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kparts ktexteditor kwidgetsaddons libkomparediff2
buildInputs = [
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
];
outputs = [ "out" "dev" ];
}

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

@ -14,10 +14,9 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ ki18n ];
propagatedBuildInputs = [
buildInputs = [
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];

23
pkgs/applications/kde/kontact.nix Normal file
View File

@ -0,0 +1,23 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtwebengine,
kcmutils, kcrash, kdbusaddons, kwindowsystem,
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
mailcommon,
}:
mkDerivation {
name = "kontact";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
qtwebengine
kcmutils kcrash kdbusaddons kwindowsystem
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
mailcommon
];
}

17
pkgs/applications/kde/kontactinterface.nix Normal file
View File

@ -0,0 +1,17 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kiconthemes, kparts, kwindowsystem, kxmlgui
}:
mkDerivation {
name = "kontactinterface";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kiconthemes kparts kwindowsystem kxmlgui
];
}

29
pkgs/applications/kde/korganizer.nix Normal file
View File

@ -0,0 +1,29 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtbase, qttools,
phonon,
knewstuff,
akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search,
calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs,
kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface,
kpimtextedit, pimcommon,
}:
mkDerivation {
name = "korganizer";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
qtbase qttools
phonon
knewstuff
akonadi-calendar akonadi-contacts akonadi-notes akonadi-search
calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs
kholidays kidentitymanagement kldap kmailtransport kontactinterface
kpimtextedit pimcommon
];
}

21
pkgs/applications/kde/kpimtextedit.nix Normal file
View File

@ -0,0 +1,21 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
}:
mkDerivation {
name = "kpimtextedit";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
sonnet syntax-highlighting qttools
];
propagatedBuildInputs = [ ktextwidgets ];
outputs = [ "out" "dev" ];
}

15
pkgs/applications/kde/kqtquickcharts.nix Normal file
View File

@ -0,0 +1,15 @@
{
mkDerivation, lib,
extra-cmake-modules,
qtbase, qtdeclarative,
}:
mkDerivation {
name = "kqtquickcharts";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtbase qtdeclarative ];
}

18
pkgs/applications/kde/ktnef.nix Normal file
View File

@ -0,0 +1,18 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcalcore, kcalutils, kcontacts, kdelibs4support
}:
mkDerivation {
name = "ktnef";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcalcore kcalutils kcontacts kdelibs4support
];
outputs = [ "out" "dev" ];
}

18
pkgs/applications/kde/libgravatar.nix Normal file
View File

@ -0,0 +1,18 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kconfig, kio, ktextwidgets, kwidgetsaddons, pimcommon
}:
mkDerivation {
name = "libgravatar";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kconfig kio ktextwidgets kwidgetsaddons pimcommon
];
outputs = [ "out" "dev" ];
}

1
pkgs/applications/kde/libkdcraw.nix
View File

@ -9,4 +9,5 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ libraw ];
outputs = [ "out" "dev" ];
}

21
pkgs/applications/kde/libkdepim.nix Normal file
View File

@ -0,0 +1,21 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, akonadi-search, kcmutils, kcodecs, kcompletion,
kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, kitemviews, kjobwidgets,
kldap, kwallet,
}:
mkDerivation {
name = "libkdepim";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-contacts akonadi-search kcmutils kcodecs kcompletion
kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap
kwallet
];
}

1
pkgs/applications/kde/libkexiv2.nix
View File

@ -9,4 +9,5 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ exiv2 ];
outputs = [ "out" "dev" ];
}

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

@ -7,5 +7,6 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ];
buildInputs = [ kconfig ki18n kservice kxmlgui ];
outputs = [ "out" "dev" ];
}

21
pkgs/applications/kde/libkleo.nix Normal file
View File

@ -0,0 +1,21 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
boost, qgpgme, kcodecs, kcompletion, kconfig, kcoreaddons, ki18n, kitemmodels,
kpimtextedit, kwidgetsaddons, kwindowsystem
}:
mkDerivation {
name = "libkleo";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost kcodecs kcompletion kconfig kcoreaddons ki18n kitemmodels
kpimtextedit kwidgetsaddons kwindowsystem
];
propagatedBuildInputs = [ qgpgme ];
outputs = [ "out" "dev" ];
}

23
pkgs/applications/kde/libksieve.nix Normal file
View File

@ -0,0 +1,23 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, karchive, kcompletion, kiconthemes, kidentitymanagement, kio,
kmailtransport, knewstuff, kwindowsystem, kxmlgui, libkdepim, pimcommon,
qtwebengine, syntax-highlighting,
}:
mkDerivation {
name = "libksieve";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi karchive kcompletion kiconthemes kidentitymanagement kio
kmailtransport knewstuff kwindowsystem kxmlgui libkdepim pimcommon
qtwebengine
];
propagatedBuildInputs = [ syntax-highlighting ];
}

22
pkgs/applications/kde/mailcommon.nix Normal file
View File

@ -0,0 +1,22 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets,
kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap,
kmailtransport, kwindowsystem, mailimporter, messagelib, phonon,
}:
mkDerivation {
name = "mailcommon";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons
kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport
kwindowsystem mailimporter messagelib phonon
];
outputs = [ "out" "dev" ];
}

19
pkgs/applications/kde/mailimporter.nix Normal file
View File

@ -0,0 +1,19 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,
kmime, kxmlgui, libkdepim
}:
mkDerivation {
name = "mailimporter";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
kxmlgui libkdepim
];
}

20
pkgs/applications/kde/mbox-importer.nix Normal file
View File

@ -0,0 +1,20 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-search, kconfig, kservice, kio, mailcommon, mailimporter, messagelib
}:
mkDerivation {
name = "mbox-importer";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib
];
preHook = ''
set -x
'';
}

29
pkgs/applications/kde/messagelib.nix Normal file
View File

@ -0,0 +1,29 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5,
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
pimcommon, qtwebengine, qtwebkit, syntax-highlighting
}:
mkDerivation {
name = "messagelib";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs
kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit
syntax-highlighting
];
propagatedBuildInputs = [
akonadi akonadi-mime kcontacts kidentitymanagement kmime libkleo pimcommon
qtwebengine
];
outputs = [ "out" "dev" ];
}

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

@ -1,9 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
qtscript, kconfig, kinit, karchive,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
shared_mime_info
extra-cmake-modules, kdoctools, shared_mime_info,
kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, qtscript
}:
mkDerivation {
@ -12,10 +10,8 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
buildInputs = [ shared_mime_info ];
propagatedBuildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
karchive
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
buildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 qtscript
];
}

19
pkgs/applications/kde/pim-sieve-editor.nix Normal file
View File

@ -0,0 +1,19 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit,
kmailtransport, pimcommon, libksieve
}:
mkDerivation {
name = "pim-sieve-editor";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport
pimcommon libksieve
];
}

26
pkgs/applications/kde/pimcommon.nix Normal file
View File

@ -0,0 +1,26 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin,
kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
kwallet, kwindowsystem, libkdepim, qtwebengine
}:
mkDerivation {
name = "pimcommon";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
kwallet kwindowsystem libkdepim qtwebengine
];
propagatedBuildInputs = [
akonadi akonadi-contacts kconfig kcontacts kimap
];
outputs = [ "out" "dev" ];
}

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

@ -11,10 +11,9 @@ mkDerivation {
name = "spectacle";
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ ki18n xcb-util-cursor ];
propagatedBuildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
buildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
];
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
}

16
pkgs/applications/kde/syndication.nix Normal file
View File

@ -0,0 +1,16 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kio
}:
mkDerivation {
name = "syndication";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kio ];
outputs = [ "out" "dev" ];
}

4
pkgs/applications/misc/kanboard/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "kanboard-${version}";
version = "1.0.44";
version = "1.0.46";
src = fetchzip {
url = "https://kanboard.net/${name}.zip";
sha256 = "1cwk9gcwddwbbw6hz2iqmkmy90rwddy79b9vi6fj9cl03zswypgn";
sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a";
};
dontBuild = true;

4
pkgs/build-support/cc-wrapper/default.nix
View File

@ -8,10 +8,8 @@
{ name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
, zlib ? null, extraPackages ? [], extraBuildCommands ? ""
, dyld ? null # TODO: should this be a setup-hook on dyld?
, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
, buildPackages ? {}, hostPlatform, targetPlatform
, runCommand ? null
, buildPackages ? {}
, useMacosReexportHack ? false
}:

2
pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
};
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
nativeBuildInputs = [ pkgconfig intltool ];

2
pkgs/desktops/plasma-5/default.nix
View File

@ -71,6 +71,8 @@ let
propagateBin = propagate "bin";
callPackage = self.newScope {
inherit propagate propagateBin;
mkDerivation = args:
let
inherit (args) name;

3
pkgs/desktops/plasma-5/libkscreen/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, copyPathsToStore,
mkDerivation, lib, copyPathsToStore, propagate,
extra-cmake-modules,
kwayland, libXrandr, qtx11extras
}:
@ -13,4 +13,5 @@ mkDerivation {
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\""
'';
setupHook = propagate "out";
}

5
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -727,9 +727,8 @@ self: super: {
'';
});
# https://github.com/plow-technologies/servant-auth/issues/20
servant-auth = dontCheck super.servant-auth;
# Glob == 0.7.x
servant-auth = doJailbreak super.servant-auth;
# https://github.com/pontarius/pontarius-xmpp/issues/105
pontarius-xmpp = dontCheck super.pontarius-xmpp;

2
pkgs/development/libraries/aspell/aspell-with-dicts.nix
View File

@ -28,7 +28,7 @@ in runCommand "aspell-env" {
pushd "${aspell}/bin"
for prg in *; do
if [ -f "$prg" ]; then
makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "data-dir ${dictEnv}/lib/aspell"
makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "dict-dir ${dictEnv}/lib/aspell"
fi
done
popd

7
pkgs/development/libraries/gpgme/default.nix
View File

@ -32,9 +32,12 @@ stdenv.mkDerivation rec {
"--enable-fixed-path=${gnupg}/bin"
];
# https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
NIX_CFLAGS_COMPILE =
lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
# qgpgme uses Q_ASSERT which retains build inputs at runtime unless
# debugging is disabled
lib.optional (qtbase != null) "-DQT_NO_DEBUG"
# https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
meta = with stdenv.lib; {
homepage = https://gnupg.org/software/gpgme/index.html;

22
pkgs/development/libraries/grantlee/5.x.nix → pkgs/development/libraries/grantlee/5/default.nix
View File

@ -1,8 +1,10 @@
{ stdenv, fetchurl, qtbase, qtscript, cmake }:
{ mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }:
stdenv.mkDerivation rec {
mkDerivation rec {
name = "grantlee-${version}";
version = "5.1.0";
grantleeCompatVersion = "5.1";
grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}";
src = fetchurl {
url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
@ -13,7 +15,19 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtscript ];
nativeBuildInputs = [ cmake ];
meta = {
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
outputs = [ "out" "dev" ];
postFixup =
# Disabuse CMake of the notion that libraries are in $dev
''
sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \
-e "s|\''${_IMPORT_PREFIX}|$out|"
'';
setupHook = ./setup-hook.sh;
meta = with lib; {
description = "Qt5 port of Django template system";
longDescription = ''
Grantlee is a plugin based String Template system written using the Qt
@ -25,7 +39,7 @@ stdenv.mkDerivation rec {
and the design of Django is reused in Grantlee.'';
homepage = http://gitorious.org/grantlee;
maintainers = [ ];
maintainers = [ maintainers.ttuegel ];
inherit (qtbase.meta) platforms;
};
}

19
pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch Normal file
View File

@ -0,0 +1,19 @@
Index: grantlee-5.1.0/templates/lib/engine.cpp
===================================================================
--- grantlee-5.1.0.orig/templates/lib/engine.cpp
+++ grantlee-5.1.0/templates/lib/engine.cpp
@@ -48,6 +48,14 @@ Engine::Engine(QObject *parent)
d_ptr->m_pluginDirs = QCoreApplication::instance()->libraryPaths();
d_ptr->m_pluginDirs << QString::fromLocal8Bit(GRANTLEE_PLUGIN_PATH);
+
+ // Add library paths derived from NIX_PROFILES.
+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
+ for (const QByteArray &profile: profiles) {
+ if (!profile.isEmpty()) {
+ d_ptr->m_pluginDirs << (QFile::decodeName(profile) + QStringLiteral("/lib"));
+ }
+ }
}
Engine::~Engine()

27
pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch Normal file
View File

@ -0,0 +1,27 @@
Index: grantlee-5.1.0/templates/lib/templateloader.cpp
===================================================================
--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp
+++ grantlee-5.1.0/templates/lib/templateloader.cpp
@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB
+ QLatin1Char('/') + fileName);
const QFileInfo fi(file);
- if (file.exists()
- && !fi.canonicalFilePath().contains(
- QDir(d->m_templateDirs.at(i)).canonicalPath()))
- return Template();
++i;
}
@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co
+ QLatin1Char('/') + fileName);
const QFileInfo fi(file);
- if (!fi.canonicalFilePath().contains(
- QDir(d->m_templateDirs.at(i)).canonicalPath())) {
- ++i;
- continue;
- }
if (file.exists()) {
auto path = fi.absoluteFilePath();

2
pkgs/development/libraries/grantlee/5/series Normal file
View File

@ -0,0 +1,2 @@
grantlee-nix-profiles.patch
grantlee-no-canonicalize-filepath.patch

23
pkgs/development/libraries/grantlee/5/setup-hook.sh Normal file
View File

@ -0,0 +1,23 @@
grantleePluginPrefix=@grantleePluginPrefix@
providesGrantleeRuntime() {
[ -d "$1/$grantleePluginPrefix" ]
}
_grantleeCrossEnvHook() {
if providesQtRuntime "$1"; then
propagatedBuildInputs+=" $1"
propagatedUserEnvPkgs+=" $1"
fi
}
crossEnvHooks+=(_grantleeCrossEnvHook)
_grantleeEnvHook() {
if providesGrantleeRuntime "$1"; then
propagatedNativeBuildInputs+=" $1"
if [ -z "$crossConfig" ]; then
propagatedUserEnvPkgs+=" $1"
fi
fi
}
envHooks+=(_grantleeEnvHook)

13
pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch
View File

@ -1,13 +0,0 @@
Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
===================================================================
--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
+++ kcmutils-5.33.0/src/kcmoduleloader.cpp
@@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con
if (module) {
return module;
} else {
- KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
+ KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library()));
KPluginFactory* factory = loader.factory();
if (!factory) {
qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();

1
pkgs/development/libraries/kde-frameworks/kcmutils/series
View File

@ -1,3 +1,2 @@
kcmutils-follow-symlinks.patch
kcmutils-debug-module-loader.patch
kcmutils-fix-plugin-path.patch

3
pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
View File

@ -11,6 +11,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews
kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet
kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
];
propagatedBuildInputs = [ qttools ];
}

3
pkgs/development/libraries/kde-frameworks/kwallet.nix
View File

@ -16,4 +16,7 @@ mkDerivation {
];
propagatedBuildInputs = [ qtbase ];
patches = [ ./kwallet-dbus.patch ];
postFixup = ''
rm "''${!outputBin}/share/dbus-1/services/org.kde.kwalletd.service"
'';
}

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