Merge pull request #11764 from ttuegel/kde-updates

KDE updates
This commit is contained in:
Thomas Tuegel 2015-12-16 10:24:11 -06:00
commit 8ee82c6b00
18 changed files with 1519 additions and 1306 deletions

View file

@ -8,9 +8,7 @@ let
cfg = xcfg.desktopManager.kde5;
xorg = pkgs.xorg;
kf5 = pkgs.kf5_stable;
plasma5 = pkgs.plasma5_stable;
kdeApps = pkgs.kdeApps_stable;
kde5 = pkgs.kde5;
in
@ -57,12 +55,12 @@ in
services.xserver.desktopManager.session = singleton {
name = "kde5";
bgSupport = true;
start = ''exec ${plasma5.plasma-workspace}/bin/startkde;'';
start = ''exec ${kde5.plasma-workspace}/bin/startkde;'';
};
security.setuidOwners = singleton {
program = "kcheckpass";
source = "${plasma5.plasma-workspace}/lib/libexec/kcheckpass";
source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass";
owner = "root";
group = "root";
setuid = true;
@ -72,61 +70,61 @@ in
[
pkgs.qt4 # qtconfig is the only way to set Qt 4 theme
kf5.frameworkintegration
kf5.kinit
kde5.frameworkintegration
kde5.kinit
plasma5.breeze
plasma5.kde-cli-tools
plasma5.kdeplasma-addons
plasma5.kgamma5
plasma5.khelpcenter
plasma5.khotkeys
plasma5.kinfocenter
plasma5.kmenuedit
plasma5.kscreen
plasma5.ksysguard
plasma5.kwayland
plasma5.kwin
plasma5.kwrited
plasma5.milou
plasma5.oxygen
plasma5.polkit-kde-agent
plasma5.systemsettings
kde5.breeze
kde5.kde-cli-tools
kde5.kdeplasma-addons
kde5.kgamma5
kde5.khelpcenter
kde5.khotkeys
kde5.kinfocenter
kde5.kmenuedit
kde5.kscreen
kde5.ksysguard
kde5.kwayland
kde5.kwin
kde5.kwrited
kde5.milou
kde5.oxygen
kde5.polkit-kde-agent
kde5.systemsettings
plasma5.plasma-desktop
plasma5.plasma-workspace
plasma5.plasma-workspace-wallpapers
kde5.plasma-desktop
kde5.plasma-workspace
kde5.plasma-workspace-wallpapers
kdeApps.ark
kdeApps.dolphin
kdeApps.dolphin-plugins
kdeApps.ffmpegthumbs
kdeApps.gwenview
kdeApps.kate
kdeApps.kdegraphics-thumbnailers
kdeApps.konsole
kdeApps.okular
kdeApps.print-manager
kde5.ark
kde5.dolphin
kde5.dolphin-plugins
kde5.ffmpegthumbs
kde5.gwenview
kde5.kate
kde5.kdegraphics-thumbnailers
kde5.konsole
kde5.okular
kde5.print-manager
# Oxygen icons moved to KDE Frameworks 5.16 and later.
(kdeApps.oxygen-icons or kf5.oxygen-icons5)
(kde5.oxygen-icons or kde5.oxygen-icons5)
pkgs.hicolor_icon_theme
plasma5.kde-gtk-config
kde5.kde-gtk-config
]
# Plasma 5.5 and later has a Breeze GTK theme.
# If it is not available, Orion is very similar to Breeze.
++ lib.optional (!(lib.hasAttr "breeze-gtk" plasma5)) pkgs.orion
++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion
# Install Breeze icons if available
++ lib.optional (lib.hasAttr "breeze-icons" kf5) kf5.breeze-icons
++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons
# Optional hardware support features
++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil
++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm
++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa
++ lib.optional config.powerManagement.enable plasma5.powerdevil
++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil
++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
++ lib.optional config.powerManagement.enable kde5.powerdevil
++ lib.optionals cfg.phonon.gstreamer.enable
[
@ -167,13 +165,13 @@ in
};
# Enable GTK applications to load SVG icons
environment.variables = mkIf (lib.hasAttr "breeze-icons" kf5) {
environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {
GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
};
fonts.fonts = [ (plasma5.oxygen-fonts or pkgs.noto-fonts) ];
fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];
programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass";
programs.ssh.askPassword = "${kde5.ksshaskpass}/bin/ksshaskpass";
# Enable helpful DBus services.
services.udisks2.enable = true;
@ -185,8 +183,8 @@ in
services.xserver.displayManager.sddm = {
theme = "breeze";
themes = [
plasma5.plasma-workspace
(kdeApps.oxygen-icons or kf5.oxygen-icons5)
kde5.plasma-workspace
(kde5.oxygen-icons or kde5.oxygen-icons5)
];
};

View file

@ -519,9 +519,9 @@ in
"-terminate"
"-config ${configFile}"
"-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
] ++ optional (cfg.display != null) ":${tostring cfg.display}"
] ++ optional (cfg.display != null) ":${toString cfg.display}"
++ optional (cfg.tty != null) "vt${toString cfg.tty}"
++ optional (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ]
++ optionals (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ]
++ optional (!cfg.enableTCP) "-nolisten tcp";
services.xserver.modules =

