Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-08-01 09:42:54 +02:00
221 changed files with 37504 additions and 23529 deletions
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "bspwm-${version}";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "baskerville";
repo = "bspwm";
rev = version;
sha256 = "17cfvbrvzwwr9r72xgpn144k45xavzi0hnl2qqp9lhxflvirac0c";
sha256 = "1vc4pdm4fwb5gz7hyzwvjqkx5087f0vrw11898nq1s7kxzl2lhbx";
};
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
@@ -9,19 +9,19 @@ in
rustPlatform.buildRustPackage rec {
name = "dwm-status-${version}";
version = "1.6.0";
version = "1.6.2";
src = fetchFromGitHub {
owner = "Gerschtli";
repo = "dwm-status";
rev = version;
sha256 = "02gvlxv6ylx4mdkf59crm2zyahiz1zd4cr5zz29dnhx7r7738i9a";
sha256 = "16vf7val1isc4227amng2ap9af34xa2va23dxv43px006xhrar78";
};
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
cargoSha256 = "1r2wczfkdpvjc7iylwajkminraaz1ix6n724in0dvv5klfcdxlxb";
cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss";
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"