From 1f2758af98b3b4b188ce974eb3a207c2a151b662 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 25 Jan 2025 05:25:22 -0500
Subject: [PATCH 1/3] phoc: migrate to by-name

---
 .../misc/phoc/default.nix => by-name/ph/phoc/package.nix}     | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/phoc/default.nix => by-name/ph/phoc/package.nix} (97%)

diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/by-name/ph/phoc/package.nix
similarity index 97%
rename from pkgs/applications/misc/phoc/default.nix
rename to pkgs/by-name/ph/phoc/package.nix
index 19dc0653c753..eb5d3c32b3c5 100644
--- a/pkgs/applications/misc/phoc/default.nix
+++ b/pkgs/by-name/ph/phoc/package.nix
@@ -18,7 +18,7 @@
 , wayland
 , libdrm
 , libxkbcommon
-, wlroots
+, wlroots_0_17
 , xorg
 , directoryListingUpdater
 , nixosTests
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Patch wlroots to remove a check which crashes Phosh.
   # This patch can be found within the phoc source tree.
-  wlroots = wlroots.overrideAttrs (old: {
+  wlroots = wlroots_0_17.overrideAttrs (old: {
     patches = (old.patches or []) ++ [
       (stdenvNoCC.mkDerivation {
         name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5750b99a5dc1..7cb482bc375f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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 { };
 

From 9bec16ff494005b59c41d731015a5b14cc552e7c Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 25 Jan 2025 05:26:42 -0500
Subject: [PATCH 2/3] phoc: format with nixfmt

---
 pkgs/by-name/ph/phoc/package.nix | 62 +++++++++++++++++---------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix
index eb5d3c32b3c5..00460210ec8d 100644
--- a/pkgs/by-name/ph/phoc/package.nix
+++ b/pkgs/by-name/ph/phoc/package.nix
@@ -1,29 +1,30 @@
-{ 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
+{
+  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: {
@@ -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_0_17.overrideAttrs (old: {
-    patches = (old.patches or []) ++ [
+    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;
   };
 })

From dc27a816186e0f6b6a9d702e6fc93b03dba355c3 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 25 Jan 2025 05:28:23 -0500
Subject: [PATCH 3/3] phoc: 0.44.0 -> 0.44.1

---
 pkgs/by-name/ph/phoc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix
index 00460210ec8d..084542190c57 100644
--- a/pkgs/by-name/ph/phoc/package.nix
+++ b/pkgs/by-name/ph/phoc/package.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoc";
-  version = "0.44.0";
+  version = "0.44.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -37,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 = [