summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-11-21 12:09:01 +0000
committerGitHub <noreply@github.com>2017-11-21 12:09:01 +0000
commit72cf3e856a971526c41e28370653abe63c054f84 (patch)
tree3d2767559a2229c2771715d84ad899186a95c4ac
parent4f73b3162b117178b26beecc73cbb532290ae03f (diff)
parentfc39418ad4a1bef3e61da0416d846f8943b39527 (diff)
downloadnixpkgs-72cf3e856a971526c41e28370653abe63c054f84.tar
nixpkgs-72cf3e856a971526c41e28370653abe63c054f84.tar.gz
nixpkgs-72cf3e856a971526c41e28370653abe63c054f84.tar.bz2
nixpkgs-72cf3e856a971526c41e28370653abe63c054f84.tar.lz
nixpkgs-72cf3e856a971526c41e28370653abe63c054f84.tar.xz
nixpkgs-72cf3e856a971526c41e28370653abe63c054f84.tar.zst
nixpkgs-72cf3e856a971526c41e28370653abe63c054f84.zip
Merge pull request #31868 from Mic92/weston/wayland-update
Weston: 1.12.0 -> 3.0.0; wayland: 1.12.0 -> 1.14.0
-rw-r--r--pkgs/applications/window-managers/weston/default.nix4
-rw-r--r--pkgs/development/libraries/wayland/default.nix4
-rw-r--r--pkgs/development/libraries/wayland/protocols.nix4
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 395541d6250..0b78debdc58 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "weston-${version}";
-  version = "1.12.0";
+  version = "3.0.0";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033";
+    sha256 = "19936zlkb75xcaidd8fag4ah8000wrh2ziqy7nxkq36pimgdbqfd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 836a4527b50..5def37b791c 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -8,11 +8,11 @@ assert expat != null;
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
-  version = "1.12.0";
+  version = "1.14.0";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1";
+    sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d";
   };
 
   configureFlags = [ "--with-scanner" "--disable-documentation" ];
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 436de5609e5..5b1495ccbe1 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "wayland-protocols-${version}";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a";
+    sha256 = "0138psvx6fv8z5x2p6xi4iij6m5k62c0qyfsb45xgcf5a4fyxz1s";
   };
 
   nativeBuildInputs = [ pkgconfig ];