Remove kde5PackagesFun
This commit is contained in:
Thomas Tuegel
parent
3313353899
commit
de27f97e2d
@ -664,6 +664,12 @@ in
|
||||
|
||||
caddy = callPackage ../servers/caddy { };
|
||||
|
||||
calamares = qt5.callPackage ../tools/misc/calamares rec {
|
||||
python = python3;
|
||||
boost = pkgs.boost.override { python=python3; };
|
||||
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
|
||||
};
|
||||
|
||||
capstone = callPackage ../development/libraries/capstone { };
|
||||
|
||||
catch = callPackage ../development/libraries/catch { };
|
||||
@ -698,6 +704,8 @@ in
|
||||
|
||||
clib = callPackage ../tools/package-management/clib { };
|
||||
|
||||
colord-kde = qt5.callPackage ../tools/misc/colord-kde/0.5.nix {};
|
||||
|
||||
consul = callPackage ../servers/consul { };
|
||||
|
||||
consul-ui = callPackage ../servers/consul/ui.nix { };
|
||||
@ -2217,6 +2225,8 @@ in
|
||||
|
||||
kpcli = callPackage ../tools/security/kpcli { };
|
||||
|
||||
kronometer = qt5.callPackage ../tools/misc/kronometer { };
|
||||
|
||||
kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
|
||||
|
||||
leocad = callPackage ../applications/graphics/leocad { };
|
||||
@ -6419,6 +6429,8 @@ in
|
||||
inherit (xorg) libX11 libXext libXi libXtst;
|
||||
};
|
||||
|
||||
github-release = callPackage ../development/tools/github/github-release { };
|
||||
|
||||
global = callPackage ../development/tools/misc/global { };
|
||||
|
||||
gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {};
|
||||
@ -6588,6 +6600,8 @@ in
|
||||
|
||||
oprofile = callPackage ../development/tools/profiling/oprofile { };
|
||||
|
||||
pahole = callPackage ../development/tools/misc/pahole {};
|
||||
|
||||
parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
|
||||
|
||||
patchelf = callPackage ../development/tools/misc/patchelf { };
|
||||
@ -12242,9 +12256,6 @@ in
|
||||
alpine = callPackage ../applications/networking/mailreaders/alpine {
|
||||
tcl = tcl-8_5;
|
||||
};
|
||||
realpine = callPackage ../applications/networking/mailreaders/realpine {
|
||||
tcl = tcl-8_5;
|
||||
};
|
||||
|
||||
AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
|
||||
|
||||
@ -12636,6 +12647,8 @@ in
|
||||
|
||||
dfasma = qt5.callPackage ../applications/audio/dfasma { };
|
||||
|
||||
dfilemanager = qt5.callPackage ../applications/misc/dfilemanager { };
|
||||
|
||||
dia = callPackage ../applications/graphics/dia {
|
||||
inherit (pkgs.gnome) libart_lgpl libgnomeui;
|
||||
};
|
||||
@ -13215,6 +13228,16 @@ in
|
||||
|
||||
gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {});
|
||||
|
||||
girara = callPackage ../applications/misc/girara {
|
||||
gtk = gtk3;
|
||||
};
|
||||
|
||||
girara-light = callPackage ../applications/misc/girara {
|
||||
gtk = gtk3;
|
||||
withBuildColors = false;
|
||||
ncurses = null;
|
||||
};
|
||||
|
||||
gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});
|
||||
|
||||
inherit (self.gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt;
|
||||
@ -13604,6 +13627,10 @@ in
|
||||
boost = boost155;
|
||||
};
|
||||
|
||||
k9copy = qt5.callPackage ../applications/video/k9copy {};
|
||||
|
||||
kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { };
|
||||
|
||||
keepnote = callPackage ../applications/office/keepnote {
|
||||
pygtk = pyGtkGlade;
|
||||
};
|
||||
@ -13624,6 +13651,8 @@ in
|
||||
qt = qt4;
|
||||
};
|
||||
|
||||
kile = qt5.callPackage ../applications/editors/kile/frameworks.nix { };
|
||||
|
||||
kino = callPackage ../applications/video/kino {
|
||||
inherit (gnome) libglade;
|
||||
ffmpeg = ffmpeg_2;
|
||||
@ -13633,6 +13662,13 @@ in
|
||||
|
||||
koji = callPackage ../tools/package-management/koji { };
|
||||
|
||||
konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { };
|
||||
|
||||
krita = qt5.callPackage ../applications/graphics/krita {
|
||||
vc = vc_0_7;
|
||||
openjpeg = openjpeg_1;
|
||||
};
|
||||
|
||||
ksuperkey = callPackage ../tools/X11/ksuperkey { };
|
||||
|
||||
kubernetes = callPackage ../applications/networking/cluster/kubernetes {
|
||||
@ -14366,6 +14402,10 @@ in
|
||||
inherit (darwin.stubs) rez setfile;
|
||||
};
|
||||
|
||||
qgis = callPackage ../applications/gis/qgis {};
|
||||
|
||||
qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };
|
||||
|
||||
qjackctl = callPackage ../applications/audio/qjackctl { };
|
||||
|
||||
qmidinet = callPackage ../applications/audio/qmidinet { };
|
||||
@ -14386,6 +14426,8 @@ in
|
||||
|
||||
qsynth = callPackage ../applications/audio/qsynth { };
|
||||
|
||||
qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
|
||||
|
||||
qtox = qt5.callPackage ../applications/networking/instant-messengers/qtox { };
|
||||
|
||||
qtpass = qt5.callPackage ../applications/misc/qtpass { };
|
||||
@ -14396,6 +14438,28 @@ in
|
||||
|
||||
qtscrobbler = callPackage ../applications/audio/qtscrobbler { };
|
||||
|
||||
quassel = qt5.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";
|
||||
};
|
||||
|
||||
quasselDaemon = quassel.override {
|
||||
monolithic = false;
|
||||
daemon = true;
|
||||
tag = "-daemon-qt5";
|
||||
withKDE = false;
|
||||
};
|
||||
|
||||
quirc = callPackage ../tools/graphics/quirc {};
|
||||
|
||||
quodlibet = callPackage ../applications/audio/quodlibet {
|
||||
@ -14444,6 +14508,10 @@ in
|
||||
|
||||
rdup = callPackage ../tools/backup/rdup { };
|
||||
|
||||
realpine = callPackage ../applications/networking/mailreaders/realpine {
|
||||
tcl = tcl-8_5;
|
||||
};
|
||||
|
||||
recode = callPackage ../tools/text/recode { };
|
||||
|
||||
remotebox = callPackage ../applications/virtualization/remotebox { };
|
||||
@ -14649,7 +14717,9 @@ in
|
||||
|
||||
printrun = callPackage ../applications/misc/printrun { };
|
||||
|
||||
sddm = kde5.sddm;
|
||||
sddm = qt5.callPackage ../applications/display-managers/sddm {
|
||||
themes = []; # extra themes, etc.
|
||||
};
|
||||
|
||||
slim = callPackage ../applications/display-managers/slim {
|
||||
libpng = libpng12;
|
||||
@ -14909,7 +14979,8 @@ in
|
||||
|
||||
tribler = callPackage ../applications/networking/p2p/tribler { };
|
||||
|
||||
github-release = callPackage ../development/tools/github/github-release { };
|
||||
# We need QtWebkit which was deprecated in Qt 5.6 although it can still be build
|
||||
trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { };
|
||||
|
||||
tudu = callPackage ../applications/office/tudu { };
|
||||
|
||||
@ -15407,30 +15478,24 @@ in
|
||||
|
||||
yabar = callPackage ../applications/window-managers/yabar { };
|
||||
|
||||
yate = callPackage ../applications/misc/yate { };
|
||||
|
||||
inherit (gnome3) yelp;
|
||||
|
||||
inherit (python3Packages) you-get;
|
||||
|
||||
inherit (pythonPackages) youtube-dl;
|
||||
|
||||
qgis = callPackage ../applications/gis/qgis {};
|
||||
|
||||
qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };
|
||||
|
||||
qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
|
||||
|
||||
pahole = callPackage ../development/tools/misc/pahole {};
|
||||
yakuake = qt5.callPackage ../applications/misc/yakuake/3.0.nix {};
|
||||
|
||||
yarp = callPackage ../applications/science/robotics/yarp {};
|
||||
|
||||
yate = callPackage ../applications/misc/yate { };
|
||||
|
||||
yed = callPackage ../applications/graphics/yed {};
|
||||
|
||||
inherit (gnome3) yelp;
|
||||
|
||||
ykpers = callPackage ../applications/misc/ykpers {};
|
||||
|
||||
yoshimi = callPackage ../applications/audio/yoshimi { };
|
||||
|
||||
inherit (python3Packages) you-get;
|
||||
|
||||
inherit (pythonPackages) youtube-dl;
|
||||
|
||||
zam-plugins = callPackage ../applications/audio/zam-plugins { };
|
||||
|
||||
zathuraCollection = recurseIntoAttrs
|
||||
@ -15447,16 +15512,6 @@ in
|
||||
|
||||
zexy = callPackage ../applications/audio/pd-plugins/zexy { };
|
||||
|
||||
girara = callPackage ../applications/misc/girara {
|
||||
gtk = gtk3;
|
||||
};
|
||||
|
||||
girara-light = callPackage ../applications/misc/girara {
|
||||
gtk = gtk3;
|
||||
withBuildColors = false;
|
||||
ncurses = null;
|
||||
};
|
||||
|
||||
zgrviewer = callPackage ../applications/graphics/zgrviewer {};
|
||||
|
||||
zgv = callPackage ../applications/graphics/zgv {
|
||||
@ -16341,76 +16396,6 @@ in
|
||||
|
||||
numix-gtk-theme = callPackage ../misc/themes/numix { };
|
||||
|
||||
# We need QtWebkit which was deprecated in Qt 5.6 although it can still be build
|
||||
trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { };
|
||||
|
||||
kde5PackagesFun = self: with self; {
|
||||
|
||||
calamares = callPackage ../tools/misc/calamares rec {
|
||||
python = python3;
|
||||
boost = pkgs.boost.override { python=python3; };
|
||||
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
|
||||
};
|
||||
|
||||
colord-kde = callPackage ../tools/misc/colord-kde/0.5.nix {};
|
||||
|
||||
dfilemanager = callPackage ../applications/misc/dfilemanager { };
|
||||
|
||||
k9copy = callPackage ../applications/video/k9copy {};
|
||||
|
||||
kdeconnect = callPackage ../applications/misc/kdeconnect { };
|
||||
|
||||
kile = callPackage ../applications/editors/kile/frameworks.nix { };
|
||||
|
||||
konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };
|
||||
|
||||
kronometer = callPackage ../tools/misc/kronometer { };
|
||||
|
||||
krita = callPackage ../applications/graphics/krita {
|
||||
vc = vc_0_7;
|
||||
openjpeg = openjpeg_1;
|
||||
};
|
||||
|
||||
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;
|
||||
};
|
||||
|
||||
sddm = callPackage ../applications/display-managers/sddm {
|
||||
themes = []; # extra themes, etc.
|
||||
};
|
||||
|
||||
yakuake = callPackage ../applications/misc/yakuake/3.0.nix {};
|
||||
|
||||
};
|
||||
|
||||
kde5 =
|
||||
let
|
||||
plasma = import ../desktops/kde-5/plasma { inherit pkgs; };
|
||||
@ -16421,8 +16406,7 @@ in
|
||||
applications = applications self; }
|
||||
// qt5.kdeFrameworks
|
||||
// plasma self
|
||||
// applications self
|
||||
// kde5PackagesFun self;
|
||||
// applications self;
|
||||
in
|
||||
recurseIntoAttrs (lib.makeScope qt5.newScope merged);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user