Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-06-10 09:27:04 +00:00
1116 changed files with 79612 additions and 24052 deletions
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchgit {
url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4";
sha256 = "43a102405acdcdb346ab197b33c8fa724d2140f33754f8ee3941a0eea152735c";
sha256 = "0r5k9rk8mq4j51a310qvvfmhhz8a0cmcwr8pl8mkwfsgcpwxbpfg";
};
buildInputs =