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
..
applications	i3: Don't override patchPhase.	2014-08-02 17:25:16 +02:00
build-support
data	source-han-sans: fixed package name	2014-07-30 16:27:20 +02:00
desktops	Revert "gnome-shell: enable parallel building"	2014-08-03 09:56:16 +02:00
development	qtcreator: install desktop file	2014-08-02 21:11:36 +02:00
games	scummvm: version bump to 1.7	2014-07-30 20:26:29 +02:00
misc	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
os-specific	kernel: 3.15.7 -> 3.15.8	2014-08-02 18:04:08 -05:00
servers	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
shells	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
stdenv
test
tools	Merge pull request #3422 from jbedo/master	2014-08-02 18:55:05 -04:00
top-level	Add tornadokick python package	2014-08-01 15:14:38 -04:00