nixpkgs-suyu/nixos
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
..
doc/manual Merge recent master into staging 2014-08-30 10:04:02 +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-30 10:04:02 +02:00
tests Merge recent master into staging 2014-08-30 10:04:02 +02:00
COPYING
default.nix
README
release-combined.nix nixos/release-combined: Add required installer tests 2014-08-28 13:35:37 -07:00
release.nix nixos/release: Dynamically generate installer tests 2014-08-28 13:35:35 -07: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.