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
..
default.nix	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
glx_ro_text_segm.patch	mesa-noglu: Add support for grsecurity	2014-05-15 13:25:48 +02:00
musl-fixes.patch	mesa: patch to fix w/musl	2018-02-13 09:44:53 -06:00
symlink-drivers.patch	mesa: feature update 17.0.6 -> 17.1.1	2017-05-28 10:43:53 +02:00