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
..
activation-script.nix	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
no-clone.nix
switch-to-configuration.pl
top-level.nix	nixos: rename config.system.nixos* -> config.system.nixos.*	2018-02-18 12:56:30 +00:00