nixpkgs/nixos
Vladimír Čunát b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
..
doc/manual apache-httpd: Make 2.4 the default 2014-11-06 14:55:44 +01:00
gui Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
lib Revert "nixos: iso-image: use syslinux bootloader for USB booting support" 2014-11-08 14:33:27 +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 branch 'master' into staging 2014-11-14 14:28:23 +01:00
tests Merge branch 'master' into staging 2014-11-10 10:03:52 +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 cjdns: service tweaks, new NixOS test 2014-11-08 23:39:02 +01: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.