Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
fe9f55907e
15 changed files with 228 additions and 120 deletions
|
|
@ -200,7 +200,7 @@ in
|
|||
|
||||
security.wrappers = {
|
||||
kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass";
|
||||
start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit";
|
||||
start_kdeinit.source = "${lib.getBin pkgs.kdeFrameworks.kinit}/libexec/kf5/start_kdeinit";
|
||||
kwin_wayland = {
|
||||
source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
|
||||
capabilities = "cap_sys_nice+ep";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,12 @@ let
|
|||
cfg = dmcfg.sddm;
|
||||
xEnv = config.systemd.services.display-manager.environment;
|
||||
|
||||
inherit (pkgs) sddm;
|
||||
sddm = if config.services.xserver.desktopManager.lxqt.enable then
|
||||
# TODO: Move lxqt to libsForQt515
|
||||
pkgs.libsForQt514.sddm
|
||||
else
|
||||
pkgs.libsForQt5.sddm
|
||||
;
|
||||
|
||||
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
|
||||
#!/bin/sh
|
||||
|
|
|
|||
|
|
@ -29,14 +29,17 @@ mkDerivation rec {
|
|||
sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
wrapGAppsHook
|
||||
kdoctools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
buildInputs = [
|
||||
kconfig
|
||||
kcrash
|
||||
kdbusaddons
|
||||
kdelibs4support
|
||||
kdoctools
|
||||
kguiaddons
|
||||
kiconthemes
|
||||
kinit
|
||||
|
|
@ -48,6 +51,10 @@ mkDerivation rec {
|
|||
poppler
|
||||
qtscript
|
||||
];
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
propagatedUserEnvPkgs = [ konsole ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, mkDerivation
|
||||
, kdeApplications
|
||||
, libkcddb
|
||||
, kinit
|
||||
, kdelibs4support
|
||||
, solid
|
||||
|
|
@ -46,7 +46,7 @@ mkDerivation rec {
|
|||
exempi
|
||||
extra-cmake-modules
|
||||
karchive
|
||||
kdeApplications.libkcddb
|
||||
libkcddb
|
||||
kdelibs4support
|
||||
kfilemetadata
|
||||
khtml
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, flashplayer, hal-flash
|
||||
, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd
|
||||
, gnome3/*.gnome-shell*/
|
||||
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
|
||||
, browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow
|
||||
, tridactyl-native
|
||||
, fx_cast_bridge
|
||||
, udev
|
||||
|
|
@ -65,7 +65,7 @@ let
|
|||
++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
|
||||
++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
|
||||
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
|
||||
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
|
||||
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5.plasma-browser-integration
|
||||
++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
|
||||
++ extraNativeMessagingHosts
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,12 @@
|
|||
{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, gtk3
|
||||
, plasma-framework
|
||||
, kwindowsystem
|
||||
, hicolor-icon-theme
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "maia-icon-theme";
|
||||
|
|
@ -17,8 +25,8 @@ stdenv.mkDerivation {
|
|||
cmake
|
||||
extra-cmake-modules
|
||||
gtk3
|
||||
kdeFrameworks.plasma-framework
|
||||
kdeFrameworks.kwindowsystem
|
||||
plasma-framework
|
||||
kwindowsystem
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ let
|
|||
|
||||
### OPTIONAL
|
||||
qterminal = callPackage ./qterminal {};
|
||||
compton-conf = pkgs.qt5.callPackage ./compton-conf {};
|
||||
compton-conf = qt5.callPackage ./compton-conf {};
|
||||
obconf-qt = callPackage ./obconf-qt {};
|
||||
lximage-qt = callPackage ./lximage-qt {};
|
||||
qps = callPackage ./qps {};
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ let
|
|||
};
|
||||
|
||||
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
|
||||
qtbase = libsForQt5.callPackage ({ qtbase }: qtbase) {};
|
||||
|
||||
packages = self: with self;
|
||||
let
|
||||
|
|
@ -83,7 +82,6 @@ let
|
|||
setupHook = args.setupHook or defaultSetupHook;
|
||||
|
||||
meta = {
|
||||
broken = lib.versionAtLeast qtbase.version "5.15";
|
||||
license = with lib.licenses; [
|
||||
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, alsaLib, cmake, docbook_xsl, docbook_xml_dtd_45, doxygen
|
||||
, fluidsynth, pkgconfig, qt5
|
||||
, fluidsynth, pkgconfig, qtbase, qtsvg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ];
|
||||
buildInputs = [
|
||||
alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg
|
||||
alsaLib doxygen fluidsynth qtbase qtsvg
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,18 @@
|
|||
{
|
||||
mkDerivation, fetchurl, lib,
|
||||
mkDerivation, fetchFromGitLab, lib,
|
||||
extra-cmake-modules, qttools,
|
||||
qtbase, qtsvg,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "kdiagram-2.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz";
|
||||
sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02";
|
||||
mkDerivation rec {
|
||||
pname = "kdiagram";
|
||||
version = "2.7.0";
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "graphics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc=";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules qttools ];
|
||||
propagatedBuildInputs = [ qtbase qtsvg ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchurl, extra-cmake-modules
|
||||
, qtbase, kdeFrameworks
|
||||
, qtbase, kio
|
||||
, libatasmart, parted
|
||||
, utillinux }:
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
libatasmart
|
||||
parted # we only need the library
|
||||
|
||||
kdeFrameworks.kio
|
||||
kio
|
||||
|
||||
utillinux # needs blkid (note that this is not provided by utillinux-compat)
|
||||
];
|
||||
|
|
|
|||
32
pkgs/os-specific/linux/cshatag/default.nix
Normal file
32
pkgs/os-specific/linux/cshatag/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "cshatag";
|
||||
version = "2019-12-03";
|
||||
|
||||
goPackagePath = "github.com/rfjakob/cshatag";
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfjakob";
|
||||
repo = pname;
|
||||
rev = "b169f0a9dd35a7381774eb176d4badf64d403560";
|
||||
sha256 = "16kam3w75avh8khkk6jfdnxwggz2pw6ccv6v7d064j0fbb9y8x0v";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "GITVERSION=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
# Install man page
|
||||
cd go/src/${goPackagePath}
|
||||
make install $makeFlags
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to detect silent data corruption";
|
||||
homepage = "https://github.com/rfjakob/cshatag";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
21
pkgs/os-specific/linux/cshatag/deps.nix
generated
Normal file
21
pkgs/os-specific/linux/cshatag/deps.nix
generated
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/pkg/xattr";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/xattr";
|
||||
rev = "d304131d5e58ca76d8b31ceefbb0c85c7b2d2a36";
|
||||
sha256 = "0bxskiai283zfra13z5f7q7f77zz2cgswaj6l6jr2nwnc3l5m80i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "201ba4db2418b54b698efb4d8082dcb504617cdb";
|
||||
sha256 = "1cqaiwp19kl38g4d6brfhi32822rhnh2q8x1j0i6yg7a8dzfvbz6";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -752,4 +752,60 @@ mapAliases ({
|
|||
|
||||
ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";
|
||||
|
||||
/* If these are in the scope of all-packages.nix, they cause collisions
|
||||
between mixed versions of qt. See:
|
||||
https://github.com/NixOS/nixpkgs/pull/101369 */
|
||||
|
||||
inherit (kdeFrameworks) breeze-icons oxygen-icons5;
|
||||
inherit (kdeApplications)
|
||||
akonadi akregator ark
|
||||
bomber bovo
|
||||
dolphin dragon
|
||||
elisa
|
||||
ffmpegthumbs filelight
|
||||
granatier gwenview
|
||||
k3b
|
||||
kaddressbook kalzium kapptemplate kapman kate katomic
|
||||
kblackbox kblocks kbounce
|
||||
kcachegrind kcalc kcharselect kcolorchooser
|
||||
kdenlive kdf kdialog kdiamond
|
||||
keditbookmarks
|
||||
kfind kfloppy
|
||||
kget kgpg
|
||||
khelpcenter
|
||||
kig kigo killbots kitinerary
|
||||
kleopatra klettres klines
|
||||
kmag kmail kmines kmix kmplot
|
||||
knavalbattle knetwalk knights
|
||||
kollision kolourpaint kompare konsole kontact korganizer
|
||||
kpkpass
|
||||
krdc kreversi krfb
|
||||
kshisen ksquares ksystemlog
|
||||
kteatime ktimer ktouch kturtle
|
||||
kwalletmanager kwave
|
||||
marble minuet
|
||||
okular
|
||||
picmi
|
||||
spectacle
|
||||
yakuake
|
||||
;
|
||||
inherit (plasma5)
|
||||
bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover
|
||||
kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
|
||||
kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
|
||||
kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
|
||||
plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
|
||||
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
|
||||
systemsettings user-manager xdg-desktop-portal-kde
|
||||
;
|
||||
inherit (plasma5.thirdParty)
|
||||
plasma-applet-caffeine-plus
|
||||
kwin-dynamic-workspaces
|
||||
kwin-tiling
|
||||
krohnkite
|
||||
;
|
||||
inherit (libsForQt5)
|
||||
sddm
|
||||
;
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6218,8 +6218,6 @@ in
|
|||
|
||||
packagekit = callPackage ../tools/package-management/packagekit { };
|
||||
|
||||
packagekit-qt = libsForQt5.callPackage ../tools/package-management/packagekit/qt.nix { };
|
||||
|
||||
packetdrill = callPackage ../tools/networking/packetdrill { };
|
||||
|
||||
pacman = callPackage ../tools/package-management/pacman { };
|
||||
|
|
@ -8751,8 +8749,6 @@ in
|
|||
|
||||
dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;};
|
||||
|
||||
drumstick = callPackage ../development/libraries/drumstick { };
|
||||
|
||||
ecl = callPackage ../development/compilers/ecl { };
|
||||
ecl_16_1_2 = callPackage ../development/compilers/ecl/16.1.2.nix { };
|
||||
|
||||
|
|
@ -13330,7 +13326,7 @@ in
|
|||
let
|
||||
mkFrameworks = import ../development/libraries/kde-frameworks;
|
||||
attrs = {
|
||||
libsForQt5 = libsForQt514;
|
||||
inherit libsForQt5;
|
||||
inherit lib fetchurl;
|
||||
};
|
||||
in
|
||||
|
|
@ -13345,8 +13341,6 @@ in
|
|||
automake = automake111x;
|
||||
};
|
||||
|
||||
kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { };
|
||||
|
||||
krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
|
||||
inherit (buildPackages.darwin) bootstrap_cmds;
|
||||
};
|
||||
|
|
@ -15142,8 +15136,6 @@ in
|
|||
inherit llvmPackages_5;
|
||||
});
|
||||
|
||||
libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
|
||||
|
||||
qt514 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.14) {
|
||||
inherit newScope;
|
||||
|
|
@ -15174,6 +15166,8 @@ in
|
|||
inherit llvmPackages_5;
|
||||
});
|
||||
|
||||
libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
|
||||
|
||||
libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5);
|
||||
|
||||
libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5);
|
||||
|
|
@ -15200,17 +15194,41 @@ in
|
|||
kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
|
||||
networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet
|
||||
syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose
|
||||
kcontacts kquickcharts kdoctools kapidox;
|
||||
kcontacts kquickcharts kdoctools kapidox kdesu kinit kded frameworkintegration
|
||||
kdewebkit breeze-icons
|
||||
;
|
||||
|
||||
### KDE PLASMA 5
|
||||
|
||||
inherit (plasma5.override { libsForQt5 = self; })
|
||||
kdecoration khotkeys libkscreen libksysguard;
|
||||
kdecoration khotkeys libkscreen libksysguard bluedevil
|
||||
breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover kactivitymanagerd
|
||||
kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit
|
||||
kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration
|
||||
kwin kwrited milou oxygen plasma-browser-integration plasma-desktop
|
||||
plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
|
||||
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
|
||||
systemsettings user-manager xdg-desktop-portal-kde
|
||||
;
|
||||
|
||||
inherit ((plasma5.override { libsForQt5 = self; }).thirdParty)
|
||||
plasma-applet-caffeine-plus kwin-dynamic-workspaces kwin-tiling krohnkite
|
||||
;
|
||||
|
||||
### KDE APPLICATIONS
|
||||
|
||||
inherit (kdeApplications.override { libsForQt5 = self; })
|
||||
libkdcraw libkexiv2 libkipi libkomparediff2 libksane;
|
||||
libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts
|
||||
akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface
|
||||
kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight
|
||||
granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic
|
||||
kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser
|
||||
kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter
|
||||
kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot
|
||||
knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer
|
||||
kpkpass krdc kreversi krfb kshisen ksquares ksystemlog kteatime ktimer ktouch kturtle
|
||||
kwalletmanager kwave marble minuet okular picmi spectacle yakuake
|
||||
;
|
||||
|
||||
### LIBRARIES
|
||||
|
||||
|
|
@ -15222,6 +15240,8 @@ in
|
|||
|
||||
dxflib = callPackage ../development/libraries/dxflib {};
|
||||
|
||||
drumstick = callPackage ../development/libraries/drumstick { };
|
||||
|
||||
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
|
||||
|
||||
qgpgme = callPackage ../development/libraries/gpgme { };
|
||||
|
|
@ -15234,6 +15254,8 @@ in
|
|||
|
||||
kdsoap = callPackage ../development/libraries/kdsoap { };
|
||||
|
||||
kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
|
||||
|
||||
kproperty = callPackage ../development/libraries/kproperty { };
|
||||
|
||||
kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };
|
||||
|
|
@ -15254,6 +15276,8 @@ in
|
|||
|
||||
libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };
|
||||
|
||||
packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };
|
||||
|
||||
libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
|
||||
|
||||
libqglviewer = callPackage ../development/libraries/libqglviewer {
|
||||
|
|
@ -15324,6 +15348,9 @@ in
|
|||
|
||||
qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
|
||||
|
||||
# Not a library, but we do want it to be built for every qt version there
|
||||
# is, to allow users to choose the right build if needed.
|
||||
sddm = callPackage ../applications/display-managers/sddm { };
|
||||
};
|
||||
|
||||
qtEnv = qt5.env;
|
||||
|
|
@ -17606,6 +17633,8 @@ in
|
|||
|
||||
crda = callPackage ../os-specific/linux/crda { };
|
||||
|
||||
cshatag = callPackage ../os-specific/linux/cshatag { };
|
||||
|
||||
# Darwin package set
|
||||
#
|
||||
# Even though this is a set of packages not single package, use `callPackage`
|
||||
|
|
@ -18987,8 +19016,6 @@ in
|
|||
|
||||
brise = callPackage ../data/misc/brise { };
|
||||
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
|
||||
cacert = callPackage ../data/misc/cacert { };
|
||||
|
||||
caladea = callPackage ../data/fonts/caladea {};
|
||||
|
|
@ -19154,7 +19181,9 @@ in
|
|||
|
||||
fira-mono = callPackage ../data/fonts/fira-mono { };
|
||||
|
||||
flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { };
|
||||
flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
};
|
||||
|
||||
font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4;
|
||||
font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5;
|
||||
|
|
@ -19313,9 +19342,11 @@ in
|
|||
|
||||
luculent = callPackage ../data/fonts/luculent { };
|
||||
|
||||
luna-icons = callPackage ../data/icons/luna-icons { };
|
||||
luna-icons = callPackage ../data/icons/luna-icons {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
};
|
||||
|
||||
maia-icon-theme = callPackage ../data/icons/maia-icon-theme { };
|
||||
maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { };
|
||||
|
||||
mailcap = callPackage ../data/misc/mailcap { };
|
||||
|
||||
|
|
@ -19434,15 +19465,17 @@ in
|
|||
|
||||
oxygenfonts = callPackage ../data/fonts/oxygenfonts { };
|
||||
|
||||
inherit (kdeFrameworks) oxygen-icons5;
|
||||
|
||||
paper-gtk-theme = callPackage ../data/themes/paper-gtk { };
|
||||
|
||||
paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
|
||||
|
||||
papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { };
|
||||
papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
};
|
||||
|
||||
papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { };
|
||||
papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
};
|
||||
|
||||
papis = with python3Packages; toPythonApplication papis;
|
||||
|
||||
|
|
@ -19472,7 +19505,9 @@ in
|
|||
|
||||
pop-gtk-theme = callPackage ../data/themes/pop-gtk { };
|
||||
|
||||
pop-icon-theme = callPackage ../data/icons/pop-icon-theme { };
|
||||
pop-icon-theme = callPackage ../data/icons/pop-icon-theme {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
};
|
||||
|
||||
posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
|
||||
|
||||
|
|
@ -19752,7 +19787,9 @@ in
|
|||
|
||||
yaru-theme = callPackage ../data/themes/yaru {};
|
||||
|
||||
zafiro-icons = callPackage ../data/icons/zafiro-icons { };
|
||||
zafiro-icons = callPackage ../data/icons/zafiro-icons {
|
||||
inherit (kdeFrameworks) breeze-icons;
|
||||
};
|
||||
|
||||
zeal = libsForQt514.callPackage ../data/documentation/zeal { };
|
||||
|
||||
|
|
@ -20133,9 +20170,12 @@ in
|
|||
calibre = calibre-py3;
|
||||
|
||||
calligra = libsForQt514.callPackage ../applications/office/calligra {
|
||||
inherit (kdeApplications) akonadi-calendar akonadi-contacts;
|
||||
openjpeg = openjpeg_1;
|
||||
poppler = poppler_0_61;
|
||||
poppler = poppler_0_61.override {
|
||||
qt5Support = true;
|
||||
# Must be using the same qt version as calligra itself.
|
||||
qtbase = qt514.qtbase;
|
||||
};
|
||||
};
|
||||
|
||||
perkeep = callPackage ../applications/misc/perkeep { };
|
||||
|
|
@ -21711,51 +21751,17 @@ in
|
|||
let
|
||||
mkApplications = import ../applications/kde;
|
||||
attrs = {
|
||||
libsForQt5 = libsForQt514;
|
||||
inherit libsForQt5;
|
||||
inherit lib fetchurl;
|
||||
inherit okteta;
|
||||
};
|
||||
in
|
||||
recurseIntoAttrs (makeOverridable mkApplications attrs);
|
||||
|
||||
inherit (kdeApplications)
|
||||
akonadi akregator ark
|
||||
bomber bovo
|
||||
dolphin dragon
|
||||
elisa
|
||||
ffmpegthumbs filelight
|
||||
granatier gwenview
|
||||
k3b
|
||||
kaddressbook kalzium kapptemplate kapman kate katomic
|
||||
kblackbox kblocks kbounce
|
||||
kcachegrind kcalc kcharselect kcolorchooser
|
||||
kdeconnect-kde kdenlive kdf kdialog kdiamond
|
||||
keditbookmarks
|
||||
kfind kfloppy
|
||||
kget kgpg
|
||||
khelpcenter
|
||||
kig kigo killbots kitinerary
|
||||
kleopatra klettres klines
|
||||
kmag kmail kmines kmix kmplot
|
||||
knavalbattle knetwalk knights
|
||||
kollision kolourpaint kompare konsole kontact korganizer
|
||||
kpkpass
|
||||
krdc kreversi krfb
|
||||
kshisen ksquares ksystemlog
|
||||
kteatime ktimer ktouch kturtle
|
||||
kwalletmanager kwave
|
||||
marble minuet
|
||||
okular
|
||||
picmi
|
||||
spectacle
|
||||
yakuake;
|
||||
|
||||
okteta = libsForQt5.callPackage ../applications/editors/okteta { };
|
||||
|
||||
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
|
||||
|
||||
inherit (kdeFrameworks) kdesu;
|
||||
|
||||
kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
|
||||
|
||||
kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
|
||||
|
|
@ -21793,7 +21799,7 @@ in
|
|||
|
||||
kid3 = libsForQt5.callPackage ../applications/audio/kid3 { };
|
||||
|
||||
kile = libsForQt514.callPackage ../applications/editors/kile { };
|
||||
kile = libsForQt5.callPackage ../applications/editors/kile { };
|
||||
|
||||
kino = callPackage ../applications/video/kino {
|
||||
inherit (gnome2) libglade;
|
||||
|
|
@ -21808,10 +21814,7 @@ in
|
|||
|
||||
kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
|
||||
|
||||
kmymoney = libsForQt5.callPackage ../applications/office/kmymoney {
|
||||
inherit (kdeApplications) kidentitymanagement;
|
||||
inherit (kdeFrameworks) kdewebkit;
|
||||
};
|
||||
kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
|
||||
|
||||
kodestudio = callPackage ../applications/editors/kodestudio { };
|
||||
|
||||
|
|
@ -23506,8 +23509,6 @@ in
|
|||
|
||||
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
|
||||
|
||||
sddm = libsForQt514.callPackage ../applications/display-managers/sddm { };
|
||||
|
||||
skrooge = libsForQt514.callPackage ../applications/office/skrooge {};
|
||||
|
||||
smartgithg = callPackage ../applications/version-management/smartgithg {
|
||||
|
|
@ -23888,9 +23889,7 @@ in
|
|||
|
||||
tribler = callPackage ../applications/networking/p2p/tribler { };
|
||||
|
||||
trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita {
|
||||
inherit (kdeApplications) akonadi-contacts;
|
||||
};
|
||||
trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { };
|
||||
|
||||
tudu = callPackage ../applications/office/tudu { };
|
||||
|
||||
|
|
@ -24707,8 +24706,6 @@ in
|
|||
zam-plugins = callPackage ../applications/audio/zam-plugins { };
|
||||
|
||||
zanshin = libsForQt514.callPackage ../applications/office/zanshin {
|
||||
inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap;
|
||||
inherit (kdeFrameworks) krunner kwallet kcalendarcore;
|
||||
boost = boost160;
|
||||
};
|
||||
|
||||
|
|
@ -25050,9 +25047,6 @@ in
|
|||
dhewm3 = callPackage ../games/dhewm3 {};
|
||||
|
||||
digikam = libsForQt514.callPackage ../applications/graphics/digikam {
|
||||
inherit (plasma5) oxygen;
|
||||
inherit (kdeApplications) akonadi-contacts;
|
||||
inherit (kdeFrameworks) kcalendarcore;
|
||||
opencv3 = opencv3WithoutCuda;
|
||||
};
|
||||
|
||||
|
|
@ -25928,6 +25922,8 @@ in
|
|||
lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
|
||||
|
||||
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
|
||||
# TODO: Update these to qt515 at some point. When doing it, please remove
|
||||
# the choice of libsForQt5*.sddm in sddm's module.
|
||||
qt5 = qt514;
|
||||
libsForQt5 = libsForQt514;
|
||||
inherit pkgs;
|
||||
|
|
@ -25966,7 +25962,7 @@ in
|
|||
let
|
||||
mkPlasma5 = import ../desktops/plasma-5;
|
||||
attrs = {
|
||||
libsForQt5 = libsForQt514;
|
||||
inherit libsForQt5;
|
||||
inherit lib fetchurl;
|
||||
gconf = gnome2.GConf;
|
||||
inherit gsettings-desktop-schemas;
|
||||
|
|
@ -25974,25 +25970,6 @@ in
|
|||
in
|
||||
recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
|
||||
|
||||
inherit (kdeFrameworks) kded kinit frameworkintegration;
|
||||
|
||||
inherit (plasma5)
|
||||
bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover
|
||||
kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
|
||||
kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
|
||||
kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
|
||||
plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
|
||||
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
|
||||
systemsettings user-manager xdg-desktop-portal-kde;
|
||||
|
||||
inherit (plasma5.thirdParty)
|
||||
plasma-applet-caffeine-plus
|
||||
kwin-dynamic-workspaces
|
||||
kwin-tiling
|
||||
krohnkite;
|
||||
|
||||
### SCIENCE
|
||||
|
||||
### SCIENCE/CHEMISTY
|
||||
|
||||
avogadro = callPackage ../applications/science/chemistry/avogadro {
|
||||
|
|
|
|||
Loading…
Reference in a new issue