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
fetch.sh	qt5: 5.10.0 -> 5.10.1	2018-02-15 08:54:29 +01:00
qtbase-darwin.patch	qt510-qtbase: fix darwin build with clang-5	2018-02-12 22:15:04 +01:00
qtbase.patch	qt5: 5.10.0 -> 5.10.1	2018-02-15 08:54:29 +01:00
qtdeclarative.patch
qtscript.patch
qtserialport.patch
qttools.patch
qtwebengine-paxmark-mksnapshot.patch
qtwebkit.patch
restore-pc-files.patch	qt5: install headers on darwin also	2018-02-28 22:37:35 +01:00
srcs.nix	qt5: 5.10.0 -> 5.10.1	2018-02-15 08:54:29 +01:00