Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-06-26 13:22:30 +02:00
96 changed files with 454 additions and 495 deletions
@@ -9,11 +9,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "weston-${version}";
version = "6.0.0";
version = "6.0.1";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl";
sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz";
};
nativeBuildInputs = [ meson ninja pkgconfig ];