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-09 19:51:06 +00:00
2017-09-29 15:18:25 +01:00
2017-08-11 15:48:45 +00:00
2016-09-05 14:53:27 +02:00
2017-01-29 05:45:43 -06:00
2017-01-29 05:45:43 -06:00
2017-09-23 20:34:55 +02:00
2017-08-25 14:08:11 +02:00
2017-07-23 12:56:04 +03:00
2017-09-29 15:01:21 +01:00
2018-02-09 19:51:06 +00:00
2018-01-04 09:58:21 +01:00