Arseniy Seroka adedca45d5 Merge pull request #8994 from AndersonTorres/icewm ... IceWM: 1.3.8 -> 1.3.10		2015-07-26 20:04:54 +03:00
..
config	Merge branch 'master.upstream' into staging.upstream	2015-07-05 13:06:02 -07:00
hardware	types.uniq types.str -> types.str	2015-06-15 18:12:32 +02:00
installer	Installer: Add nomodeset and blacklist the nouveau driver	2015-07-25 19:06:07 +02:00
misc	riak: new nixos service	2015-07-21 09:25:41 -04:00
profiles	Replaces https://github.com/NixOS/nixpkgs/pull/8368	2015-06-17 19:26:17 +02:00
programs	Merge branch 'master.upstream' into staging.upstream	2015-06-17 11:57:40 -07:00
security	Merge branch 'master.upstream' into staging.upstream	2015-07-05 13:06:02 -07:00
services	Merge pull request #8994 from AndersonTorres/icewm	2015-07-26 20:04:54 +03:00
system	Fix capitalisation	2015-07-25 19:06:07 +02:00
tasks	Don't include wireless tools in containers	2015-07-22 12:51:21 +02:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	Use ConditionVirtualization to disable some services in containers	2015-07-22 12:23:40 +02:00
module-list.nix	Merge pull request #8799 from ryantm/master	2015-07-24 10:11:26 +02:00
rename.nix	Merge pull request #6702 from joachifm/dnscrypt-proxy	2015-07-12 00:17:46 -07:00