Merge pull request #219355 from tomfitzhenry/phosh-0.25.1

phosh: 0.23 -> 0.25.1

nixos/modules/services/x11/desktop-managers/phosh.nix

···
     systemd.services.phosh = {
       wantedBy = [ "graphical.target" ];
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/phosh";
+        ExecStart = "${cfg.package}/bin/phosh-session";
         User = cfg.user;
         Group = cfg.group;
         PAMName = "login";

pkgs/applications/misc/phoc/default.nix

···
   });
 in stdenv.mkDerivation rec {
   pname = "phoc";
-  version = "0.21.1";
+  version = "0.25.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
···
     owner = "Phosh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-HPqhro6TE/Ukh4txBPrDoIuDaxSxd/ZkDVZU3+m3GFg=";
+    sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [

pkgs/applications/window-managers/phosh/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "phosh";
-  version = "0.23.0";
+  version = "0.25.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
···
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
-    sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc=";
+    sha256 = "sha256-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8=";
   };
 
   nativeBuildInputs = [
···
     # https://github.com/NixOS/nixpkgs/issues/36468
     "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
   ];
-
-  postPatch = ''
-    chmod +x build-aux/post_install.py
-    patchShebangs build-aux/post_install.py
-  '';
 
   checkPhase = ''
     runHook preCheck