nixpkgs/nixos
Vladimír Čunát 87c3c0e885 Merge master into #2129
Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
..
doc Manual: Generate PDF 2014-08-09 16:33:12 +02:00
gui
lib Merge remote-tracking branch 'origin/master' into staging. 2014-08-04 16:51:47 +02:00
maintainers
modules Merge master into #2129 2014-08-12 19:24:08 +02:00
tests tests/ipv6.nix: Fix race 2014-08-10 14:51:23 +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.