From 254ed1ad0339ce03901405e1e9d137a1185882e2 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 5 May 2024 09:18:11 +0100 Subject: [PATCH 1/2] docfd: format with nixfmt --- pkgs/by-name/do/docfd/package.nix | 43 +++++++++++++++++++------------ 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index ebefb6f1cd70..91d800dd0220 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -1,15 +1,16 @@ -{ lib -, ocamlPackages -, stdenv -, overrideSDK -, fetchFromGitHub -, python3 -, dune_3 -, makeWrapper -, pandoc -, poppler_utils -, testers -, docfd +{ + lib, + ocamlPackages, + stdenv, + overrideSDK, + fetchFromGitHub, + python3, + dune_3, + makeWrapper, + pandoc, + poppler_utils, + testers, + docfd, }: let @@ -31,7 +32,12 @@ buildDunePackage' rec { hash = "sha256-fgwUXRZ6k5i3XLxXpjbrl0TJZMT+NkGXf7KNwRgi+q8="; }; - nativeBuildInputs = [ python3 dune_3 makeWrapper ]; + nativeBuildInputs = [ + python3 + dune_3 + makeWrapper + ]; + buildInputs = with ocamlPackages; [ cmdliner containers-data @@ -49,12 +55,15 @@ buildDunePackage' rec { ]; postInstall = '' - wrapProgram $out/bin/docfd --prefix PATH : "${lib.makeBinPath [ pandoc poppler_utils ]}" + wrapProgram $out/bin/docfd --prefix PATH : "${ + lib.makeBinPath [ + pandoc + poppler_utils + ] + }" ''; - passthru.tests.version = testers.testVersion { - package = docfd; - }; + passthru.tests.version = testers.testVersion { package = docfd; }; meta = with lib; { description = "TUI multiline fuzzy document finder"; From 9ad995c04e9cc3e0fa222f38fd9e3597bcf4acc9 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 5 May 2024 09:17:00 +0100 Subject: [PATCH 2/2] docfd: 4.0.0 -> 5.1.0 --- pkgs/by-name/do/docfd/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index 91d800dd0220..8adbeaa65615 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -21,7 +21,7 @@ let in buildDunePackage' rec { pname = "docfd"; - version = "4.0.0"; + version = "5.1.0"; minimalOCamlVersion = "5.1"; @@ -29,7 +29,7 @@ buildDunePackage' rec { owner = "darrenldl"; repo = "docfd"; rev = version; - hash = "sha256-fgwUXRZ6k5i3XLxXpjbrl0TJZMT+NkGXf7KNwRgi+q8="; + hash = "sha256-54gsX5C8AJAOkqnBxHLI76k6cEqWqEydxbZjJZl7FjE="; }; nativeBuildInputs = [ @@ -49,6 +49,9 @@ buildDunePackage' rec { notty ocolor oseq + ppx_deriving + ppxlib + re spelll timedesc yojson