From 7dcacb4fccbdb9c850c1989b9c2c20e1639a1f43 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 30 Sep 2023 11:49:11 -0400
Subject: zf: 0.8.0 -> 0.9.0

Diff: https://github.com/natecraddock/zf/compare/refs/tags/0.8.0...0.9.0

Changelog: https://github.com/natecraddock/zf/releases/tag/0.9.0
---
 pkgs/tools/misc/zf/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'pkgs/tools/misc/zf/default.nix')

diff --git a/pkgs/tools/misc/zf/default.nix b/pkgs/tools/misc/zf/default.nix
index 041f2a3989c..ece958a491c 100644
--- a/pkgs/tools/misc/zf/default.nix
+++ b/pkgs/tools/misc/zf/default.nix
@@ -3,27 +3,29 @@
 , fetchFromGitHub
 , installShellFiles
 , testers
-, zig_0_10
+, zig_0_11
+, callPackage
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zf";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "natecraddock";
     repo = "zf";
     rev = "refs/tags/${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-MzlSU5x2lb6PJZ/iNAi2aebfuClBprlfHMIG/4OPmuc=";
+    hash = "sha256-qzGr72EnWlGZgd7/r+8Iv+1i/Q9qvWpf/cgkr+TrgkE=";
   };
 
   nativeBuildInputs = [
     installShellFiles
-    zig_0_10.hook
+    zig_0_11.hook
   ];
 
-  doCheck = false; # it's failing somehow
+  postPatch = ''
+    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+  '';
 
   postInstall = ''
     installManPage doc/zf.1
@@ -38,8 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/natecraddock/zf";
     description = "A commandline fuzzy finder that prioritizes matches on filenames";
+    changelog = "https://github.com/natecraddock/zf/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ dit7ya mmlb ];
+    maintainers = with lib.maintainers; [ dit7ya figsoda mmlb ];
   };
 })
-- 
cgit 1.4.1


From 219e644d5a7b50de01596130d126f6e00fbc7ebd Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 30 Sep 2023 11:55:38 -0400
Subject: zf: fix test

---
 pkgs/tools/misc/zf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools/misc/zf/default.nix')

diff --git a/pkgs/tools/misc/zf/default.nix b/pkgs/tools/misc/zf/default.nix
index ece958a491c..1b441687d31 100644
--- a/pkgs/tools/misc/zf/default.nix
+++ b/pkgs/tools/misc/zf/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
       --zsh complete/_zf
   '';
 
-  passthru.tests.version = testers.testVersion { package = finalAttrs.zf; };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = {
     homepage = "https://github.com/natecraddock/zf";
-- 
cgit 1.4.1