update: grim, sway{-beta,idle,lock}, waybar, wayfire, wlroots, wmfocus

note: wl-clipboard was intentionally held back due to build failures

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

11 files changed, 71 insertions, 35 deletions

diff --git a/README.md b/README.md
index 3fd2b96..3a22e52 100644
--- a/README.md
+++ b/README.md
@@ -17,24 +17,24 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 | -------------- | ------------------------- |
 | nixpkgs/nixos-unstable | [2019-01-20 09:32](https://github.com/nixos/nixpkgs-channels/commits/bc41317e24317b0f506287f2d5bab00140b9b50e) |
 | nixpkgs/nixpkgs-unstable | [2019-01-24 07:01](https://github.com/nixos/nixpkgs-channels/commits/11cf7d6e1ffd5fbc09a51b76d668ad0858a772ed) |
-| pkgs/wlroots | [2019-01-25 05:22](https://github.com/swaywm/wlroots/commits/209210d30780ec64995594b77fde3d718b655542) |
-| pkgs/sway-beta | [2019-01-24 06:24](https://github.com/swaywm/sway/commits/5f45a4bbc195400dd28e086c2e0e2f479b86e4eb) |
-| pkgs/swayidle | [2019-01-24 15:25](https://github.com/swaywm/swayidle/commits/f002a7a6e22704dbd2b195f43a604b22b55283ff) |
-| pkgs/swaylock | [2019-01-25 06:48](https://github.com/swaywm/swaylock/commits/368f53e4f15ecac51c01e6d1a45c43d31d4bca20) |
+| pkgs/wlroots | [2019-01-29 12:12](https://github.com/swaywm/wlroots/commits/77c25c152629e8bd3e8287d862728c72d03ac1dd) |
+| pkgs/sway-beta | [2019-01-29 10:38](https://github.com/swaywm/sway/commits/4f4424f66caa527869acf79a5e64d31a6212378f) |
+| pkgs/swayidle | [2019-01-27 05:22](https://github.com/swaywm/swayidle/commits/d18c7cbb5deb0f0d6a9758d0fc820bcdf9bf9cda) |
+| pkgs/swaylock | [2019-01-29 11:48](https://github.com/swaywm/swaylock/commits/effdea523158c8e30f7654a87402df155a2229ad) |
 | pkgs/slurp | [2019-01-09 15:24](https://github.com/emersion/slurp/commits/d9f3d741dc3de8c24198f41befc297e43054a523) |
-| pkgs/grim | [2019-01-11 14:45](https://github.com/emersion/grim/commits/b22b8a5ac3984c9b7d4ae5ba7ca112d3fd98b7a1) |
+| pkgs/grim | [2019-01-29 06:09](https://github.com/emersion/grim/commits/1e8dde32b6e5fd6b03230aea290840f64be515db) |
 | pkgs/mako | [2019-01-20 23:01](https://github.com/emersion/mako/commits/b30c786bdf8b90807e45ec0f52b292ee147ae1ff) |
 | pkgs/kanshi | [2019-01-09 09:05](https://github.com/emersion/kanshi/commits/c97715789db78a88970f6a4c86ecd9e59f156956) |
 | pkgs/wlstream | [2018-07-15 14:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
 | pkgs/oguri | [2019-01-19 14:57](https://github.com/vilhalmer/oguri/commits/88996939e8fb55c0a8d34596604660c87c585462) |
-| pkgs/waybar | [2019-01-25 07:42](https://github.com/Alexays/waybar/commits/a0fd99b1125ae34c5cd44baf29ccd0e8292ef0ef) |
-| pkgs/wayfire | [2019-01-24 12:52](https://github.com/WayfireWM/wayfire/commits/60ad07ededc2ff5005de2cb456254a4918c01768) |
+| pkgs/waybar | [2019-01-28 10:38](https://github.com/Alexays/waybar/commits/4d3c2191cb86a43199fe6e686e642d74e9bcf52b) |
+| pkgs/wayfire | [2019-01-28 22:41](https://github.com/WayfireWM/wayfire/commits/0fd706cce528b6a0470e1885a0fee394a16bf6db) |
 | pkgs/wf-config | [2018-12-17 00:04](https://github.com/WayfireWM/wf-config/commits/6d3426e216ac62ffa035035f9c1bea074e184018) |
 | pkgs/redshift-wayland | [2018-11-07 12:03](https://github.com/minus7/redshift/commits/420d0d534c9f03abc4d634a7d3d7629caf29b4b6) |
 | pkgs/bspwc | [2018-12-29 15:21](https://github.com/Bl4ckb0ne/bspwc/commits/e72ff641bd30d3db153d879cea1cffd149931546) |
 | pkgs/waybox | [2018-11-27 06:44](https://github.com/wizbright/waybox/commits/482d0a92f5530a5cbab8b0b913b653d4503015c4) |
-| pkgs/wl-clipboard | [2019-01-25 08:52](https://github.com/bugaevc/wl-clipboard/commits/0915628c5bf32b0a78e61e769a2979615a34f2bd) |
-| pkgs/wmfocus | [2019-01-21 13:08](https://github.com/svenstaro/wmfocus/commits/69da8166d0cba19343d120e934c5088b8f8d0d43) |
+| pkgs/wl-clipboard | [2019-01-29 06:42](https://github.com/bugaevc/wl-clipboard/commits/60654b06da413fb244704fd3352a5447ed3921e3) |
+| pkgs/wmfocus | [2019-01-28 19:22](https://github.com/svenstaro/wmfocus/commits/6ef7956933bff1e61f2d10d679ae91e962bc09d1) |
 | pkgs/i3status-rust | [2018-12-24 09:01](https://github.com/greshake/i3status-rust/commits/31a595ee2b7ca84c3205560d96ec7bcf8ce02d0b) |
 <!--pkgs-->
 
diff --git a/default.nix b/default.nix
index 3dca42f..014d529 100644
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,12 @@
 self: pkgs:
 let
 waylandPkgs = rec {
+  # temp
+  wlroots-old      = pkgs.callPackage ./pkgs-temp/wlroots {};
+  scdoc-new        = pkgs.callPackage ./pkgs-temp/scdoc {};
   # wlroots-related
   wlroots          = pkgs.callPackage ./pkgs/wlroots {};
-  wlroots-old      = pkgs.callPackage ./pkgs-temp/wlroots {};
-  sway-beta        = pkgs.callPackage ./pkgs/sway-beta {};
+  sway-beta        = pkgs.callPackage ./pkgs/sway-beta { scdoc = scdoc-new; };
   swayidle         = pkgs.callPackage ./pkgs/swayidle {};
   swaylock         = pkgs.callPackage ./pkgs/swaylock {};
   grim             = pkgs.callPackage ./pkgs/grim {};
diff --git a/pkgs-temp/scdoc/default.nix b/pkgs-temp/scdoc/default.nix
new file mode 100644
index 0000000..b0160e8
--- /dev/null
+++ b/pkgs-temp/scdoc/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "scdoc-${version}";
+  version = "1.8.0";
+
+  src = fetchurl {
+    url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
+    sha256 = "11693c01bn2cxmxra9r3nkacl908na4k42h2j4dv5j7zc8081994";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "-static" "" \
+      --replace "/usr/local" "$out"
+    # It happens from time to time that the version wasn't updated:
+    sed -iE 's/VERSION=[0-9]\.[0-9]\.[0-9]/VERSION=${version}/' Makefile
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A simple man page generator";
+    longDescription = ''
+      scdoc is a simple man page generator written for POSIX systems written in
+      C99.
+    '';
+    homepage = https://git.sr.ht/~sircmpwn/scdoc;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
+
diff --git a/pkgs/grim/metadata.nix b/pkgs/grim/metadata.nix
index 46a0e63..f75170c 100644
--- a/pkgs/grim/metadata.nix
+++ b/pkgs/grim/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "b22b8a5ac3984c9b7d4ae5ba7ca112d3fd98b7a1";
-  sha256 = "1fbw19nhp1n5rx9ma0glrq17w91ib8h55p6a0dlpjfjs5l0v6f59";
-  revdate = "2019-01-11T22:45:13Z";
+  rev = "1e8dde32b6e5fd6b03230aea290840f64be515db";
+  sha256 = "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz";
+  revdate = "2019-01-29T14:09:25Z";
 }
diff --git a/pkgs/sway-beta/metadata.nix b/pkgs/sway-beta/metadata.nix
index fd355b6..783f8ce 100644
--- a/pkgs/sway-beta/metadata.nix
+++ b/pkgs/sway-beta/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "5f45a4bbc195400dd28e086c2e0e2f479b86e4eb";
-  sha256 = "03fb41bm87ylxjampsivwahn68w9071bmakh83q7ca4hpp7j10y3";
-  revdate = "2019-01-24T14:24:02Z";
+  rev = "4f4424f66caa527869acf79a5e64d31a6212378f";
+  sha256 = "10rv70ys84n01y0ycb2jzddl2j17byfba8nrx14dgj8p9g37sfjk";
+  revdate = "2019-01-29T18:38:56Z";
 }
diff --git a/pkgs/swayidle/metadata.nix b/pkgs/swayidle/metadata.nix
index 27d0126..d743245 100644
--- a/pkgs/swayidle/metadata.nix
+++ b/pkgs/swayidle/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "f002a7a6e22704dbd2b195f43a604b22b55283ff";
-  sha256 = "18vdgi2b134x5fcfczyc6x2nrwlnkn47p9pvza8yb4sf8ibmgf2k";
-  revdate = "2019-01-24T23:25:50Z";
+  rev = "d18c7cbb5deb0f0d6a9758d0fc820bcdf9bf9cda";
+  sha256 = "0b65flajwn2i6k2kdxxgw25w7ikzzmm595f4j5x1wac1rb0yah9w";
+  revdate = "2019-01-27T13:22:09Z";
 }
diff --git a/pkgs/swaylock/metadata.nix b/pkgs/swaylock/metadata.nix
index 1808c37..94c217c 100644
--- a/pkgs/swaylock/metadata.nix
+++ b/pkgs/swaylock/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "368f53e4f15ecac51c01e6d1a45c43d31d4bca20";
-  sha256 = "00x5yw8cp21dkjz6cv279jc6k970ixrbz39c7cm55liydbslqykh";
-  revdate = "2019-01-25T14:48:32Z";
+  rev = "effdea523158c8e30f7654a87402df155a2229ad";
+  sha256 = "093nv1y9wyg48rfxhd36qdljjry57v1vkzrlc38mkf6zvsq8j7wb";
+  revdate = "2019-01-29T19:48:00Z";
 }
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index bd95bec..b381313 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "a0fd99b1125ae34c5cd44baf29ccd0e8292ef0ef";
-  sha256 = "05h2fn6z3x3jgkjyjr1q1gfnq9zk038624apc338ci4l02yibvfd";
-  revdate = "2019-01-25T15:42:41Z";
+  rev = "4d3c2191cb86a43199fe6e686e642d74e9bcf52b";
+  sha256 = "17dws3a846x6fy2kmxcpa828yn22hf3qi1dlzbcjdl4x2cdmr9dy";
+  revdate = "2019-01-28T18:38:58Z";
 }
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index b77c0ad..e7cece0 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "60ad07ededc2ff5005de2cb456254a4918c01768";
-  sha256 = "1fah6ascmdjg1m4yl6vgpp8rpm2kzakma59m6wi4pc1c6dacghwr";
-  revdate = "2019-01-24T20:52:54Z";
+  rev = "0fd706cce528b6a0470e1885a0fee394a16bf6db";
+  sha256 = "0171003ym29yx3krbm2370r7q2h5ygmz11dbbdfyz43dm6cnc4ml";
+  revdate = "2019-01-29T06:41:40Z";
 }
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 5341a00..837e01e 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "209210d30780ec64995594b77fde3d718b655542";
-  sha256 = "1l8px2w5w8bpwi67ma2mwb4lxamaf51habaf1rc76g8bh3aavn67";
-  revdate = "2019-01-25T13:22:27Z";
+  rev = "77c25c152629e8bd3e8287d862728c72d03ac1dd";
+  sha256 = "0qbjkbjsc34swpfgnc9dckwrj4fxc7cam346iinxg65pvwcdpx26";
+  revdate = "2019-01-29T20:12:31Z";
 }
diff --git a/pkgs/wmfocus/metadata.nix b/pkgs/wmfocus/metadata.nix
index dd8f3c8..0b3a06f 100644
--- a/pkgs/wmfocus/metadata.nix
+++ b/pkgs/wmfocus/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "69da8166d0cba19343d120e934c5088b8f8d0d43";
-  sha256 = "1s3ws68dhp002dcgb79q988yrzrf9hrd81299zy25b8r8f2czc6w";
-  revdate = "2019-01-21T21:08:48Z";
+  rev = "6ef7956933bff1e61f2d10d679ae91e962bc09d1";
+  sha256 = "0qnqqna1mg8pmqwwrkhsq5kp8q5fks3q8h9sf37lax9s356i264b";
+  revdate = "2019-01-29T03:22:14Z";
 }