diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:33:52 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:33:52 +0100 |
| commit | 20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c (patch) | |
| tree | 3165b4e84ec25ad34e2e40995c3fb10fad17f1d5 /pkgs/applications/window-managers | |
| parent | 099bb158f91ff67a3c2fa637cb533b44cf17a7da (diff) | |
| parent | f77eb9bb4d5d9ff34c6b1c18274e50d0bdddb652 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
4 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 9a00b3a2efaa..064e555f3a5b 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "0iwixf3gaichmpvhczxdg5srkb72yh61i5wh7m3fab657h3r7di6"; + sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index da58d844ee89..0af46db0a1c2 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace meson.build --replace "v1.5" "1.5" + substituteInPlace meson.build \ + --replace "v1.5" "1.5" \ + --replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']" ''; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index a6c8d5cd1c32..4bb4225d394d 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "v1.6-1"; + version = "v1.6-2"; src = fetchFromGitHub { owner = "mortie"; repo = "swaylock-effects"; rev = version; - sha256 = "044fc4makjx8v29fkx5xlil6vr1v4r0k6c8741pl67gzvlm4cx3i"; + sha256 = "0fs3c4liajgkax0a2pdc7117v1g9k73nv87g3kyv9wsnkfbbz534"; }; postPatch = '' diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix index d0a1de7f6006..1bbdb7a460fd 100644 --- a/pkgs/applications/window-managers/windowlab/default.nix +++ b/pkgs/applications/window-managers/windowlab/default.nix @@ -33,4 +33,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; -}
\ No newline at end of file +} |