nixpkgs

History

Vladimír Čunát 5979d428b4 Merge recent master into x-updates

Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix

2014-07-09 22:13:29 +02:00

doc

nixos manual: fix typo (close #2997 )

2014-06-17 21:52:22 +02:00

gui

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

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

lib

support for nixos test names

2014-06-28 16:05:03 +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 x-updates

2014-07-09 22:13:29 +02:00

tests

Try fixing the nixos mumble tests, again

2014-07-02 11:28:43 +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 obsolete udisks test

2014-05-22 12:11:53 +02:00

release.nix

nixos-iso: Re-enable new kernel iso images (close #2839 )

2014-06-17 21:23:52 +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.