drop alacritty/wltrunk/bspwc, updates

15 files changed, 40 insertions, 170 deletions

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";
 }