From 856a2985804078f66a5aba95de4902aa42838dc5 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 10 Mar 2022 01:15:06 -0800 Subject: [PATCH 1/2] phosh: 0.15.0 -> 0.16.0 --- pkgs/applications/window-managers/phosh/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 2c01a37aa43c..b52d8e7a470b 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-ZEfYjgSaj4vVdfgdIcg0PWwlFX90PIm5wvdn9P/8tvo="; + sha256 = "sha256-nxQYVWUXT1fNgOTRB3iWCLWYI/STk8vtguTbPPNTHdg="; }; nativeBuildInputs = [ @@ -108,8 +108,6 @@ stdenv.mkDerivation rec { postFixup = '' mkdir -p $out/share/wayland-sessions ln -s $out/share/applications/sm.puri.Phosh.desktop $out/share/wayland-sessions/ - # The OSK0.desktop points to a dummy stub that's not needed - rm $out/share/applications/sm.puri.OSK0.desktop ''; passthru = { From 69c490670e58fa2d337d99a8503b46e2daf2aa5a Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 25 Mar 2022 18:32:06 -0700 Subject: [PATCH 2/2] phoc: 0.12.0 -> 0.13.0 --- pkgs/applications/misc/phoc/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 7acdcdf02c45..53b949d9383b 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -33,6 +33,12 @@ let url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch"; sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY="; }) + # xdg-activation: Allow to submit tokens + (fetchpatch { + name = "allow-to-submit-tokens.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/4c59f7d46a949548caa55805b00922f846d58525.patch"; + sha256 = "sha256-1kUIt6lV3HXN2BBBER8sjYVLTvgqELdSeFullJjNGo8="; + }) # xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO (fetchpatch { name = "allow-to-retrieve-startup-id-via-net-startup-info.patch"; @@ -43,7 +49,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -51,7 +57,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kfMM/YjgAktpOKHNcxxl1FPVbgATPDNRhEJ/sVT1LYs="; + sha256 = "sha256-65u59S6ntvkoQUO5BvkHZVcbj6cHIU4CgHWjzFo6s94="; }; nativeBuildInputs = [