phoc: 0.44.0 -> 0.44.1 (#376649)

pkgs/by-name/ph/phoc/package.nix

@@ -1,34 +1,35 @@
-{ lib
-, stdenv
-, stdenvNoCC
-, fetchFromGitLab
-, meson
-, ninja
-, pkg-config
-, python3
-, wayland-scanner
-, wrapGAppsHook3
-, libinput
-, gobject-introspection
-, mutter
-, gnome-desktop
-, glib
-, gtk3
-, json-glib
-, wayland
-, libdrm
-, libxkbcommon
-, wlroots
-, xorg
-, directoryListingUpdater
-, nixosTests
-, testers
-, gmobile
+{
+  lib,
+  stdenv,
+  stdenvNoCC,
+  fetchFromGitLab,
+  meson,
+  ninja,
+  pkg-config,
+  python3,
+  wayland-scanner,
+  wrapGAppsHook3,
+  libinput,
+  gobject-introspection,
+  mutter,
+  gnome-desktop,
+  glib,
+  gtk3,
+  json-glib,
+  wayland,
+  libdrm,
+  libxkbcommon,
+  wlroots_0_17,
+  xorg,
+  directoryListingUpdater,
+  nixosTests,
+  testers,
+  gmobile,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoc";
-  version = "0.44.0";
+  version = "0.44.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -36,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Phosh";
     repo = "phoc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KaCQtORMJUM7/BLD+Jnbunhd/9/3NYWYx/XMYMo27hI=";
+    hash = "sha256-Whke7wTRp5NaRauiiQZLjs0pSD1uAyr0aAhlK5e1+Hw=";
   };
 
   nativeBuildInputs = [
@@ -65,12 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
     gmobile
   ];
 
-  mesonFlags = ["-Dembed-wlroots=disabled"];
+  mesonFlags = [ "-Dembed-wlroots=disabled" ];
 
   # Patch wlroots to remove a check which crashes Phosh.
   # This patch can be found within the phoc source tree.
-  wlroots = wlroots.overrideAttrs (old: {
-    patches = (old.patches or []) ++ [
+  wlroots = wlroots_0_17.overrideAttrs (old: {
+    patches = (old.patches or [ ]) ++ [
       (stdenvNoCC.mkDerivation {
         name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
         inherit (finalAttrs) src;
@@ -94,7 +95,10 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "phoc";
     homepage = "https://gitlab.gnome.org/World/Phosh/phoc";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ masipcat zhaofengli ];
+    maintainers = with maintainers; [
+      masipcat
+      zhaofengli
+    ];
     platforms = platforms.linux;
   };
 })

pkgs/top-level/all-packages.nix

@@ -4669,10 +4669,6 @@ with pkgs;
 
   pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
 
-  phoc = callPackage ../applications/misc/phoc {
-    wlroots = wlroots_0_17;
-  };
-
   piper-train = callPackage ../tools/audio/piper/train.nix { };
   piper-tts = callPackage ../tools/audio/piper { };