diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
commit | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (patch) | |
tree | adbc42e629ea3441456eb5e5e4e0b3a7fa2d867a /pkgs/applications/window-managers | |
parent | f498a8b7af41401c167baa6879a8b0271e8ffbf5 (diff) | |
parent | ff13b6f1acceac062e66a2b0f39a59bcb5570a87 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/bspwm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/window-managers/dwm/dwm-status.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 7cb423123dc67..8fd85aaeb862c 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -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 ]; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 5ffd94e9f8722..eac15ca714189 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -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}" |