nixpkgs/nixos
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
..
doc Make the networkmanager group more discoverable 2014-07-29 09:14:57 +02:00
gui
lib makeTest: Pass nodes attribute 2014-07-30 14:30:25 +02:00
maintainers
modules Merge recent master into x-updates 2014-08-02 05:08:07 +02:00
tests Don't require a device for tmpfs filesystems 2014-07-30 13:18:33 +02:00
COPYING
default.nix
README
release-combined.nix
release.nix nixos-iso: Re-enable new kernel iso images (close #2839) 2014-06-17 21:23:52 +02:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.