1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
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 treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
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 lumina.lumina-pdf: init at 2019-04-27 2019-05-24 18:14:46 -03:00
lxde/core treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
lxqt Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
mate treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
maxx gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
pantheon Merge staging-next into staging 2019-08-09 14:01:00 +02:00
plasma-5 kde: add myself as maintainer 2019-08-16 15:28:31 +02:00
rox/rox-filer rox-filer: link with lib{dl,m} explicitly 2019-01-04 21:44:21 +00:00
surf-display surf-display: init at 2019-04-15 2019-08-05 17:50:02 +02:00
xfce treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
xfce4-14 xfce4-14: drop null fallbacks 2019-08-17 18:55:24 -04:00