nixpkgs/nixos
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
..
doc/manual Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
lib Merge pull request #35844 from adisbladis/jquery-mv 2018-03-06 15:34:34 +08:00
maintainers nixos/make-disk-image.nix: Support EFI images 2018-01-22 11:18:23 +02:00
modules Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
tests Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
COPYING
default.nix nixos: export packages of the current configuration (its pkgs argument) 2018-02-09 19:35:27 +00:00
README
release-combined.nix nixos/release: fix evaluation if missing x86 2018-03-07 16:06:30 +01:00
release-small.nix Add the boot test to release-small.nix 2018-02-27 20:09:07 +01:00
release.nix nixos release: more evaluation fixes 2018-03-07 17:29:02 +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.