nixpkgs

History

Vladimír Čunát 52404a868d Merge recent master into staging

Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix

2014-11-05 15:00:44 +01:00

doc/manual

next release will be 14.11

2014-10-22 15:41:30 +02:00

gui

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

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

lib

nixos: iso-image: use syslinux bootloader for USB booting support

2014-11-02 17:35:16 +01:00

maintainers

Refactor EC2 image generation script. Now uses same procedure for both hvm and pv-grub

2014-10-27 11:48:43 +01:00

modules

Merge recent master into staging

2014-11-05 15:00:44 +01:00

tests

Merge recent master into staging

2014-11-05 15:00:44 +01: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

Ditch efi installer tests

2014-10-07 12:20:56 -04:00

release-small.nix

Add nodejs to the small channel

2014-10-27 10:40:49 +01:00

release.nix

nixos: Add VM test for blivet.

2014-10-22 08:22:58 +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.