nixpkgs

Files

William A. Kennington III 36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub""

This reverts commit 94205f5f21.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl

2014-09-02 09:16:13 -07:00

doc/manual

Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""

2014-08-31 09:46:16 -07:00

gui

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

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

lib

Merge pull request #3779 from offlinehacker/docker

2014-09-02 01:04:05 +04:00

maintainers

Replace depricated gcutil with gcloude compute in gce/create-gce.sh

2014-08-28 21:42:49 +00:00

modules

Revert "Revert "Merge pull request #2449 from wkennington/master.grub""

2014-09-02 09:16:13 -07:00

tests

Revert "Revert "Merge pull request #2449 from wkennington/master.grub""

2014-09-02 09:16:13 -07: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

Revert "Revert "Merge pull request #2449 from wkennington/master.grub""

2014-09-02 09:16:13 -07:00

release.nix

Revert "Revert "Merge pull request #2449 from wkennington/master.grub""

2014-09-02 09:16:13 -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.