1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
nixpkgs/pkgs/desktops
Vladimír Čunát 9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
..
cinnamon desktops/cinnamon/*.nix: mark as broken per https://github.com/NixOS/nixpkgs/issues/2384 2014-04-28 23:20:37 +02:00
e17 e17.terminology: 0.4.0 -> 0.5.1 2014-06-15 09:26:01 +04:00
e18 e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
enlightenment
gnome-2 vte: store patch in repo, source offline 2014-06-30 16:10:50 +02:00
gnome-3 gtksourceview 3.12: hard code data dirs to nix store path 2014-07-13 16:32:41 +02:00
kde-4.12 ark: wrap for zipinfo 2014-05-25 15:25:34 -05:00
kde-4.13 kde: Make kde4_next desktop compile 2014-06-22 19:35:31 +02:00
xfce Merge recent master into x-updates 2014-07-17 19:30:56 +02:00