nixpkgs/nixos
Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
..
doc Merge recent master into staging 2014-08-21 15:09:31 +02:00
gui
lib Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
maintainers
modules Merge recent master into staging 2014-08-21 15:09:31 +02:00
tests Add user attribute isNormalUser 2014-08-15 02:16:04 +02:00
COPYING
default.nix
README
release-combined.nix Remove the containers test from the release-critical builds 2014-08-05 10:25:42 +02:00
release.nix Manual: Generate PDF 2014-08-09 16:33:12 +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.