nixpkgs

History

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

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-21 15:09:31 +02:00

tests

Add user attribute isNormalUser

2014-08-15 02:16:04 +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

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

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.