Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05:00
..
admin	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
archivers	Update ZPAQ	2015-02-01 18:41:32 +03:00
audio	beets: Update to new upstream version 1.3.10.	2015-01-22 10:33:48 +01:00
backup	fetchFromGitHub: add option for custom name	2015-01-14 17:38:47 +01:00
bluetooth
bootloaders/refind	rEFInd (version 0.8.4): New Package	2015-01-14 21:46:49 -02:00
cd-dvd
compression	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
filesystems	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
graphics	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
inputmethods
misc	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
networking	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
package-management	nixui: update to 0.1.2 (close #6005)	2015-01-27 18:19:39 +01:00
security	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
system	Update stress-ng 0.03.11 -> 0.03.13	2015-02-02 00:15:46 +01:00
text	gawk: Fix cross compiling.	2015-01-29 00:19:57 +01:00
typesetting	rename <gcc-frontend>.gcc to <gcc-frontend>.cc	2015-01-14 20:59:10 -08:00
video	swftools: 0.8.1 -> 0.9.2	2015-01-26 12:05:37 +01:00
virtualization
X11	xdg-utils: patch xdg-open to use KDE 5 tools	2015-01-26 21:01:06 -06:00