nixpkgs-suyu/nixos
Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
..
doc/manual Merge #15105: nixos manual: rephrase indented strings 2016-05-02 11:58:45 +02:00
lib treewide: Use correct output in ${config.nix.package}/bin 2016-04-25 16:44:37 +02:00
maintainers Update AMI creation script 2016-04-05 11:25:12 +02:00
modules Merge remote-tracking branch 'upstream/master' into staging 2016-05-03 23:12:48 +03:00
tests nixos/tests/netboot: Fix evaluation error 2016-05-03 22:05:11 +02:00
COPYING
default.nix nix: Add a "dev" output 2016-04-18 21:13:18 +02:00
README
release-combined.nix make all boot tests release critical #14902 2016-04-23 13:12:57 +01:00
release-small.nix containers: test imperative and ipv4 in small-release (#15015) 2016-04-26 22:38:47 +02:00
release.nix netboot: fix eval 2016-05-01 10:00:31 +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.