From dee679f466f197be6bd970b32ab5585352f2cba7 Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Wed, 3 Apr 2024 12:42:28 +0100
Subject: [PATCH 1/4] docfd: add passthru test

---
 pkgs/by-name/do/docfd/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix
index 8baa36826a70..e32ed3431dc8 100644
--- a/pkgs/by-name/do/docfd/package.nix
+++ b/pkgs/by-name/do/docfd/package.nix
@@ -3,6 +3,8 @@
 , fetchFromGitHub
 , python3
 , dune_3
+, testers
+, docfd
 }:
 
 ocamlPackages.buildDunePackage rec {
@@ -35,6 +37,10 @@ ocamlPackages.buildDunePackage rec {
     yojson
   ];
 
+  passthru.tests.version = testers.testVersion {
+    package = docfd;
+  };
+
   meta = with lib; {
     description = "TUI multiline fuzzy document finder";
     longDescription = ''

From cfbb643b7db1794b5c692ea5a25d18b67630bc15 Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Wed, 3 Apr 2024 12:48:41 +0100
Subject: [PATCH 2/4] docfd: 3.0.0 -> 4.0.0

---
 pkgs/by-name/do/docfd/package.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix
index e32ed3431dc8..8376745b1e5b 100644
--- a/pkgs/by-name/do/docfd/package.nix
+++ b/pkgs/by-name/do/docfd/package.nix
@@ -3,13 +3,16 @@
 , fetchFromGitHub
 , python3
 , dune_3
+, makeWrapper
+, pandoc
+, poppler_utils
 , testers
 , docfd
 }:
 
 ocamlPackages.buildDunePackage rec {
   pname = "docfd";
-  version = "3.0.0";
+  version = "4.0.0";
 
   minimalOCamlVersion = "5.1";
 
@@ -17,10 +20,10 @@ ocamlPackages.buildDunePackage rec {
     owner = "darrenldl";
     repo = "docfd";
     rev = version;
-    hash = "sha256-pJ5LlOfC+9NRfY7ng9LAxEnjr+mtJmhRNTo9Im6Lkbo=";
+    hash = "sha256-fgwUXRZ6k5i3XLxXpjbrl0TJZMT+NkGXf7KNwRgi+q8=";
   };
 
-  nativeBuildInputs = [ python3 dune_3 ];
+  nativeBuildInputs = [ python3 dune_3 makeWrapper ];
   buildInputs = with ocamlPackages; [
     cmdliner
     containers-data
@@ -37,6 +40,10 @@ ocamlPackages.buildDunePackage rec {
     yojson
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/docfd --prefix PATH : "${lib.makeBinPath [ pandoc poppler_utils ]}"
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = docfd;
   };
@@ -44,14 +51,10 @@ ocamlPackages.buildDunePackage rec {
   meta = with lib; {
     description = "TUI multiline fuzzy document finder";
     longDescription = ''
-      Think interactive grep for both text and other document files, but
-      word/token based instead of regex and line based, so you can search
-      across lines easily. Aims to provide good UX via integration with
-      common text editors and other file viewers.
-      Optional dependencies:
-        fzf - for fuzzy file picker with "docfd ?".
-        poppler_utils - for pdf search.
-        pandoc - for .epub, .odt, .docx, .fb2, .ipynb, .html, & .htm files.
+      Think interactive grep for text and other document files.
+      Word/token based instead of regex and line based, so you
+      can search across lines easily. Aims to provide good UX via
+      integration with common text editors and other file viewers.
     '';
     homepage = "https://github.com/darrenldl/docfd";
     license = licenses.mit;

From e58213f7d62d2ad62ade72f2f2bb7d7001e626df Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Fri, 5 Apr 2024 22:36:41 +0100
Subject: [PATCH 3/4] docfd: fix for darwin x86_64

---
 pkgs/by-name/do/docfd/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix
index 8376745b1e5b..ebefb6f1cd70 100644
--- a/pkgs/by-name/do/docfd/package.nix
+++ b/pkgs/by-name/do/docfd/package.nix
@@ -1,5 +1,7 @@
 { lib
 , ocamlPackages
+, stdenv
+, overrideSDK
 , fetchFromGitHub
 , python3
 , dune_3
@@ -10,7 +12,13 @@
 , docfd
 }:
 
-ocamlPackages.buildDunePackage rec {
+let
+  # Needed for x86_64-darwin
+  buildDunePackage' = ocamlPackages.buildDunePackage.override {
+    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+  };
+in
+buildDunePackage' rec {
   pname = "docfd";
   version = "4.0.0";
 

From d3d9a00e5e9d1422ef2673d0a95901f800973cfd Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Fri, 5 Apr 2024 22:42:38 +0100
Subject: [PATCH 4/4] ocamlPackages.eio_posix: fix x86_64-darwin compatibility

---
 pkgs/development/ocaml-modules/eio/posix.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/ocaml-modules/eio/posix.nix b/pkgs/development/ocaml-modules/eio/posix.nix
index e8dc4072bab1..cba34a0d6389 100644
--- a/pkgs/development/ocaml-modules/eio/posix.nix
+++ b/pkgs/development/ocaml-modules/eio/posix.nix
@@ -1,4 +1,6 @@
 { buildDunePackage
+, lib
+, stdenv
 , dune-configurator
 , eio
 , fmt
@@ -14,6 +16,10 @@ buildDunePackage {
 
   dontStrip = true;
 
+  env = lib.optionalAttrs stdenv.isDarwin {
+    NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
+  };
+
   buildInputs = [
     dune-configurator
   ];