drop alacritty/wltrunk/bspwc, updates

22 files changed, 58 insertions, 367 deletions

diff --git a/README.md b/README.md
index 7e9614b..34f8f1e 100644
--- a/README.md
+++ b/README.md
@@ -15,29 +15,28 @@ Packages from this overlay are regularly updated and built against `nixos-unstab
 <!--pkgs-->
 | Attribute Name | Last Upstream Commit Time |
 | -------------- | ------------------------- |
-| nixpkgs/nixos-unstable | [2019-07-07 12:49](https://github.com/nixos/nixpkgs-channels/commits/beff2f8d75ef2c65017fb25e251337c6bb2e950d) |
-| nixpkgs/nixpkgs-unstable | [2019-07-06 07:41](https://github.com/nixos/nixpkgs-channels/commits/d567c486ca5ac5f0c83bb0264c325204a479a5bb) |
-| pkgs/alacritty | [2019-07-10 21:24](https://github.com/jwilm/alacritty/commits/9a159a77604e0354f1176b02ff700bc11da19c86) |
+| nixpkgs/nixos-unstable | [2019-07-11 16:29](https://github.com/nixos/nixpkgs-channels/commits/1036dc664169b32613ec11b58cc1740c7511a340) |
+| nixpkgs/nixpkgs-unstable | [2019-07-15 04:02](https://github.com/nixos/nixpkgs-channels/commits/eadc851051479c23ffaabe6b18d7aea8dac20001) |
 | pkgs/cage | [2019-07-09 12:25](https://github.com/Hjdskes/cage/commits/016ef340d20febd15ae6d4fec2b6e9fba1422cee) |
 | pkgs/gebaar-libinput | [2019-04-05 13:27](https://github.com/Coffee2CodeNL/gebaar-libinput/commits/c18c8bd73e79aaf1211bd88bf9cff808273cf6d6) |
 | pkgs/grim | [2019-06-10 19:00](https://github.com/emersion/grim/commits/fb7261fbffac34bfce3387cb42e32d679d2b4e7b) |
-| pkgs/i3status-rust | [2019-07-08 14:52](https://github.com/greshake/i3status-rust/commits/51368bbb94c05b25129ce61a1d239013bd1a9e9f) |
+| pkgs/i3status-rust | [2019-07-15 01:06](https://github.com/greshake/i3status-rust/commits/e47a83f1b1ffaab1fc0aa412c3fb99735af3158c) |
 | pkgs/kanshi | [2019-06-07 20:15](https://github.com/emersion/kanshi/commits/76e9f4151f6d0880d32dbc57123e00eace1b0734) |
-| pkgs/mako | [2019-07-09 19:04](https://github.com/emersion/mako/commits/188243bc9ed0d3bca8e9309d5387ee7d12b375f3) |
-| pkgs/oguri | [2019-05-26 22:46](https://github.com/vilhalmer/oguri/commits/f766b6d1f908e4b07765295892843cd8ceb7497a) |
+| pkgs/mako | [2019-07-13 07:54](https://github.com/emersion/mako/commits/ef15e8d4c0abc6396809bc18fa106a8c19afc312) |
+| pkgs/oguri | [2019-07-14 16:47](https://github.com/vilhalmer/oguri/commits/5582689d76ae2e6295f8b8f51b4faafe469b85b4) |
 | pkgs/redshift-wayland | [2019-04-17 23:13](https://github.com/minus7/redshift/commits/eecbfedac48f827e96ad5e151de8f41f6cd3af66) |
 | pkgs/slurp | [2019-07-03 20:50](https://github.com/emersion/slurp/commits/6a9ac01100ecca05d221bea096bb088b376579c1) |
-| pkgs/sway | [2019-07-10 19:29](https://github.com/swaywm/sway/commits/5ffcea4c28103ecac3d4970412e8b44dbccfcb22) |
+| pkgs/sway | [2019-07-14 15:13](https://github.com/swaywm/sway/commits/e3a3917d3afb66fc8ba3eebb7aed603d3b7ce844) |
 | pkgs/swaybg | [2019-05-04 12:08](https://github.com/swaywm/swaybg/commits/25c6eaf15e64655385f01cbb98bffe28a862fe13) |
-| pkgs/swayidle | [2019-07-11 05:29](https://github.com/swaywm/swayidle/commits/a7a71bfa8261df6671b1a701e4dac3f106bb46ea) |
+| pkgs/swayidle | [2019-07-11 14:18](https://github.com/swaywm/swayidle/commits/426338a39e5bc228e3b585a615a6b6f06e8f2d17) |
 | pkgs/swaylock | [2019-06-28 14:27](https://github.com/swaywm/swaylock/commits/b1a7defa0087db7b984f568c79634316bb6bf1eb) |
-| pkgs/waybar | [2019-07-09 07:46](https://github.com/Alexays/waybar/commits/ccd1586c655c2aebf8877fcfee369f901952aae8) |
+| pkgs/waybar | [2019-07-15 11:38](https://github.com/Alexays/waybar/commits/7a2dee73770131ab9cf0d049972d8956807950b3) |
 | pkgs/waybox | [2019-06-19 22:09](https://github.com/wizbright/waybox/commits/bed7b707f24613dae334de6e7bd8f4e3313fa249) |
-| pkgs/wayfire | [2019-06-27 14:59](https://github.com/WayfireWM/wayfire/commits/ef4a5b325127e0b6861f320ae18085c77e57a0bc) |
+| pkgs/wayfire | [2019-07-13 07:10](https://github.com/WayfireWM/wayfire/commits/765d626d178bf22d6e7708c8a8b41c092098da18) |
 | pkgs/wf-config | [2019-06-18 19:10](https://github.com/WayfireWM/wf-config/commits/f9c97d07cf9e669a346c83a3c1fce3e2d843bd51) |
 | pkgs/wf-recorder | [2019-06-24 15:08](https://github.com/ammen99/wf-recorder/commits/d40508331a6bdc5e2d20fa3804cbf40fc028390a) |
 | pkgs/wl-clipboard | [2019-04-15 15:53](https://github.com/bugaevc/wl-clipboard/commits/c010972e6b0d2eb3002c49a6a1b5620ff5f7c910) |
-| pkgs/wlroots | [2019-07-04 11:45](https://github.com/swaywm/wlroots/commits/df3f0ffbb0bcce8a12c83b577fd688a4ec290e7e) |
+| pkgs/wlroots | [2019-07-11 16:31](https://github.com/swaywm/wlroots/commits/6345000b929293a2917a1a08a6d2751020d36e3c) |
 | pkgs/wtype | [2019-07-01 15:33](https://github.com/atx/wtype/commits/9752f420ffb1dd8b9cbc692d9f90cbe2cca343d9) |
 | pkgs/xdg-desktop-portal-wlr | [2019-02-12 12:09](https://github.com/emersion/xdg-desktop-portal-wlr/commits/74ee43cf37e716d0119f441be96e2b3fc9838797) |
 <!--pkgs-->
diff --git a/default.nix b/default.nix
index c3dc064..e613b84 100644
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,6 @@
 self: pkgs:
 let
 waylandPkgs = rec {
-  # temp
-  wlroots_050     = pkgs.callPackage ./pkgs-temp/wlroots-0.5.0 {};
-  wlroots_060     = pkgs.callPackage ./pkgs-temp/wlroots-0.6.0 {};
-
   # wlroots-related
   wlroots          = pkgs.callPackage ./pkgs/wlroots {};
   xdg-desktop-portal-wlr = pkgs.callPackage ./pkgs/xdg-desktop-portal-wlr {};
@@ -20,7 +16,6 @@ waylandPkgs = rec {
   waybar           = pkgs.callPackage ./pkgs/waybar {};
   wf-config        = pkgs.callPackage ./pkgs/wf-config {};
   wayfire          = pkgs.callPackage ./pkgs/wayfire {};
-  #wayfire          = pkgs.callPackage ./pkgs/wayfire { wlroots = wlroots_060; };
   redshift-wayland = pkgs.callPackage ./pkgs/redshift-wayland {
     inherit (pkgs.python3Packages) python pygobject3 pyxdg wrapPython;
     geoclue = pkgs.geoclue2;
@@ -31,20 +26,14 @@ waylandPkgs = rec {
   gebaar-libinput  = pkgs.callPackage ./pkgs/gebaar-libinput {};
   i3status-rust    = pkgs.callPackage ./pkgs/i3status-rust {};
 
-  bspwc    = pkgs.callPackage ./pkgs/bspwc { wlroots = wlroots_050; };
-  wltrunk  = pkgs.callPackage ./pkgs/wltrunk { wlroots = wlroots_050; };
+  #bspwc    = pkgs.callPackage ./pkgs/bspwc { wlroots = pkgs.wlroots; };
+  #wltrunk  = pkgs.callPackage ./pkgs/wltrunk { wlroots = pkgs.wlroots; };
   glpaper  = pkgs.callPackage ./pkgs/glpaper {};
   waypipe  = pkgs.callPackage ./pkgs/waypipe {};
 
   wlrobs  = pkgs.callPackage ./pkgs/wlrobs {};
   wtype   = pkgs.callPackage ./pkgs/wtype {};
   cage    = pkgs.callPackage ./pkgs/cage {};
-
-  alacritty = pkgs.callPackage ./pkgs/alacritty {
-    inherit (pkgs.xorg) libXcursor libXxf86vm libXi libxcb;
-    inherit (pkgs.darwin) cf-private;
-    inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL;
-  };
 };
 in
   waylandPkgs // { inherit waylandPkgs; }
diff --git a/nixpkgs/nixos-unstable/metadata.nix b/nixpkgs/nixos-unstable/metadata.nix
index 2eb1521..9026efd 100644
--- a/nixpkgs/nixos-unstable/metadata.nix
+++ b/nixpkgs/nixos-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "beff2f8d75ef2c65017fb25e251337c6bb2e950d";
-  sha256 = "1av1m2mibv9dgfrjv9r8n3ih9dyb0wi594s5xb4c135v121jpzs3";
-  revdate = "2019-07-07T12:49:39Z";
+  rev = "1036dc664169b32613ec11b58cc1740c7511a340";
+  sha256 = "1lvz85yc7s0yzix3hbcl9m8ahps1jdr9v2sbyq0phfawwjbgswyd";
+  revdate = "2019-07-11T16:29:24Z";
 }
diff --git a/nixpkgs/nixpkgs-unstable/metadata.nix b/nixpkgs/nixpkgs-unstable/metadata.nix
index aa4fd66..9f67d96 100644
--- a/nixpkgs/nixpkgs-unstable/metadata.nix
+++ b/nixpkgs/nixpkgs-unstable/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "d567c486ca5ac5f0c83bb0264c325204a479a5bb";
-  sha256 = "11v6bp26nprrv5gncf6iyvviajdm72zvn2gdk0ww0y5y0lzpz00s";
-  revdate = "2019-07-06T07:41:40Z";
+  rev = "eadc851051479c23ffaabe6b18d7aea8dac20001";
+  sha256 = "1gsqbiwwwgs560q459zjmzfi1qc2abkj83qq0ns2xd3ck4d69a6m";
+  revdate = "2019-07-15T04:02:57Z";
 }
diff --git a/pkgs-temp/wlroots-0.5.0/default.nix b/pkgs-temp/wlroots-0.5.0/default.nix
deleted file mode 100644
index d3b2d78..0000000
--- a/pkgs-temp/wlroots-0.5.0/default.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig
-, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
-, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
-, libpng, ffmpeg_4
-}:
-
-let
-  pname = "wlroots";
-  version = "0.5.0";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchFromGitHub {
-    owner = "swaywm";
-    repo = "wlroots";
-    rev = version;
-    sha256 = "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq";
-  };
-
-  # $out for the library, $bin for rootston, and $examples for the example
-  # programs (in examples) AND rootston
-  outputs = [ "out" "bin" "examples" ];
-
-  nativeBuildInputs = [ meson ninja pkgconfig ];
-
-  buildInputs = [
-    wayland libGL wayland-protocols libinput libxkbcommon pixman
-    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu
-    libpng ffmpeg_4
-  ];
-
-  mesonFlags = [
-    "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
-    "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
-  ];
-
-  postPatch = ''
-    # It happens from time to time that the version wasn't updated:
-    sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build
-  '';
-
-  postInstall = ''
-    # Copy the library to $bin and $examples
-    for output in "$bin" "$examples"; do
-      mkdir -p $output/lib
-      cp -P libwlroots* $output/lib/
-    done
-  '';
-
-  postFixup = ''
-    # Install rootston (the reference compositor) to $bin and $examples (this
-    # has to be done after the fixup phase to prevent broken binaries):
-    for output in "$bin" "$examples"; do
-      mkdir -p $output/bin
-      cp rootston/rootston $output/bin/
-      patchelf \
-        --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \
-        $output/bin/rootston
-      mkdir $output/etc
-      cp ../rootston/rootston.ini.example $output/etc/rootston.ini
-    done
-    # Install ALL example programs to $examples:
-    # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
-    # screenshot output-layout multi-pointer rotation tablet touch pointer
-    # simple
-    mkdir -p $examples/bin
-    cd ./examples
-    for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
-      cp "$binary" "$examples/bin/wlroots-$binary"
-      patchelf \
-        --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \
-        "$examples/bin/wlroots-$binary"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A modular Wayland compositor library";
-    inherit (src.meta) homepage;
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
-  };
-}
diff --git a/pkgs-temp/wlroots-0.6.0/default.nix b/pkgs-temp/wlroots-0.6.0/default.nix
deleted file mode 100644
index ce2039d..0000000
--- a/pkgs-temp/wlroots-0.6.0/default.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig
-, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
-, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
-, libpng, ffmpeg_4
-}:
-
-let
-  pname = "wlroots";
-  version = "0.6.0";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchFromGitHub {
-    owner = "swaywm";
-    repo = "wlroots";
-    rev = version;
-    sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4";
-  };
-
-  # $out for the library, $bin for rootston, and $examples for the example
-  # programs (in examples) AND rootston
-  outputs = [ "out" "bin" "examples" ];
-
-  nativeBuildInputs = [ meson ninja pkgconfig ];
-
-  buildInputs = [
-    wayland libGL wayland-protocols libinput libxkbcommon pixman
-    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu
-    libpng ffmpeg_4
-  ];
-
-  mesonFlags = [
-    "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
-    "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
-  ];
-
-  postPatch = ''
-    # It happens from time to time that the version wasn't updated:
-    sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build
-  '';
-
-  postInstall = ''
-    # Copy the library to $bin and $examples
-    for output in "$bin" "$examples"; do
-      mkdir -p $output/lib
-      cp -P libwlroots* $output/lib/
-    done
-  '';
-
-  postFixup = ''
-    # Install rootston (the reference compositor) to $bin and $examples (this
-    # has to be done after the fixup phase to prevent broken binaries):
-    for output in "$bin" "$examples"; do
-      mkdir -p $output/bin
-      cp rootston/rootston $output/bin/
-      patchelf \
-        --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \
-        $output/bin/rootston
-      mkdir $output/etc
-      cp ../rootston/rootston.ini.example $output/etc/rootston.ini
-    done
-    # Install ALL example programs to $examples:
-    # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
-    # screenshot output-layout multi-pointer rotation tablet touch pointer
-    # simple
-    mkdir -p $examples/bin
-    cd ./examples
-    for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
-      cp "$binary" "$examples/bin/wlroots-$binary"
-      patchelf \
-        --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \
-        "$examples/bin/wlroots-$binary"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A modular Wayland compositor library";
-    inherit (src.meta) homepage;
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
-  };
-}
diff --git a/pkgs/alacritty/default.nix b/pkgs/alacritty/default.nix
deleted file mode 100644
index eb5873f..0000000
--- a/pkgs/alacritty/default.nix
+++ /dev/null
@@ -1,128 +0,0 @@
-{ stdenv,
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  cmake,
-  python3,
-  makeWrapper,
-  ncurses,
-  expat,
-  pkgconfig,
-  freetype,
-  fontconfig,
-  libX11, libxcb,
-  gzip,
-  libXcursor,
-  libXxf86vm,
-  libXi,
-  libXrandr,
-  libGL,
-  xclip,
-  wayland,
-  libxkbcommon,
-  # Darwin Frameworks
-  cf-private,
-  AppKit,
-  CoreFoundation,
-  CoreGraphics,
-  CoreServices,
-  CoreText,
-  Foundation,
-  OpenGL }:
-
-with rustPlatform;
-
-let
-  metadata = import ./metadata.nix;
-  rpathLibs = [
-    expat
-    freetype
-    fontconfig
-    libX11
-    libXcursor
-    libXxf86vm
-    libXrandr
-    libGL
-    libXi
-    libxcb
-  ] ++ lib.optionals stdenv.isLinux [
-    wayland
-    libxkbcommon
-  ];
-in buildRustPackage rec {
-  pname = "alacritty";
-  version = metadata.rev;
-
-  src = fetchFromGitHub {
-    owner = "jwilm";
-    repo = pname;
-    rev = "${version}";
-    sha256 = metadata.sha256;
-  };
-
-  cargoSha256 = "0l61ky19fjchiiirf7ayjk5fqc0r5025rxlik5ss7cl4r41jykw7";
-
-  nativeBuildInputs = [
-    cmake
-    python3
-    makeWrapper
-    pkgconfig
-    ncurses
-    gzip
-  ];
-
-  buildInputs = rpathLibs
-    ++ lib.optionals stdenv.isDarwin [
-      AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL
-      # Needed for CFURLResourceIsReachable symbols.
-      cf-private
-    ];
-
-  outputs = [ "out" "terminfo" ];
-
-#  postPatch = ''
-#    substituteInPlace copypasta/src/x11.rs \
-#      --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
-#  '';
-
-  postBuild = lib.optionalString stdenv.isDarwin "make app";
-
-  installPhase = ''
-    runHook preInstall
-
-    install -D target/release/alacritty $out/bin/alacritty
-
-  '' + (if stdenv.isDarwin then ''
-    mkdir $out/Applications
-    cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
-  '' else ''
-    install -D extra/linux/alacritty.desktop -t $out/share/applications/
-    install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
-  '') + ''
-
-    install -D extra/completions/_alacritty -t "$out/share/zsh/site-functions/"
-    install -D extra/completions/alacritty.bash -t "$out/etc/bash_completion.d/"
-    install -D extra/completions/alacritty.fish -t "$out/share/fish/vendor_completions.d/"
-
-    install -dm 755 "$out/share/man/man1"
-    gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz"
-
-    install -dm 755 "$terminfo/share/terminfo/a/"
-    tic -x -o "$terminfo/share/terminfo" extra/alacritty.info
-    mkdir -p $out/nix-support
-    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
-
-    runHook postInstall
-  '';
-
-  dontPatchELF = true;
-
-  meta = with stdenv.lib; {
-    description = "GPU-accelerated terminal emulator";
-    homepage = https://github.com/jwilm/alacritty;
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ mic92 ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
-  };
-}
diff --git a/pkgs/alacritty/metadata.nix b/pkgs/alacritty/metadata.nix
deleted file mode 100644
index fb61085..0000000
--- a/pkgs/alacritty/metadata.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  rev = "9a159a77604e0354f1176b02ff700bc11da19c86";
-  sha256 = "0ixyrnf5xr7s0kssv9340q45saf1nj946nl7av5mw0pj5j7f2v3a";
-  revdate = "2019-07-10T21:24:04Z";
-}
diff --git a/pkgs/bspwc/metadata.nix b/pkgs/bspwc/metadata.nix
index ded22c3..fe8b5c9 100644
--- a/pkgs/bspwc/metadata.nix
+++ b/pkgs/bspwc/metadata.nix
@@ -1,4 +1,4 @@
 {
-  rev = "ad5b16a319c76d4ba823397f66f87a0969443a03";
-  sha256 = "0bd0liqxrw5mp368q1m4ivd9xhgz6qlj2rps6sxdg0bhi9gs3iw3";
+  rev = "b3d0da3eb6d1e25b48289e70e88934e5f9758984";
+  sha256 = "05yb7h2awjvz8vjzb05r060hyp1s3770df9px8b444qwpcn9nw6x";
 }
diff --git a/pkgs/i3status-rust/default.nix b/pkgs/i3status-rust/default.nix
index cd27521..95c5bfb 100644
--- a/pkgs/i3status-rust/default.nix
+++ b/pkgs/i3status-rust/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = metadata.sha256;
   };
 
-  cargoSha256 = "1w43k3ld9ra7blbn593mpi8qg5pgcglwqwddkrb55yxnpnkaxvzy";
+  cargoSha256 = "09fllqp9jyr807db6hmhwiciww24zazdhyjm2qhbx69l91rnp0hy";
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/i3status-rust/metadata.nix b/pkgs/i3status-rust/metadata.nix
index 13a36dd..d1611a7 100644
--- a/pkgs/i3status-rust/metadata.nix
+++ b/pkgs/i3status-rust/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "51368bbb94c05b25129ce61a1d239013bd1a9e9f";
-  sha256 = "15vjjf8vbyx9lfmakhvs2izl7wv09p091afkdz0qgy1l6pvjprw9";
-  revdate = "2019-07-08T14:52:42Z";
+  rev = "e47a83f1b1ffaab1fc0aa412c3fb99735af3158c";
+  sha256 = "0dd7622m6iajpmsrpyg4psjy3skipp9ic0as84p5waahymhaj5c1";
+  revdate = "2019-07-15T01:06:34Z";
 }
diff --git a/pkgs/kanshi/default.nix b/pkgs/kanshi/default.nix
index 989165b..1b8891c 100644
--- a/pkgs/kanshi/default.nix
+++ b/pkgs/kanshi/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub
-, meson, pkgconfig
-, ninja, scdoc, libudev
-, wayland, wayland-protocols
-, buildDocs ? true
+, meson, ninja, pkgconfig
+, libudev, wayland, wayland-protocols
+, scdoc, buildDocs ? true
 }:
 
 let
@@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = metadata.sha256;
   };
 
-  nativeBuildInputs = [ pkgconfig meson ninja ];
+  nativeBuildInputs = [ pkgconfig meson ninja scdoc ];
 
   buildInputs = [
     wayland wayland-protocols
diff --git a/pkgs/mako/metadata.nix b/pkgs/mako/metadata.nix
index c5b34f8..5eeef32 100644
--- a/pkgs/mako/metadata.nix
+++ b/pkgs/mako/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "188243bc9ed0d3bca8e9309d5387ee7d12b375f3";
-  sha256 = "1jz46k4jdm2jsimnkhsninjfnvx2fz6c74svsp1rr1hal65g3l6l";
-  revdate = "2019-07-09T19:04:38Z";
+  rev = "ef15e8d4c0abc6396809bc18fa106a8c19afc312";
+  sha256 = "0c7jgmh7x36npsz764xjbk3q5dwnk2zn29jxpkpfp6gdyvn2klxc";
+  revdate = "2019-07-13T07:54:52Z";
 }
diff --git a/pkgs/oguri/metadata.nix b/pkgs/oguri/metadata.nix
index e108b3b..866ee53 100644
--- a/pkgs/oguri/metadata.nix
+++ b/pkgs/oguri/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "f766b6d1f908e4b07765295892843cd8ceb7497a";
-  sha256 = "1idm50qmc8jx55hd4izwqa9shrmpc6h401nmlij49qdlc5kfwwwz";
-  revdate = "2019-05-26T22:46:10Z";
+  rev = "5582689d76ae2e6295f8b8f51b4faafe469b85b4";
+  sha256 = "0ycksh2q8r9sv1lpfrqv7liik7bdplckfwlw9yljijcdni59c0jy";
+  revdate = "2019-07-14T16:47:49Z";
 }
diff --git a/pkgs/sway/metadata.nix b/pkgs/sway/metadata.nix
index a829085..21c2949 100644
--- a/pkgs/sway/metadata.nix
+++ b/pkgs/sway/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "5ffcea4c28103ecac3d4970412e8b44dbccfcb22";
-  sha256 = "0f1hz9fmk72qpzyxghl0zmkwykacpx6pdcldqjir5sz8djbjkz7j";
-  revdate = "2019-07-10T19:29:38Z";
+  rev = "e3a3917d3afb66fc8ba3eebb7aed603d3b7ce844";
+  sha256 = "1f38jr70w6mjbjfqx8krywqwqasjrr2psn23gyjldjsldc4mdwc8";
+  revdate = "2019-07-14T15:13:55Z";
 }
diff --git a/pkgs/swayidle/metadata.nix b/pkgs/swayidle/metadata.nix
index 622a75f..a12d9d8 100644
--- a/pkgs/swayidle/metadata.nix
+++ b/pkgs/swayidle/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "a7a71bfa8261df6671b1a701e4dac3f106bb46ea";
-  sha256 = "07pbgn371z5w557jm6qgfljmh5106fbn7amvyrrhh2xsc2c6q85h";
-  revdate = "2019-07-11T05:29:27Z";
+  rev = "426338a39e5bc228e3b585a615a6b6f06e8f2d17";
+  sha256 = "05qi96j58xqxjiighay1d39rfanxcpn6vlynj23mb5dymxvlaq9n";
+  revdate = "2019-07-11T14:18:46Z";
 }
diff --git a/pkgs/waybar/metadata.nix b/pkgs/waybar/metadata.nix
index 842da15..be28e9b 100644
--- a/pkgs/waybar/metadata.nix
+++ b/pkgs/waybar/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "ccd1586c655c2aebf8877fcfee369f901952aae8";
-  sha256 = "11d69vggra8548lw78amlrb4zfp942llg2fj8gyykdg0i8zivx3s";
-  revdate = "2019-07-09T07:46:05Z";
+  rev = "7a2dee73770131ab9cf0d049972d8956807950b3";
+  sha256 = "0rfi58gr0gjcz1sxcsdzf2vqq74bpd6wx37w72258w6wl351dig9";
+  revdate = "2019-07-15T11:38:23Z";
 }
diff --git a/pkgs/wayfire/metadata.nix b/pkgs/wayfire/metadata.nix
index 1665051..2694ac0 100644
--- a/pkgs/wayfire/metadata.nix
+++ b/pkgs/wayfire/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "ef4a5b325127e0b6861f320ae18085c77e57a0bc";
-  sha256 = "1clr793amj3bnvh3ww1k46kkbqv8qh6y0zkkpa1661dj6lswc5cs";
-  revdate = "2019-06-27T14:59:27Z";
+  rev = "765d626d178bf22d6e7708c8a8b41c092098da18";
+  sha256 = "1ax6fp7r1ks6g9hd0hik830y27z4p3jsb39l561dwd16xkshj6f1";
+  revdate = "2019-07-13T07:10:33Z";
 }
diff --git a/pkgs/wf-recorder/default.nix b/pkgs/wf-recorder/default.nix
index 90539b0..f26a2c3 100644
--- a/pkgs/wf-recorder/default.nix
+++ b/pkgs/wf-recorder/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols, ffmpeg, x264
-, libpulseaudio }:
+{ stdenv, fetchFromGitHub
+, meson, ninja, pkgconfig
+, wayland, wayland-protocols
+, ffmpeg, x264, libpulseaudio
+, scdoc
+}:
 
 let
   metadata = import ./metadata.nix;
@@ -14,7 +18,7 @@ stdenv.mkDerivation rec {
     inherit (metadata) rev sha256;
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
   buildInputs = [ wayland wayland-protocols ffmpeg x264 libpulseaudio ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/wlroots/metadata.nix b/pkgs/wlroots/metadata.nix
index 5da209a..2504892 100644
--- a/pkgs/wlroots/metadata.nix
+++ b/pkgs/wlroots/metadata.nix
@@ -1,5 +1,5 @@
 {
-  rev = "df3f0ffbb0bcce8a12c83b577fd688a4ec290e7e";
-  sha256 = "1gwma9lrqndjzkmwhv96yhdi31aj2qmmhifn2jhvdcv9bmm91l4f";
-  revdate = "2019-07-04T11:45:58Z";
+  rev = "6345000b929293a2917a1a08a6d2751020d36e3c";
+  sha256 = "18zyhgwcg8slks8i93iv5plfhvp0dcdkv0i65xr7i9qcflv38fv2";
+  revdate = "2019-07-11T16:31:21Z";
 }
diff --git a/pkgs/wltrunk/metadata.nix b/pkgs/wltrunk/metadata.nix
index d2ab16c..de5981d 100644
--- a/pkgs/wltrunk/metadata.nix
+++ b/pkgs/wltrunk/metadata.nix
@@ -1,4 +1,4 @@
 {
-  rev = "7ed8a2138a39b0bacff7f2f637388294c0b6d773";
-  sha256 = "11gy06sbll361vvhp95nn07i4bgw5jq0rba8xad6n55brw286ddy";
+  rev = "0d6af745fb8604382498e50b73f4456fdd1f6ec3";
+  sha256 = "0cnpcq55lrhpjvi04a5j1dhchpqbw5kyiwqrywxa2icyii63nf8y";
 }
diff --git a/update.sh b/update.sh
index 1f79dfa..c7971c7 100755
--- a/update.sh
+++ b/update.sh
@@ -44,7 +44,6 @@ function update() {
 update "nixpkgs/nixos-unstable" "nixos" "nixpkgs-channels" "nixos-unstable"
 update "nixpkgs/nixpkgs-unstable" "nixos" "nixpkgs-channels" "nixpkgs-unstable"
 
-update "pkgs/alacritty"        "jwilm"      "alacritty" "master"
 manual "pkgs/bspwc"
 update "pkgs/cage"             "Hjdskes" "cage" "master"
 update "pkgs/gebaar-libinput"  "Coffee2CodeNL" "gebaar-libinput" "master"