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
..
absolute_gir_path.patch	gobjectIntrospection: use absolute path for cairo GIR	2018-01-20 15:58:20 +01:00
absolute_shlib_path.patch	webkgitgtk: fix 2.14 on macOS	2017-04-10 23:11:16 -07:00
default.nix	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
setup-hook.sh	Merge pull request #31094 from yegortimoshenko/ibus/update	2017-12-31 21:23:05 +03:00