From 0250705574acc817ca99a76b89b4acae2f8a05a8 Mon Sep 17 00:00:00 2001 From: Jeff Huffman Date: Tue, 24 Jun 2025 16:16:59 -0400 Subject: [PATCH] hred: convert to finalAttrs, add binlore (cherry picked from commit bdf3d512be23448e066992ab5acc4df6ec106852) --- pkgs/by-name/hr/hred/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hr/hred/package.nix b/pkgs/by-name/hr/hred/package.nix index d946f8665b07..289c4d753a3d 100644 --- a/pkgs/by-name/hr/hred/package.nix +++ b/pkgs/by-name/hr/hred/package.nix @@ -3,18 +3,18 @@ buildNpmPackage, fetchFromGitHub, runCommand, - hred, jq, + binlore, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "hred"; version = "1.5.1"; src = fetchFromGitHub { owner = "danburzo"; repo = "hred"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-+0+WQRI8rdIMbPN0eBUdsWUMWDCxZhTRLiFo1WRd2xc="; }; @@ -23,13 +23,15 @@ buildNpmPackage rec { dontNpmBuild = true; passthru.tests = { - simple = runCommand "${pname}-test" { } '' + simple = runCommand "hred-test" { } '' set -e -o pipefail - echo 'bar' | ${hred}/bin/hred 'i#foo { @id => id, @.textContent => text }' -c | ${jq}/bin/jq -c > $out + echo 'bar' | ${finalAttrs.finalPackage}/bin/hred 'i#foo { @id => id, @.textContent => text }' -c | ${jq}/bin/jq -c > $out [ "$(cat $out)" = '{"id":"foo","text":"bar"}' ] ''; }; + passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage "execer cannot bin/hred"; + meta = { description = "Command-line tool to extract data from HTML"; mainProgram = "hred"; @@ -37,4 +39,4 @@ buildNpmPackage rec { homepage = "https://github.com/danburzo/hred"; maintainers = with lib.maintainers; [ tejing ]; }; -} +})