From 25bbfcf72fa3942e313f058e04e67e3afa421249 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Sep 2025 23:26:39 +0100
Subject: [PATCH] gnu: yq: Don't inherit from go-github-com-mikefarah-yq-v4.

go-github-com-mikefarah-yq-v4 was never used as source Golang library by
any packages, this change removes it's definition and keeps just final
`yq` command.

* gnu/packages/web.scm (yq): Don't inherit from
go-github-com-mikefarah-yq-v4 and overtake it's definition.
[native-inputs]: Move all here from [propagated-inputs].
(go-github-com-mikefarah-yq-v4): Delete variable.

Change-Id: Ia0019441313a79b07c27bf8f28d767fbe75e27e7
---
 gnu/packages/web.scm | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 4b89c2cd4fdf8cc5fdad2875f98ee47f022aa099..137d93c4ea74c7a6be7cf3bb07c7b55236a560bd 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5796,15 +5796,15 @@ you'd expect.")
     (properties `((lint-hidden-cve . ("CVE-2023-50246"
                                       "CVE-2023-50268"))))))
 
-(define-public go-github-com-mikefarah-yq-v4
+(define-public yq
   (package
-    (name "go-github-com-mikefarah-yq-v4")
+    (name "yq")
     (version "4.45.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/mikefarah/yq")
-                    (commit (string-append "v" version))))
+                     (url "https://github.com/mikefarah/yq")
+                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -5812,7 +5812,7 @@ you'd expect.")
     (build-system go-build-system)
     (arguments
      (list
-      #:skip-build? #t
+      #:install-source? #f
       #:import-path "github.com/mikefarah/yq/v4"
       #:phases
       #~(modify-phases %standard-phases
@@ -5822,7 +5822,7 @@ you'd expect.")
               (with-directory-excursion (string-append "src/" import-path)
                 (for-each make-file-writable
                           (find-files "./pkg/yqlib/doc" "\\.md"))))))))
-    (propagated-inputs
+    (native-inputs
      (list go-github-com-a8m-envsubst
            go-github-com-alecthomas-participle-v2
            go-github-com-alecthomas-repr
@@ -5851,20 +5851,6 @@ processor.  It uses @code{jq}-like syntax but works with YAML files as well as
 JSON, XML, properties, CSV and TSV.")
     (license license:expat)))
 
-(define-public yq
-  (package
-    (inherit go-github-com-mikefarah-yq-v4)
-    (name "yq")
-    (arguments
-     (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))))
-
 (define-public go-github-com-itchyny-gojq
   (package
     (name "go-github-com-itchyny-gojq")