wayland window managers: orbment, sway, velox -> latest git

5 files changed, 34 insertions, 20 deletions

diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
index 567903f589c5..e7cbd004087e 100644
--- a/pkgs/applications/window-managers/orbment/default.nix
+++ b/pkgs/applications/window-managers/orbment/default.nix
@@ -4,23 +4,23 @@
 
 stdenv.mkDerivation rec {
   name = "orbment-${version}";
-  version = "git-2015-09-30";
+  version = "git-2016-01-31";
   repo = "https://github.com/Cloudef/orbment";
-  rev = "229a870dbbb9dbc66c137cf2747eab11acdf1a95";
+  rev = "7f649fb76649f826dd29578a5ec41bb561b116eb";
 
   chck_repo = "https://github.com/Cloudef/chck";
-  chck_rev = "6191a69572952291c137294317874c06c9c0d6a9";
+  chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc";
   inihck_repo = "https://github.com/Cloudef/inihck";
   inihck_rev = "462cbd5fd67226714ac2bdfe4ceaec8e251b2d9c";
 
   srcs = [
    (fetchurl {
      url = "${repo}/archive/${rev}.tar.gz";
-     sha256 = "7aaa0262d078adaf47abdf500b9ea581f6bec164c195a44a3c165a865414ca2c";
+     sha256 = "5a426da0d5f4487911cfe9226865ed0cd1a7cdf253eec19d5eadc4b0d14a2ea0";
    })
    (fetchurl {
      url = "${chck_repo}/archive/${chck_rev}.tar.gz";
-     sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160";
+     sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e";
    })
    (fetchurl {
      url = "${inihck_repo}/archive/${inihck_rev}.tar.gz";
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index cec48fad4e56..fa81971885a4 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -4,10 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "sway-${version}";
-  version = "git-2015-10-16";
+  version = "git-2016-02-08";
+  repo = "https://github.com/SirCmpwn/sway";
+  rev = "16e904634c65128610537bed7fcb16ac3bb45165";
 
   src = fetchurl {
-    url = "https://github.com/SirCmpwn/sway/archive/16e904634c65128610537bed7fcb16ac3bb45165.tar.gz";
+    url = "${repo}/archive/${rev}.tar.gz";
     sha256 = "52d6c4b49fea69e2a2c1b44b858908b7736301bdb9ed483c294bc54bb40e872e";
   };
 
diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix
index 8823b32ee3ce..789f074aecdf 100644
--- a/pkgs/applications/window-managers/velox/default.nix
+++ b/pkgs/applications/window-managers/velox/default.nix
@@ -5,11 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "velox-${version}";
-  version = "git-2015-09-23";
+  version = "git-2015-11-03";
+  repo = "https://github.com/michaelforney/velox";
+  rev = "53b41348df7e37886cab012609923255e4397419";
 
   src = fetchurl {
-    url = "https://github.com/michaelforney/velox/archive/499768b5834967727e3d91139b4013b6aca95762.tar.gz";
-    sha256 = "252959f0f0ff593c187449b61c234c214fdf321e3f4e8b5d9e3c2949d932a0a2";
+    url = "${repo}/archive/${rev}.tar.gz";
+    sha256 = "e49583efbbe62ea30f0084491ff757dff683f35eef6e9b68aa413e0b50c4bf20";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix
index 448459d02750..48e1524e36fc 100644
--- a/pkgs/development/libraries/swc/default.nix
+++ b/pkgs/development/libraries/swc/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "swc-${version}";
-  version = "git-2015-09-05";
+  version = "git-2016-02-09";
   repo = "https://github.com/michaelforney/swc";
-  rev = "0dff35ad9b80fc62e6b48417f78c24df6648c9d2";
+  rev = "1da0ef13fddc572accea12439a4471b4d2f64ddd";
 
   src = fetchurl {
     url = "${repo}/archive/${rev}.tar.gz";
-    sha256 = "7af5655b5bb5fe59bb8e6643e35f794419850463b1d7f44f29b45ab6aee01ae9";
+    sha256 = "d1894612d8aa1ce828efb78f1570290f84bba6563e21eb777e08c3c3859b7bbe";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index a0b592df4a35..9b5fa32bf00f 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,32 +1,42 @@
-{ lib, stdenv, fetchurl, cmake, pkgconfig
+{ lib, stdenv, fetchurl, fetchgit, cmake, pkgconfig
 , glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs
 , libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm, linuxPackages_4_2
 }:
 
 stdenv.mkDerivation rec {
   name = "wlc-${version}";
-  version = "git-2015-10-04";
+  version = "git-2016-01-31";
   repo = "https://github.com/Cloudef/wlc";
-  rev = "74d978cc54fd8256777c8d39327cb677523cddff";
+  rev = "faa4d3cba670576c202b0844e087b13538f772c5";
 
   chck_repo = "https://github.com/Cloudef/chck";
-  chck_rev = "6191a69572952291c137294317874c06c9c0d6a9";
+  chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc";
+
+  wl_protos_repo = "git://anongit.freedesktop.org/wayland/wayland-protocols";
+  wl_protos_rev = "0b05b70f9da245582f01581be4ca36db683682b8";
+  wl_protos_rev_short = "0b05b70";
 
   srcs = [
    (fetchurl {
      url = "${repo}/archive/${rev}.tar.gz";
-     sha256 = "a3641e79252a140be089dd2e829b4d21a3b5ff10866951568d54bd4600597254";
+     sha256 = "cdf6a772dc90060d57aa1a915a4daff0f79802c141fec92ef2710245d727af67";
    })
    (fetchurl {
      url = "${chck_repo}/archive/${chck_rev}.tar.gz";
-     sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160";
+     sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e";
+   })
+   (fetchgit {
+     url = "${wl_protos_repo}";
+     rev = "${wl_protos_rev}";
+     sha256 = "9c1cfbb570142b2109ecef4d11b17f25e94ed2e0569f522ea56f244c60465224";
    })
   ];
 
   sourceRoot = "wlc-${rev}";
   postUnpack = ''
-    rm -rf wlc-${rev}/lib/chck
+    rm -rf wlc-${rev}/lib/chck wlc-${rev}/protos/wayland-protocols
     ln -s ../../chck-${chck_rev} wlc-${rev}/lib/chck
+    ln -s ../../wayland-protocols-${wl_protos_rev_short} wlc-${rev}/protos/wayland-protocols
   '';
 
   patchPhase = ''