3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/desktops
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
deepin
enlightenment Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
gnome-2 Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
gnome-3 Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
gnustep treewide: name -> pname 2019-08-17 10:54:38 +00:00
lumina
lxde/core
lxqt Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
mate
maxx
pantheon
plasma-5 kde: add myself as maintainer 2019-08-16 15:28:31 +02:00
rox/rox-filer
surf-display
xfce
xfce4-14 xfce4-14: drop null fallbacks 2019-08-17 18:55:24 -04:00