lol

Merge pull request #300470 from chewblacka/update-docfd

docfd: 3.0.0 -> 4.0.0

authored by

Sandro and committed by
GitHub
7d69be02 1155526b

+35 -12
+29 -12
pkgs/by-name/do/docfd/package.nix
··· 1 1 { lib 2 2 , ocamlPackages 3 + , stdenv 4 + , overrideSDK 3 5 , fetchFromGitHub 4 6 , python3 5 7 , dune_3 8 + , makeWrapper 9 + , pandoc 10 + , poppler_utils 11 + , testers 12 + , docfd 6 13 }: 7 14 8 - ocamlPackages.buildDunePackage rec { 15 + let 16 + # Needed for x86_64-darwin 17 + buildDunePackage' = ocamlPackages.buildDunePackage.override { 18 + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; 19 + }; 20 + in 21 + buildDunePackage' rec { 9 22 pname = "docfd"; 10 - version = "3.0.0"; 23 + version = "4.0.0"; 11 24 12 25 minimalOCamlVersion = "5.1"; 13 26 ··· 15 28 owner = "darrenldl"; 16 29 repo = "docfd"; 17 30 rev = version; 18 - hash = "sha256-pJ5LlOfC+9NRfY7ng9LAxEnjr+mtJmhRNTo9Im6Lkbo="; 31 + hash = "sha256-fgwUXRZ6k5i3XLxXpjbrl0TJZMT+NkGXf7KNwRgi+q8="; 19 32 }; 20 33 21 - nativeBuildInputs = [ python3 dune_3 ]; 34 + nativeBuildInputs = [ python3 dune_3 makeWrapper ]; 22 35 buildInputs = with ocamlPackages; [ 23 36 cmdliner 24 37 containers-data ··· 35 48 yojson 36 49 ]; 37 50 51 + postInstall = '' 52 + wrapProgram $out/bin/docfd --prefix PATH : "${lib.makeBinPath [ pandoc poppler_utils ]}" 53 + ''; 54 + 55 + passthru.tests.version = testers.testVersion { 56 + package = docfd; 57 + }; 58 + 38 59 meta = with lib; { 39 60 description = "TUI multiline fuzzy document finder"; 40 61 longDescription = '' 41 - Think interactive grep for both text and other document files, but 42 - word/token based instead of regex and line based, so you can search 43 - across lines easily. Aims to provide good UX via integration with 44 - common text editors and other file viewers. 45 - Optional dependencies: 46 - fzf - for fuzzy file picker with "docfd ?". 47 - poppler_utils - for pdf search. 48 - pandoc - for .epub, .odt, .docx, .fb2, .ipynb, .html, & .htm files. 62 + Think interactive grep for text and other document files. 63 + Word/token based instead of regex and line based, so you 64 + can search across lines easily. Aims to provide good UX via 65 + integration with common text editors and other file viewers. 49 66 ''; 50 67 homepage = "https://github.com/darrenldl/docfd"; 51 68 license = licenses.mit;
+6
pkgs/development/ocaml-modules/eio/posix.nix
··· 1 1 { buildDunePackage 2 + , lib 3 + , stdenv 2 4 , dune-configurator 3 5 , eio 4 6 , fmt ··· 13 15 minimalOCamlVersion = "5.0"; 14 16 15 17 dontStrip = true; 18 + 19 + env = lib.optionalAttrs stdenv.isDarwin { 20 + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; 21 + }; 16 22 17 23 buildInputs = [ 18 24 dune-configurator