update: fmt, sway-beta, waybar, wl-clipboard, wlroots

Signed-off-by: Cole Mickens <cole.mickens@gmail.com>

7 files changed, 17 insertions, 34 deletions

diff --git a/pkgs/fmt/metadata.nix b/pkgs/fmt/metadata.nix
index 0f8fe03..74aafbb 100644
--- a/pkgs/fmt/metadata.nix
+++ b/pkgs/fmt/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "9a777b9e1c610f86f137c7cb3ac18be6eab06cce";
-  sha256 = "0s51hifibvhbf51ia3lc4wv53n80qz7adv0cgn9i4x1y4yh9skpd";
-  revdate = "2019-01-12T18:53:31Z";
+  rev = "b0cde860ae3fee787c582af53858ed03684e845f";
+  sha256 = "1d9pvvbwcjadz891slbhm76km750mdhdp1f87w2dnqmifkyz6497";
+  revdate = "2019-01-13T18:08:01Z";
 }
diff --git a/pkgs/sway-beta/metadata.nix b/pkgs/sway-beta/metadata.nix
index 03a0baa..8d9a91f 100644
--- a/pkgs/sway-beta/metadata.nix
+++ b/pkgs/sway-beta/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "a43863aa60bd9eff0972d096610cb5a6de79aacb";
-  sha256 = "1k1w4i22jh2cagi5xnkmllwqymz9p7xgjml5wnq6y1wm3xn1q3bc";
-  revdate = "2019-01-12T22:05:18Z";
+  rev = "4879d40695047a4c493bd8871d810c543978a869";
+  sha256 = "0c7rad8027b9cqdxk1bpf9jlayg32i70yfsf906sqq46l4sl6yml";
+  revdate = "2019-01-14T01:42:39Z";
 }
diff --git a/pkgs/swayidle/default.nix b/pkgs/swayidle/default.nix
index cf97316..fe9233f 100644
--- a/pkgs/swayidle/default.nix
+++ b/pkgs/swayidle/default.nix
@@ -1,9 +1,7 @@
 { stdenv, fetchFromGitHub
 , meson, ninja
 , pkgconfig, scdoc
-, wayland, libevdev, libxkbcommon, pcre, json_c, dbus
-, pango, cairo, libinput, libcap, pam, gdk_pixbuf
-, wlroots, wayland-protocols
+, wayland, wayland-protocols
 , buildDocs ? true
 }:
 
diff --git a/pkgs/waybar/default.nix b/pkgs/waybar/default.nix
index d70b401..2ac8fac 100644
--- a/pkgs/waybar/default.nix
+++ b/pkgs/waybar/default.nix
@@ -5,25 +5,10 @@
 , fmt, jsoncpp, libdbusmenu-gtk3
 , glib
 , git
-, python3Packages # TODO: temporary (meson480)
-, fetchpatch
 }:
 
 let
   metadata = import ./metadata.nix;
-  meson480 = meson.overrideAttrs (oldAttrs: rec {
-    name = pname + "-" + version;
-    pname = "meson";
-    version = "0.48.0";
-
-    src = python3Packages.fetchPypi {
-      inherit pname version;
-      sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
-    };
-    patches = builtins.filter # Remove gir-fallback-path.patch
-      (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str))
-      oldAttrs.patches;
-  });
 in
 stdenv.mkDerivation rec {
   name = "waybar-${version}";
@@ -36,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = metadata.sha256;
   };
 
-  nativeBuildInputs = [ meson480 ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
   buildInputs = [
     wayland wayland-protocols sway wlroots
     libpulseaudio libinput libnl gtkmm3
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index 82284ec..9db6663 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "8af813c2f1f619182a09eeddcc4c6fb0ed1b2e07";
-  sha256 = "01lvlz535m2nscmhzpqk3wdc4a8g698jh74sqhdhnbjlg6j7k6fy";
-  revdate = "2019-01-09T00:00:00Z";
+  rev = "9348e885929db86ca5f775c5909c753197db311e";
+  sha256 = "123pw1fy6qgm73rqmaaf4xf6mps195asklzfz3x6z0582rldqp4y";
+  revdate = "2019-01-13T21:37:19Z";
 }
diff --git a/pkgs/wl-clipboard/metadata.nix b/pkgs/wl-clipboard/metadata.nix
index 3757bc2..6ca4a73 100644
--- a/pkgs/wl-clipboard/metadata.nix
+++ b/pkgs/wl-clipboard/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "1d99c3d5720a012d5a034535f703f6b290408ebf";
-  sha256 = "1zy5a1pwx0s1ywlh3g9g3n1j6idrq2ayxb8zl1y8yri50krsvp45";
-  revdate = "2018-12-30T09:56:27Z";
+  rev = "7a851c6690c99935d455572b121306a0decad48a";
+  sha256 = "173p9c6a04bvnvrxpjjm70wi891lh10wnxm2v28m5yf807420bwl";
+  revdate = "2019-01-13T11:21:14Z";
 }
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 44f94cc..2e05342 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "8134d5b1e0b8c65f7c8b2e7ae626c1f2e5cbc9e1";
-  sha256 = "0xkm8lcsbp142y66n4b3wbs9xrdcnapsnydi7ykawjy933ms6pz9";
-  revdate = "2019-01-11T23:13:54Z";
+  rev = "10a2c4edec5e4f0877ff4afc83178c3f08b4f063";
+  sha256 = "11nrnc8jia00k66iw1rwzdvpb4pd0hmpnlqavwryqxdia8kg404s";
+  revdate = "2019-01-13T20:45:08Z";
 }