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-11 23:35:05 +01:00
2017-04-11 18:18:53 +02:00
2017-09-28 00:41:15 +02:00
2017-09-09 00:29:46 +02:00
2017-11-30 17:13:42 -08:00
2017-05-21 11:05:35 +01:00
2018-02-12 20:48:25 +01:00
2017-05-18 15:57:26 +02:00
2018-02-07 08:04:36 -05:00
2017-09-15 23:08:53 +02:00
2018-02-19 13:16:09 +00:00
2018-03-05 19:32:42 +00:00
2018-02-20 10:14:55 +00:00
2018-02-14 14:56:00 +01:00
2017-02-15 23:44:11 +00:00
2017-08-01 06:16:03 +02:00
2017-04-11 18:18:53 +02:00
2018-01-21 11:23:07 +00:00
2018-02-23 11:59:37 -05:00
2017-06-25 20:17:20 -03:00