3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Eelco Dolstra 916793cf13 Merge branch 'master' into systemd-219
Conflicts:
	nixos/modules/system/boot/systemd.nix
	pkgs/applications/networking/p2p/transmission/default.nix
	pkgs/development/libraries/libseccomp/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/top-level/all-packages.nix
2015-09-07 21:28:33 +02:00
..
doc/manual wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes #9609 2015-09-03 12:58:24 +02:00
lib nixos: move left-behind allowUnfree comment 2015-09-03 01:17:10 +02:00
maintainers Update option-usages.nix expression to work with newer version of the module system. 2015-08-09 17:52:34 +02:00
modules Merge branch 'master' into systemd-219 2015-09-07 21:28:33 +02:00
tests docker: Minor improvements, fix failing test 2015-09-04 00:23:38 +01:00
COPYING
default.nix
README
release-combined.nix Disable lightdm test 2015-08-17 10:48:04 +02:00
release-small.nix release-small.nix: Drop the grub1 test 2015-08-11 13:51:55 +02:00
release.nix Disable lightdm test 2015-08-17 10:48:04 +02: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.