View file

@ -21,13 +21,14 @@ let
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
mirror = "mirror://kde";
kdeApp = import ./kde-app.nix {
inherit stdenv lib;
inherit debug srcs;
};
packages = self: with self; {
inherit (pkgs.kdeApps_15_08) kdelibs ksnapshot;
kdeApp = import ./kde-app.nix {
inherit stdenv lib;
inherit debug srcs;
};
kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
ark = callPackage ./ark.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
@ -45,10 +46,9 @@ let
libkipi = callPackage ./libkipi.nix {};
okular = callPackage ./okular.nix {};
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
};
newScope = scope: pkgs.kf517.newScope ({ inherit kdeApp; } // scope);
in lib.makeScope newScope packages
in packages

View file

@ -4,7 +4,7 @@
set -x
# The trailing slash at the end is necessary!
WGET_ARGS='http://download.kde.org/unstable/applications/15.11.90/ -A *.tar.xz'
WGET_ARGS='http://download.kde.org/stable/applications/15.12.0/ -A *.tar.xz'
mkdir tmp; cd tmp

View file

@ -0,0 +1,56 @@
From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 7 Sep 2015 13:54:57 -0500
Subject: [PATCH 1/2] old kde4 cmake policies
---
cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index 7d54b9b..c435571 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -345,6 +345,39 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3)
+cmake_policy(VERSION 2.4.5)
+
+# CMake 2.6, set compatibility behaviour to cmake 2.4
+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
+# resets the policy settings, so we get a lot of warnings
+
+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
+cmake_policy(SET CMP0000 OLD)
+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
+cmake_policy(SET CMP0002 OLD)
+# CMP0003: add the link paths to the link command as with cmake 2.4
+cmake_policy(SET CMP0003 OLD)
+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
+cmake_policy(SET CMP0005 OLD)
+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file
+# where this is done, macros and functions are executed with the policies as they
+# were when the were defined. Keep the OLD behaviour so we can set the policies here
+# for all KDE software without the big warning
+cmake_policy(SET CMP0011 OLD)
+
+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files
+# in this directory over those from CMAKE_MODULE_PATH
+cmake_policy(SET CMP0017 NEW)
+
+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake
+if (POLICY CMP0026)
+ cmake_policy(SET CMP0026 OLD)
+endif (POLICY CMP0026)
+
+
# Only do something if it hasn't been found yet
if(NOT KDE4_FOUND)
--
2.5.0

View file

@ -0,0 +1,25 @@
From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 7 Sep 2015 13:56:03 -0500
Subject: [PATCH 2/2] polkit install path
---
kdecore/auth/ConfigureChecks.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
index 7cf9cb5..c8334ae 100644
--- a/kdecore/auth/ConfigureChecks.cmake
+++ b/kdecore/auth/ConfigureChecks.cmake
@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
"Where policy files generated by KAuth will be installed" FORCE)
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
--
2.5.0

View file

@ -0,0 +1,47 @@
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
index ab8f76d..2ae5089 100644
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
else
{
xdgdirList.clear();
- xdgdirList.append(QString::fromLatin1("/etc/xdg"));
-#ifdef Q_WS_WIN
- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
-#else
- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
-#endif
}
QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
}
} else {
xdgdirList = kdedirDataDirs;
-#ifndef Q_WS_WIN
- xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
- xdgdirList.append(QString::fromLatin1("/usr/share/"));
-#endif
}
localXdgDir = readEnvPath("XDG_DATA_HOME");
diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
index 4c9cad9..6849d45 100644
--- a/solid/solid/xdgbasedirs.cpp
+++ b/solid/solid/xdgbasedirs.cpp
@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
{
if ( qstrncmp( "data", resource, 4 ) == 0 ) {
if ( instance()->mDataDirs.isEmpty() ) {
- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
}
return instance()->mDataDirs;
} else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
if ( instance()->mConfigDirs.isEmpty() ) {
- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
}
return instance()->mConfigDirs;
}

