From 4f54185a55745ebd077bb20ef993ad35e687d5c4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 23 Jan 2025 07:54:09 +0000 Subject: [PATCH] gnu: yq: Simplify. * gnu/packages/web.scm (yq) [arguments]: Inherit from go-github-com-mikefarah-yq-v4. : Adjust it to produce correct binary. : Build it this time. : Everything is tested in library package. : Remove 'rename-binary. Change-Id: Ib917d17e160bd379f95c2439c32905191a1aeab6 --- gnu/packages/web.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 30d8ece70dad8e51814fde760b380b6bfb8097ce..bed4765895c99dd70bb293c72d77dce569ad01db 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5573,15 +5573,12 @@ JSON, XML, properties, CSV and TSV.") (inherit go-github-com-mikefarah-yq-v4) (name "yq") (arguments - (list #:install-source? #f - #:import-path "github.com/mikefarah/yq/v4" - #:test-subdirs #~(list ".") ; XXX: try to enable all tests - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'rename-binary - (lambda _ - (rename-file (string-append #$output "/bin/v4") - (string-append #$output "/bin/yq"))))))) + (substitute-keyword-arguments + (package-arguments go-github-com-mikefarah-yq-v4) + ((#:install-source? _ #t) #f) + ((#:skip-build? _ #t) #f) + ((#:tests? _ #t) #f) + ((#:import-path _) "github.com/mikefarah/yq"))) (propagated-inputs '()) (inputs (package-propagated-inputs go-github-com-mikefarah-yq-v4))))