From 960dd2e2979abb82ea11e157c5fc55f5a6f8a578 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Fri, 18 Oct 2024 17:39:30 -0400
Subject: [PATCH 1/2] zf: Format with nixfmt

---
 pkgs/by-name/zf/zf/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix
index c04fa13e2ca8..ee10c39dea13 100644
--- a/pkgs/by-name/zf/zf/package.nix
+++ b/pkgs/by-name/zf/zf/package.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, installShellFiles
-, testers
-, zig_0_13
-, callPackage
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  installShellFiles,
+  testers,
+  zig_0_13,
+  callPackage,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -43,7 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/natecraddock/zf/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ dit7ya figsoda mmlb ];
+    maintainers = with lib.maintainers; [
+      dit7ya
+      figsoda
+      mmlb
+    ];
     mainProgram = "zf";
   };
 })

From bcd5b037fd518a200d94bfd51ff098ebbf403784 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Fri, 18 Oct 2024 17:54:17 -0400
Subject: [PATCH 2/2] zf: 0.9.2 -> 0.10.2

Also add breaking notes to manual.
---
 .../manual/release-notes/rl-2505.section.md   |  3 ++
 pkgs/by-name/zf/zf/deps.nix                   | 51 +++++++++++++++++--
 pkgs/by-name/zf/zf/package.nix                |  4 +-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index e49aaf52c4a3..cda8abbb7173 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -99,6 +99,9 @@
   [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6)
   for more information.
 
+- `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0).
+  `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Other Notable Changes {#sec-release-25.05-notable-changes}
diff --git a/pkgs/by-name/zf/zf/deps.nix b/pkgs/by-name/zf/zf/deps.nix
index c814bd6c9645..7eeea9754d85 100644
--- a/pkgs/by-name/zf/zf/deps.nix
+++ b/pkgs/by-name/zf/zf/deps.nix
@@ -1,13 +1,56 @@
 # generated by zon2nix (https://github.com/nix-community/zon2nix)
 
-{ linkFarm, fetchzip }:
+{
+  linkFarm,
+  fetchzip,
+  fetchgit,
+}:
 
 linkFarm "zig-packages" [
   {
-    name = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25";
+    name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40";
     path = fetchzip {
-      url = "https://codeberg.org/dude_the_builder/ziglyph/archive/b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz";
-      hash = "sha256-e/zYB9w6vvHUBJzjlocSjpJu3qao7sXjBsfUO9oDXyg=";
+      url = "https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz";
+      hash = "sha256-4yLDdyQwPvglNzcRxlWbptjjOb0fsLv8jg/jFUp/uAU=";
+    };
+  }
+  {
+    name = "12207b7a5b538ffb7fb18f954ae17d2f8490b6e3778a9e30564ad82c58ee8da52361";
+    path = fetchgit {
+      url = "https://github.com/mitchellh/libxev";
+      rev = "f6a672a78436d8efee1aa847a43a900ad773618b";
+      hash = "sha256-NCRu+2UixKsm+tJMQiPyzAYL/kiKn4HFbJq3wpTF34Q=";
+    };
+  }
+  {
+    name = "1220a55aedabdd10578d0c514719ea39ae1bc6d7ed990f508dc100db7f0ccf391437";
+    path = fetchgit {
+      url = "https://github.com/Cloudef/zig-aio";
+      rev = "b5a407344379508466c5dcbe4c74438a6166e2ca";
+      hash = "sha256-OvM4CA2w9v2XpjAV26CjsLIWOILOQm89xaEwitYpciw=";
+    };
+  }
+  {
+    name = "1220da4cab188b7b0e351de67626ca0dcadceddd16ca5997cfb578697f0525a59dac";
+    path = fetchgit {
+      url = "https://github.com/marlersoft/zigwin32.git";
+      rev = "4a78e716ae6496f52d9ddaf4fda2c4bb692631cd";
+      hash = "sha256-/XvkZPxoq2oeEWREX0dDLdVro4NsCBsMHWKcytaD4Rg=";
+    };
+  }
+  {
+    name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5";
+    path = fetchgit {
+      url = "https://github.com/zigimg/zigimg";
+      rev = "3a667bdb3d7f0955a5a51c8468eac83210c1439e";
+      hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo=";
+    };
+  }
+  {
+    name = "1220de23a3240e503397ea579de4fd85db422f537e10036ef74717c50164475813ce";
+    path = fetchzip {
+      url = "https://github.com/rockorager/libvaxis/archive/refs/tags/v0.5.1.tar.gz";
+      hash = "sha256-F0PSs2k2XzC1J/UTyBetuBdXvIm/6jDWtSLATpnp+QY=";
     };
   }
 ]
diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix
index ee10c39dea13..8f03620b48ec 100644
--- a/pkgs/by-name/zf/zf/package.nix
+++ b/pkgs/by-name/zf/zf/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zf";
-  version = "0.9.2";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "natecraddock";
     repo = "zf";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-8KfzsDG9sZ/jMOusz2ydt3oytp891vKOpCUlPAwS8TE=";
+    hash = "sha256-Rsl8gAfVMeF5CLyPSrtzdgSCvEwPnBwHT4BOF9JQYYo=";
   };
 
   nativeBuildInputs = [