View file

@ -0,0 +1,43 @@
{ kdeApp, attica, attr, automoc4, avahi, bison, cmake
, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase
, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
, soprano, strigi, udev, xz
, lib
}:
kdeApp {
name = "kdelibs";
buildInputs = [
attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
polkit_qt4 qca2 shared_desktop_ontologies udev xz
];
propagatedBuildInputs = [ qt4 soprano phonon strigi ];
nativeBuildInputs = [
automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
];
patches = [
./0001-old-kde4-cmake-policies.patch
./0002-polkit-install-path.patch
./0003-remove_xdg_impurities.patch
];
# cmake does not detect path to `ilmbase`
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
"-DWITH_SOLID_UDISKS2=ON"
"-DKDE_DEFAULT_HOME=.kde"
];
setupHook = ./setup-hook.sh;
meta = {
licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

@ -0,0 +1,12 @@
diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
@@ -139,7 +139,7 @@
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
"Where policy files generated by KAuth will be installed" FORCE)
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)

View file

@ -0,0 +1,10 @@
addQt4Plugins() {
if [[ -d "$1/lib/qt4/plugins" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
if [[ -d "$1/lib/kde4/plugins" ]]; then
propagatedUserEnvPkgs+=" $1"
fi
}
envHooks+=(addQt4Plugins)

View file

@ -1,29 +0,0 @@
{ kdeApp
, lib
, automoc4
, cmake
, perl
, pkgconfig
, kdelibs
, libkipi
, libXfixes
}:
kdeApp {
name = "ksnapshot";
nativeBuildInputs = [
automoc4
cmake
perl
pkgconfig
];
buildInputs = [
kdelibs
libkipi
libXfixes
];
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

View file

@ -0,0 +1,46 @@
{ kdeApp, lib
, extra-cmake-modules
, kdoctools
, makeQtWrapper
, kconfig
, kcoreaddons
, kdbusaddons
, ki18n
, kio
, knotifications
, kscreen
, kwidgetsaddons
, kwindowsystem
, kxmlgui
, libkipi
, xcb-util-cursor
}:
kdeApp {
name = "spectacle";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeQtWrapper
];
buildInputs = [
kconfig
kcoreaddons
kdbusaddons
ki18n
kio
knotifications
kscreen
kwidgetsaddons
kwindowsystem
kxmlgui
libkipi
xcb-util-cursor
];
postFixup = ''
wrapQtProgram "$out/bin/spectacle"
'';
meta = with lib; {
maintainers = with maintainers; [ ttuegel ];
};
}

File diff suppressed because it is too large Load diff

View file

@ -16,33 +16,33 @@ let
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
mirror = "mirror://kde";
plasmaPackage = args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in stdenv.mkDerivation (args // {
name = "${name}-${version}";
inherit src;
packages = self: with self; {
plasmaPackage = args:
let
inherit (args) name;
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in stdenv.mkDerivation (args // {
name = "${name}-${version}";
inherit src;
setupHook = args.setupHook or ./setup-hook.sh;
setupHook = args.setupHook or ./setup-hook.sh;
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
} // (args.meta or {});
});
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
} // (args.meta or {});
});
addPackages = self: with self; {
bluedevil = callPackage ./bluedevil.nix {};
breeze-gtk = callPackage ./breeze-gtk.nix {};
breeze-qt4 = callPackage ./breeze-qt4.nix {};
@ -81,6 +81,4 @@ let
systemsettings = callPackage ./systemsettings.nix {};
};
newScope = scope: kdeApps.newScope ({ inherit plasmaPackage; } // scope);
in lib.makeScope newScope addPackages
in packages

View file

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

View file

@ -3,307 +3,307 @@
{
bluedevil = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/bluedevil-5.5.0.tar.xz";
sha256 = "0h0i6npmi2llrma4d0k7jaibfjkwvi7qm003i73prza5b2lm9qgk";
name = "bluedevil-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/bluedevil-5.5.1.tar.xz";
sha256 = "09id2vyjdmwl20km0zfwhz2rsyrb2yrfygczh39v1s3nqz88mw97";
name = "bluedevil-5.5.1.tar.xz";
};
};
breeze = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/breeze-5.5.0.tar.xz";
sha256 = "0jaw8ir5vd3ari4hx52mrnl5mrq9njdci8caq37b3k1p4irxba3p";
name = "breeze-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/breeze-5.5.1.tar.xz";
sha256 = "03chjfi878r9cz6vy7px0fma8lzrynpnnvbfqw2pbz00mny89hkw";
name = "breeze-5.5.1.tar.xz";
};
};
breeze-gtk = {
version = "5.5.0.1";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/breeze-gtk-5.5.0.1.tar.xz";
sha256 = "04jjb81022k7xfzhzmdani057inmly2r7ksc1wvbg5adi7m0xn4n";
name = "breeze-gtk-5.5.0.1.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/breeze-gtk-5.5.1.tar.xz";
sha256 = "10nnahdsyl7rh6r4wzrxjhw6pl5j5b29wkv7a9kkyqjmhmfxsmpq";
name = "breeze-gtk-5.5.1.tar.xz";
};
};
discover = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/discover-5.5.0.tar.xz";
sha256 = "0ngxdgkr4ikqmi2x8dgbf6xbpvhwqcv79b7ir2jgmcjjl93958f4";
name = "discover-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/discover-5.5.1.tar.xz";
sha256 = "0nr48126xb48ra9gc40bhbsz74ssrf6dnx189n3sdvb00y7a26wf";
name = "discover-5.5.1.tar.xz";
};
};
kde-cli-tools = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kde-cli-tools-5.5.0.tar.xz";
sha256 = "0l45hx1w1pyfbsg60lwdma9pgzdffprvrz12rqq6ylnjsz1askwv";
name = "kde-cli-tools-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kde-cli-tools-5.5.1.tar.xz";
sha256 = "0izn9fqbrjxcpwwjfr4522jazz2aw8h0r5c4s99hmy5q6hyr59bj";
name = "kde-cli-tools-5.5.1.tar.xz";
};
};
kdecoration = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kdecoration-5.5.0.tar.xz";
sha256 = "1wdwnj3dridk745mgmi9xnyd7dy0n0444nvq1mggn2mj4ca6q9ra";
name = "kdecoration-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kdecoration-5.5.1.tar.xz";
sha256 = "1fdflipbfbivy3p90n30wc6flqck5hx5q4zli42v2a039bzj44jn";
name = "kdecoration-5.5.1.tar.xz";
};
};
kde-gtk-config = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kde-gtk-config-5.5.0.tar.xz";
sha256 = "1bi6dr7bv42rn5jf212qrr5bik8xglvaabz5srqwhs2n4z35913a";
name = "kde-gtk-config-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kde-gtk-config-5.5.1.tar.xz";
sha256 = "1pjs59i9xwz3csd86qmvb4c7n766q1dam8llvklkx17i8f9ddri0";
name = "kde-gtk-config-5.5.1.tar.xz";
};
};
kdeplasma-addons = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kdeplasma-addons-5.5.0.tar.xz";
sha256 = "1y3w97pbg24d2mzp2x882a43ljn5wqs74q6ry594a6mip2zzvlrz";
name = "kdeplasma-addons-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kdeplasma-addons-5.5.1.tar.xz";
sha256 = "0i59p4dyaz7kz9rcx2hpwg3c7sbwsk4cab9ldcck6vb83szxi1il";
name = "kdeplasma-addons-5.5.1.tar.xz";
};
};
kgamma5 = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kgamma5-5.5.0.tar.xz";
sha256 = "1i6c0m0dr23z09r1rdfcna168bmnaysqxwxmp55ix3jad9ilfa8f";
name = "kgamma5-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kgamma5-5.5.1.tar.xz";
sha256 = "0qwb2fl27pprr6m2vhr021whpashgan3lx2s91iyb09cxf56883y";
name = "kgamma5-5.5.1.tar.xz";
};
};
khelpcenter = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/khelpcenter-5.5.0.tar.xz";
sha256 = "0piwsa446ja6fmkxc8shzxqmbq7hcbydpc4xsc6bsjbzbskz8c09";
name = "khelpcenter-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/khelpcenter-5.5.1.tar.xz";
sha256 = "0alsn8xsac0l2zdsk9fvawz3zvg431qgg443p05v6a2pfadb2b0s";
name = "khelpcenter-5.5.1.tar.xz";
};
};
khotkeys = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/khotkeys-5.5.0.tar.xz";
sha256 = "197fhzm1rcm65k8idf0wlzsnfxpimdzg516syjzkwah5smg1qshl";
name = "khotkeys-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/khotkeys-5.5.1.tar.xz";
sha256 = "0rbmdh8yv8ms19kn3r0qcgy0wlrin5jhxic55pc4hdccxy0alchi";
name = "khotkeys-5.5.1.tar.xz";
};
};
kinfocenter = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kinfocenter-5.5.0.tar.xz";
sha256 = "1xr9l8wg20n0fyg5x9rgyhbimgwmlf97cf2v3yi8aff5mx348avy";
name = "kinfocenter-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kinfocenter-5.5.1.tar.xz";
sha256 = "0b1z8qsa1qpl9w13ag8154biry44r19nrg1mb5r3wjy22s1nmf40";
name = "kinfocenter-5.5.1.tar.xz";
};
};
kmenuedit = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kmenuedit-5.5.0.tar.xz";
sha256 = "1hbifshppw64zmsybvcnm4sjy14zjq9rg2jxb36blfnvw08i9z4n";
name = "kmenuedit-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kmenuedit-5.5.1.tar.xz";
sha256 = "0wk5lainva9pc8ccflpfgil9b9vi6wf1vfd5pkn11n9dqr1sbgcq";
name = "kmenuedit-5.5.1.tar.xz";
};
};
kscreen = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kscreen-5.5.0.tar.xz";
sha256 = "0mznp9lb9z65vfqb752iw7scz0hs3if3bmk9nq1i6ns3c520gcx6";
name = "kscreen-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kscreen-5.5.1.tar.xz";
sha256 = "1zn31yfk2x9xpqvr0liyna98sk486qqbdgzisx8dl5jm8j7lxm5c";
name = "kscreen-5.5.1.tar.xz";
};
};
kscreenlocker = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kscreenlocker-5.5.0.tar.xz";
sha256 = "1myx3ykcq4p9f04bp2w7anqnr9f6b2rjajhkvxbwa9rvxjhwf3n9";
name = "kscreenlocker-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kscreenlocker-5.5.1.tar.xz";
sha256 = "0614w38isbqhvw425620mabvczjph52b6mpzzp0ac462ryl5061s";
name = "kscreenlocker-5.5.1.tar.xz";
};
};
ksshaskpass = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/ksshaskpass-5.5.0.tar.xz";
sha256 = "12m88cvgvsnfvzvpyaji7x4pcb4b2xw977x5w50b73mbznxw9hhh";
name = "ksshaskpass-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/ksshaskpass-5.5.1.tar.xz";
sha256 = "0xafh56wpa7ypj2j4pbgp8p7gk95xa7q3wbab3qw8n7gwjwvgm8v";
name = "ksshaskpass-5.5.1.tar.xz";
};
};
ksysguard = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/ksysguard-5.5.0.tar.xz";
sha256 = "1paj03yccnym83l5585scn6mhd82xpzz5pqwqc4gz45cfq6ix3bv";
name = "ksysguard-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/ksysguard-5.5.1.tar.xz";
sha256 = "0zp3hd22hljn1xqdbmayhrbm4niksp9s6p8fx0nv7pnnv8h02vw1";
name = "ksysguard-5.5.1.tar.xz";
};
};
kwallet-pam = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kwallet-pam-5.5.0.tar.xz";
sha256 = "084yyrm00i2yaikbl9sqzp2im56zb987cfqxqlrdgkkwf8p4g60g";
name = "kwallet-pam-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kwallet-pam-5.5.1.tar.xz";
sha256 = "1hk8a82dmvf9h5bhykpfx02b65vx30ziak698sjs0zp0hxfilq56";
name = "kwallet-pam-5.5.1.tar.xz";
};
};
kwayland = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kwayland-5.5.0.tar.xz";
sha256 = "1dxa3xkqg96jw3gmc2jya3wym910pdzljhcdspk3n88045wn8hs9";
name = "kwayland-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kwayland-5.5.1.tar.xz";
sha256 = "18dxhyphd5chswa39isn47xjhp6v2di5jjs03g21wfc4q0avpd45";
name = "kwayland-5.5.1.tar.xz";
};
};
kwayland-integration = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kwayland-integration-5.5.0.tar.xz";
sha256 = "0x2kqy89nzswx06n0diskjs14bjcsi0wyydbcx57553r1dkhkhn4";
name = "kwayland-integration-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kwayland-integration-5.5.1.tar.xz";
sha256 = "1ss19cxisz9xj4nh6zjmndpcp6r4gvmpsbqa2wycrvsqq6wrsr5f";
name = "kwayland-integration-5.5.1.tar.xz";
};
};
kwin = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kwin-5.5.0.tar.xz";
sha256 = "0f7km0kj1wvm4knpskm3fa82f1nqbv8y8l7mj3nr00zm3rd2zc1l";
name = "kwin-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kwin-5.5.1.tar.xz";
sha256 = "0gqh98v4h6mc087xdqma5ab478f0zl2v1p6614q9w4si7770i8vl";
name = "kwin-5.5.1.tar.xz";
};
};
kwrited = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/kwrited-5.5.0.tar.xz";
sha256 = "1f0zkm0xd3cff947nprcxf45cyk6jkcglv1b7dzn727afm456js8";
name = "kwrited-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/kwrited-5.5.1.tar.xz";
sha256 = "0din1v4jls2bmxx50dx6hs4anfzrr50cb5m8qdq6n0j35p60xq30";
name = "kwrited-5.5.1.tar.xz";
};
};
libkscreen = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/libkscreen-5.5.0.tar.xz";
sha256 = "0w03fjcqazx60zzp4sx77fpz53i38hzgn400jqajiwbb6d3mrxw3";
name = "libkscreen-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/libkscreen-5.5.1.tar.xz";
sha256 = "1v31hxdrwhrx0n582cp2is09k9slw8a7c8qr5yxc8gi96sj3hb2y";
name = "libkscreen-5.5.1.tar.xz";
};
};
libksysguard = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/libksysguard-5.5.0.tar.xz";
sha256 = "1p2nhf9wnw8jf4sinkk6rq7b1daymb16lmhd22lji34ayv1fh9i8";
name = "libksysguard-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/libksysguard-5.5.1.tar.xz";
sha256 = "1zgvxvrmi0amxmn4cmd0g4bdb7b97msdkycsckp7krv5mw5h55dx";
name = "libksysguard-5.5.1.tar.xz";
};
};
milou = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/milou-5.5.0.tar.xz";
sha256 = "0xh5fbf6j896dj7krd8fcapn5b10swgg0dmcv3sa8hzkpaw36gfm";
name = "milou-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/milou-5.5.1.tar.xz";
sha256 = "10qsfqx8rqzzy7yg1sikyxh9ycfplmvv30y8rgv4hihnh1yywhks";
name = "milou-5.5.1.tar.xz";
};
};
oxygen = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/oxygen-5.5.0.tar.xz";
sha256 = "12l0m2b5d970grpi5mxd6rl3g8ry50mfr1pjv4ar7jhic6w4zi7x";
name = "oxygen-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/oxygen-5.5.1.tar.xz";
sha256 = "0fszhf3xavmygm82kb3i8pymvz9bc5av5mi35d0qj3fzwfgdkd6h";
name = "oxygen-5.5.1.tar.xz";
};
};
plasma-desktop = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz";
sha256 = "1iak4j4jiigm0sm8f1w2g4w52v2q1rja6s5sy5247j9wyyfc6vw4";
name = "plasma-desktop-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/plasma-desktop-5.5.1.tar.xz";
sha256 = "1gazhr4501176z6r8psz8wjg3hcfigvpfm02q82aw9jpyy7sjini";
name = "plasma-desktop-5.5.1.tar.xz";
};
};
plasma-mediacenter = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/plasma-mediacenter-5.5.0.tar.xz";
sha256 = "10jrbs3mrf3vwnw6a0rsipryfr4pd0jp5s89srcqk10p25pimq52";
name = "plasma-mediacenter-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/plasma-mediacenter-5.5.1.tar.xz";
sha256 = "12xlixrjbs6lmdabp7f9mp6dhwai7qnj5n867q86qv6i836y10dy";
name = "plasma-mediacenter-5.5.1.tar.xz";
};
};
plasma-nm = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/plasma-nm-5.5.0.tar.xz";
sha256 = "1clzmrj78g1gs2d6qbnwk3snlz5rhipfrrzm5rsimjqxv111jfd4";
name = "plasma-nm-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/plasma-nm-5.5.1.tar.xz";
sha256 = "0q0189vz7770xv65skj7a47lbavfgz9a4x4csqv834k40pawkyhg";
name = "plasma-nm-5.5.1.tar.xz";
};
};
plasma-pa = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/plasma-pa-5.5.0.tar.xz";
sha256 = "0yi0snf6xndvwwzlylgyzpv90b9nsknrm3lsk4gvm49q8cvzy8km";
name = "plasma-pa-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/plasma-pa-5.5.1.tar.xz";
sha256 = "13falp4xq028jnkqf5nsv71vv9icclvyk701s5dbcff7v2k2zphk";
name = "plasma-pa-5.5.1.tar.xz";
};
};
plasma-sdk = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/plasma-sdk-5.5.0.tar.xz";
sha256 = "196lna5zbqa8py082c96xl5d3c2l9p4rcnb06fyd91x3z1csq54v";
name = "plasma-sdk-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/plasma-sdk-5.5.1.tar.xz";
sha256 = "1s1k8zdkzpp51dn7w1ra4mswjnrr7nnf7nywdx8k10c0fyxny7hy";
name = "plasma-sdk-5.5.1.tar.xz";
};
};
plasma-workspace = {
version = "5.5.0";
version = "5.5.1.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-5.5.0.tar.xz";
sha256 = "013z03s0iy3aw9ks703wif7m6mlxx0vrxj98zvscmiaiasryhf13";
name = "plasma-workspace-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/plasma-workspace-5.5.1.1.tar.xz";
sha256 = "019pmhlry3zyrq4mvs35k1lmz35cwk4xvpl8wy7awx8r631dm4by";
name = "plasma-workspace-5.5.1.1.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-wallpapers-5.5.0.tar.xz";
sha256 = "0qs547zy8qdmypa6cd60ksian94fykaysnjn7di00gjf2jpfy4dz";
name = "plasma-workspace-wallpapers-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/plasma-workspace-wallpapers-5.5.1.tar.xz";
sha256 = "1w2bbgcbjvdjxlgd4r3wva87i08y2ngqy85fngpl4387rq234zri";
name = "plasma-workspace-wallpapers-5.5.1.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.5.0";
version = "1-5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/polkit-kde-agent-1-5.5.0.tar.xz";
sha256 = "0ahv82zyj42r1sp4mwp7s8iw44dw9rjx5yqvy7jvdmrvsa9n4f1c";
name = "polkit-kde-agent-1-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/polkit-kde-agent-1-5.5.1.tar.xz";
sha256 = "181d0l0dh7kxdz2ykl6g8mirxjcldm5p2737py3c7g617ysl97c1";
name = "polkit-kde-agent-1-5.5.1.tar.xz";
};
};
powerdevil = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/powerdevil-5.5.0.tar.xz";
sha256 = "03gayczhaxql54had50f0jf4vfcckhdxfndv1k33kf16ldyg3w4f";
name = "powerdevil-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/powerdevil-5.5.1.tar.xz";
sha256 = "1gjhclm58dxlmb6g8dm2alfqk7iw9fy5vyryn0z6i71j7760aqpp";
name = "powerdevil-5.5.1.tar.xz";
};
};
sddm-kcm = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/sddm-kcm-5.5.0.tar.xz";
sha256 = "1wvxi4z3bxzj1wgq5n76zlq7d7pydfllx7ghghkdqhl6g4vf6nk0";
name = "sddm-kcm-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/sddm-kcm-5.5.1.tar.xz";
sha256 = "0fbnyvyklr409n2qdbyvn1sqhkl7jdabldpv6brq010wd5f2rfrv";
name = "sddm-kcm-5.5.1.tar.xz";
};
};
systemsettings = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/systemsettings-5.5.0.tar.xz";
sha256 = "1azq8zq214p2lhyq28saw3m07ngi3z4bgx4rx0pflzswqfb6fxr1";
name = "systemsettings-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/systemsettings-5.5.1.tar.xz";
sha256 = "19q9yvlvyq61m3xjnii6zfpf5kwnja906i3709ia29132ai4x3sn";
name = "systemsettings-5.5.1.tar.xz";
};
};
user-manager = {
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.5.0/user-manager-5.5.0.tar.xz";
sha256 = "08v49rwfpq8is829z4zb04qhj49wa2d2c9l2h0di06k1km6vs729";
name = "user-manager-5.5.0.tar.xz";
url = "${mirror}/stable/plasma/5.5.1/user-manager-5.5.1.tar.xz";
sha256 = "12mrn2fila5m1nzrj196s6q15g91c52zqqbgzi9zqk22n2801l9f";
name = "user-manager-5.5.1.tar.xz";
};
};
}

