Jan Tojnar 8f50f1ce10 Merge branch 'staging-next' into staging ... Resolved the following conflicts: - kernel flags between 09176d28a0 and 2b28822d8d - clojure-lsp between 3fa00685ce and e03c068af5		2021-02-19 17:15:31 +01:00
..
cdesktopenv	treewide: with stdenv.lib; in meta -> with lib;	2021-01-11 10:38:22 +01:00
cinnamon	cinnamon-screensaver: remove unused input	2021-02-18 16:58:12 +01:00
enlightenment	enlightenment.evisum: 0.5.10 -> 0.5.11	2021-02-12 06:16:53 +00:00
gnome-2	pkgs/desktops: pkgconfig -> pkg-config	2021-01-16 23:49:59 -08:00
gnome-3	gnome3.gnome-applets: remove unused input	2021-02-18 16:58:34 +01:00
gnustep	treewide: editorconfig fixes	2021-01-20 09:11:11 +10:00
lumina	treewide: remove stdenv where not needed	2021-01-25 18:31:47 +01:00
lxde/core	lxde: cosmetical changes	2021-02-08 09:54:36 -03:00
lxqt	lxqt: cosmetical changes	2021-02-08 11:41:52 -03:00
mate	treewide: remove stdenv where not needed	2021-01-25 18:31:47 +01:00
pantheon	pantheon.elementary-session-settings: remove unused input	2021-02-18 16:58:38 +01:00
plasma-5	kinfocenter: fix symlink to systemsettings5	2021-02-17 09:06:14 +08:00
rox/rox-filer	pkgs/desktops: pkgconfig -> pkg-config	2021-01-16 23:49:59 -08:00
surf-display	treewide: stdenv.lib -> lib	2021-01-16 17:58:11 +07:00
xfce	treewide: makeWrapper buildInputs to nativeBuildInputs	2021-02-19 20:09:16 +07:00