3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
..
doc Manual: Fix typo 2013-12-12 10:38:13 +01:00
gui Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
lib Add support for lightweight NixOS containers 2013-11-27 17:14:10 +01:00
maintainers Don't include the code name in the EBS AMI name 2013-11-19 19:09:48 +01:00
modules Merge master into x-updates 2013-12-18 23:21:29 +01:00
tests Add a regression test for hostname / nss_myhostname 2013-11-26 18:52:34 +01:00
.topmsg experimental/vsftpd 2013-10-12 01:05:13 +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 Propagate the stableBranch argument 2013-10-31 22:04:26 +01:00
release.nix Drop the new-kernel ISOs 2013-11-07 16:38:57 +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.