Shea Levy a46d2e3150 Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs ... nixos: add Murmur module (Mumble chat) Conflicts: nixos/modules/misc/ids.nix		2014-04-05 15:18:14 -04:00
..
assertions.nix	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
check-config.nix	Add lots of missing option types	2013-10-30 18:47:43 +01:00
crashdump.nix	Add lots of missing option types	2013-10-30 18:47:43 +01:00
ids.nix	Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs	2014-04-05 15:18:14 -04:00
lib.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
locate.nix	Add lots of missing option types	2013-10-30 18:47:43 +01:00
nixpkgs.nix	Mark the value for nixpkgs.system as a default	2013-11-01 00:35:48 +01:00
passthru.nix	Add lots of missing option types	2013-10-30 18:47:43 +01:00
version.nix	Don't set the default channel to 13.10 when installing from master	2013-11-11 11:26:15 +01:00