nixpkgs

History

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

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

lib

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00

maintainers

Better support for HVM instances. Now the NixOS images can

2014-05-21 16:37:55 +02:00

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

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

default.nix

Fix nixos-option

2013-10-28 22:45:58 +01:00

README

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

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

README

*** 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.