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
..
config	fontconfig: stringify dpi correctly	2015-02-01 16:18:48 -06:00
hardware	Bumblebee config to enable multiple monitors	2014-12-30 19:17:42 -08:00
installer	nixos-rebuild: Update fallback code to update Nix	2015-01-27 18:58:20 +01:00
misc	apache-kafka: New service for Apache Kafka	2015-01-29 11:10:22 +00:00
profiles	nixos/base: Add efi management utilities	2015-01-07 01:52:47 -08:00
programs	environment: set paths for Qt plugins and QML	2015-01-26 20:59:49 -06:00
security	grsecurity: Add denyUSB option to grsec NixOS module	2015-01-20 19:18:06 +01:00
services	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
system	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
tasks	nixos: Don't do filesystem checks on ZFS or NFS filesystems	2015-01-21 17:39:53 +01:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	Restrict the length of container names	2015-01-28 16:13:00 +01:00
module-list.nix	Merge pull request #6045 from ragnard/apache-kafka	2015-01-30 10:50:14 +01:00
rename.nix	nixos/rename: Fix merging multiple destinations.	2015-01-22 14:08:28 +01:00