nixpkgs/nixos
obadz 57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
..
doc/manual fontconfig-ultimate: 2015-12-06 -> 2016-04-23 2016-08-20 03:21:05 +03:00
lib nixos: generalize copy-paste from stage-1 and zfs to utils 2016-08-23 18:14:06 +00:00
maintainers Add AMIs in ap-northeast-2 and ap-south-1 2016-07-12 17:26:25 +02:00
modules Merge branch 'master' into staging 2016-08-28 12:20:59 +01:00
tests Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-08-24 11:01:53 +02:00
COPYING
default.nix nix: Add a "dev" output 2016-04-18 21:13:18 +02:00
README
release-combined.nix Revert "Temporarily disable chromium test" 2016-08-23 14:16:58 +01:00
release-small.nix release-small: drop mysql51, removed in 975d33e6 2016-08-13 09:46:42 +02:00
release.nix Revert "Temporarily disable chromium test" 2016-08-23 14:16:58 +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.