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
check-config.nix
crashdump.nix
ids.nix	Merge branch 'murmur' of git://github.com/thoughtpolice/nixpkgs	2014-04-05 15:18:14 -04:00
lib.nix
locate.nix
nixpkgs.nix
passthru.nix
version.nix	Don't set the default channel to 13.10 when installing from master	2013-11-11 11:26:15 +01:00