Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ... In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix		2014-09-08 18:16:54 +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	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
e18	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
enlightenment
gnome-2	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnome-3	gobject-introspection: refer to shlibs with absolute paths in typelibs	2014-08-14 23:16:51 +02:00
kde-4.12	Fix broken license references.	2014-07-28 11:43:20 +02:00
xfce	xfce4-appfinder: update 4.9.4 -> 4.10.1	2014-07-31 16:30:04 +02:00