William A. Kennington III 7cda24c01e Merge branch 'master.upstream' into staging.upstream		2015-07-08 14:11:16 -07: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	nixos/btrfs: Fix parsing of btrfs subvolume show with btrfsprogs 4.1	2015-07-07 11:34:50 -07:00
misc	subsonic service: init	2015-07-05 17:25:42 -07: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	nixos/bitlbee: fixed protocols option	2015-07-08 19:30:20 +02:00
system	nixos/btrfs: Fix parsing of btrfs subvolume show with btrfsprogs 4.1	2015-07-07 11:34:50 -07:00
tasks	Some more type cleanup	2015-06-15 18:18:46 +02:00
testing
virtualisation	nixos docker: fix service and test	2015-07-05 13:57:23 +02:00
module-list.nix	Merge pull request #8639 from sjmackenzie/zerotierone	2015-07-08 02:15:14 +03:00
rename.nix	Remove option ec2.metadata	2015-06-30 17:25:56 +02:00