Commit graph

8 commits

Author SHA1 Message Date
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Luca Bruno
7a4a132085 Revert "gnome-shell: enable parallel building"
This reverts commit 9ec0a105d3.

Conflicts:
	pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
2014-08-03 09:56:16 +02:00
Luca Bruno
0b82b95322 gnome-shell 3.12: fix at_spi2_core argument 2014-07-12 20:45:20 +02:00
Luca Bruno
1c1747be0d Add gnome shell extensions plugin for browsers 2014-07-05 21:16:31 +02:00
Luca Bruno
9ec0a105d3 gnome-shell: enable parallel building 2014-07-05 19:52:38 +02:00
Bjørn Forsman
76672dd9e3 accountsservice: be consistent in naming (always two 's')
The package is (correctly) named 'accountsservice' (with two 's'), but
the attribute and expression path lacked one 's'. Fix it.
2014-06-22 21:32:16 +02:00
Luca Bruno
3bf7226d8c gnome-shell: add 3.12.2 version 2014-05-20 13:41:34 +02:00
Luca Bruno
d05fa3ccfe Branch gnome 3.12 2014-05-20 13:41:33 +02:00