View file

@ -14,29 +14,29 @@ let
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
kdeFramework = args:
let
inherit (args) name;
inherit (srcs."${name}") src version;
in stdenv.mkDerivation (args // {
name = "${name}-${version}";
inherit src;
packages = self: with self; {
kdeFramework = args:
let
inherit (args) name;
inherit (srcs."${name}") src version;
in stdenv.mkDerivation (args // {
name = "${name}-${version}";
inherit src;
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
});
meta = {
license = with lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
} // (args.meta or {});
});
addPackages = self: with self; {
attica = callPackage ./attica.nix {};
baloo = callPackage ./baloo.nix {};
bluez-qt = callPackage ./bluez-qt.nix {};
@ -109,6 +109,4 @@ let
threadweaver = callPackage ./threadweaver.nix {};
};
newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope);
in lib.makeScope newScope addPackages
in packages

View file

@ -6859,54 +6859,10 @@ let
};
kf515 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.15 { inherit pkgs; });
kf517 = recurseIntoAttrs (import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; });
kf517 = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
kf5_stable = kf515;
kf5_latest = kf517;
kf5PackagesFun = self: with self; {
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
k9copy = callPackage ../applications/video/k9copy {};
quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
monolithic = true;
daemon = false;
client = false;
withKDE = true;
dconf = gnome3.dconf;
tag = "-kf5";
};
quasselClient = quassel.override {
monolithic = false;
client = true;
tag = "-client-kf5";
};
quassel_qt5 = quassel.override {
withKDE = false;
tag = "-qt5";
};
quasselClient_qt5 = quasselClient.override {
withKDE = false;
tag = "-client-qt5";
};
quasselDaemon = quassel.override {
monolithic = false;
daemon = true;
tag = "-daemon-qt5";
withKDE = false;
};
};
kf515Packages = lib.makeScope kf515.newScope kf5PackagesFun;
kf517Packages = lib.makeScope kf517.newScope kf5PackagesFun;
kf5Packages = kf515Packages;
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
@ -12250,7 +12206,7 @@ let
};
kdeApps_15_08 = recurseIntoAttrs (import ../applications/kde-apps-15.08 { inherit pkgs; });
kdeApps_15_12 = recurseIntoAttrs (import ../applications/kde-apps-15.12 { inherit pkgs; });
kdeApps_15_12 = import ../applications/kde-apps-15.12 { inherit pkgs; };
kdeApps_stable = kdeApps_15_08;
kdeApps_latest = kdeApps_15_12;
@ -14756,11 +14712,56 @@ let
numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
plasma54 = recurseIntoAttrs (import ../desktops/plasma-5.4 { inherit pkgs; });
plasma55 = recurseIntoAttrs (import ../desktops/plasma-5.5 { inherit pkgs; });
plasma55 = import ../desktops/plasma-5.5 { inherit pkgs; };
plasma5_stable = plasma54;
plasma5_latest = plasma55;
kde5 = kf5_stable // plasma5_stable // kdeApps_stable;
kde5PackagesFun = self: with self; {
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
k9copy = callPackage ../applications/video/k9copy {};
quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
monolithic = true;
daemon = false;
client = false;
withKDE = true;
dconf = gnome3.dconf;
tag = "-kf5";
};
quasselClient = quassel.override {
monolithic = false;
client = true;
tag = "-client-kf5";
};
quassel_qt5 = quassel.override {
withKDE = false;
tag = "-qt5";
};
quasselClient_qt5 = quasselClient.override {
withKDE = false;
tag = "-client-qt5";
};
quasselDaemon = quassel.override {
monolithic = false;
daemon = true;
tag = "-daemon-qt5";
withKDE = false;
};
};
kde5 = kf5_stable // plasma5_stable // kdeApps_stable // kde5PackagesFun kde5;
kde5_latest =
recurseIntoAttrs
(lib.makeScope qt55Libs.newScope (self:
kf5_latest self // plasma5_latest self // kdeApps_latest self // kde5PackagesFun self));
theme-vertex = callPackage ../misc/themes/vertex { };
@ -15784,11 +15785,11 @@ aliases = with self; rec {
lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31
nfsUtils = nfs-utils; # added 2014-12-06
quassel_qt5 = kf5Packages.quassel_qt5; # added 2015-09-30
quasselClient_qt5 = kf5Packages.quasselClient_qt5; # added 2015-09-30
quasselDaemon_qt5 = kf5Packages.quasselDaemon; # added 2015-09-30
quassel_kf5 = kf5Packages.quassel; # added 2015-09-30
quasselClient_kf5 = kf5Packages.quasselClient; # added 2015-09-30
quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30
quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30
quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30
quassel_kf5 = kde5.quassel; # added 2015-09-30
quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30
rdiff_backup = rdiff-backup; # added 2014-11-23
rssglx = rss-glx; #added 2015-03-25
rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02