diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index e94d1fae364..6f3aa7ce129 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -81,6 +81,7 @@ #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-maths) + #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages java) #:use-module (gnu packages julia) @@ -1972,3 +1973,58 @@ which it is heavily inspired.") @item header include @end enumerate") (license license:expat))) + +(define-public yq + (package + (name "yq") + (version "4.47.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mikefarah/yq") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04724qywadxvgcdq5h35b9mqkyngkyad5aq5dk4g84aycarskpc4")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/mikefarah/yq/v4" + #:phases + #~(modify-phases %standard-phases + ;; Tests need this. + (add-after 'unpack 'fix-access-to-doc + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each make-file-writable + (find-files "./pkg/yqlib/doc" "\\.md")))))))) + (native-inputs + (list go-github-com-a8m-envsubst + go-github-com-alecthomas-participle-v2 + go-github-com-alecthomas-repr + go-github-com-dimchansky-utfbom + go-github-com-elliotchance-orderedmap + go-github-com-fatih-color + go-github-com-go-ini-ini + go-github-com-goccy-go-json + go-github-com-goccy-go-yaml + go-github-com-jinzhu-copier + go-github-com-magiconair-properties + go-github-com-pelletier-go-toml-v2 + go-github-com-pkg-diff + go-github-com-spf13-cobra + go-github-com-spf13-pflag + go-github-com-yuin-gopher-lua + go-go-yaml-in-yaml-v3 + go-golang-org-x-net + go-golang-org-x-text + go-gopkg-in-op-go-logging-v1)) + (home-page "https://mikefarah.gitbook.io/yq/") + (synopsis "Command-line YAML, JSON, XML, CSV, TOML and properties processor") + (description + "This package provides @code{yq}, a command-line YAML, JSON and XML +processor. It uses @code{jq}-like syntax but works with YAML files as well as +JSON, XML, properties, CSV and TSV.") + (license license:expat))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c7e16642334..2c0b4b34bea 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5796,62 +5796,6 @@ you'd expect.") (properties `((lint-hidden-cve . ("CVE-2023-50246" "CVE-2023-50268")))))) -(define-public yq - (package - (name "yq") - (version "4.47.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mikefarah/yq") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04724qywadxvgcdq5h35b9mqkyngkyad5aq5dk4g84aycarskpc4")))) - (build-system go-build-system) - (arguments - (list - #:install-source? #f - #:import-path "github.com/mikefarah/yq/v4" - #:phases - #~(modify-phases %standard-phases - ;; Tests need this. - (add-after 'unpack 'fix-access-to-doc - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (for-each make-file-writable - (find-files "./pkg/yqlib/doc" "\\.md")))))))) - (native-inputs - (list go-github-com-a8m-envsubst - go-github-com-alecthomas-participle-v2 - go-github-com-alecthomas-repr - go-github-com-dimchansky-utfbom - go-github-com-elliotchance-orderedmap - go-github-com-fatih-color - go-github-com-go-ini-ini - go-github-com-goccy-go-json - go-github-com-goccy-go-yaml - go-github-com-jinzhu-copier - go-github-com-magiconair-properties - go-github-com-pelletier-go-toml-v2 - go-github-com-pkg-diff - go-github-com-spf13-cobra - go-github-com-spf13-pflag - go-github-com-yuin-gopher-lua - go-go-yaml-in-yaml-v3 - go-golang-org-x-net - go-golang-org-x-text - go-gopkg-in-op-go-logging-v1)) - (home-page "https://mikefarah.gitbook.io/yq/") - (synopsis - "Command-line YAML, JSON, XML, CSV, TOML and properties processor") - (description - "This package provides @code{yq}, a command-line YAML, JSON and XML -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 go-github-com-itchyny-gojq (package (name "go-github-com-itchyny-gojq")