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
..
2018-02-24 14:16:49 -08:00
2018-03-05 17:41:11 -06:00
2018-01-09 11:23:56 -05:00
2018-01-27 20:08:35 +01:00
2018-03-01 06:06:08 +02:00