summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorNguyễn Gia Phong <cnx@loang.net>2026-03-27 17:18:31 +0900
committerNguyễn Gia Phong <cnx@loang.net>2026-06-29 12:20:57 +0900
commit3cb295b87dd66998aeeb5314dc1a4f06207ba5af (patch)
treef521687a2ad491ab14a61da9ca221bddbb9f8d47 /gnu
parentcdb82872d8e7d9b989fb9d60842f0cedd364f00a (diff)
gnu: jq: Update to 1.8.2.
This release fixes CVE-2026-32316, CVE-2026-33947, CVE-2026-33948, CVE-2026-39956, CVE-2026-39979, CVE-2026-40164, CVE-2026-40612, CVE-2026-41256, CVE-2026-41257, CVE-2026-43894, CVE-2026-43895, CVE-2026-43896, CVE-2026-44777, CVE-2026-47770, CVE-2026-49839, and CVE-2026-54679. * gnu/packages/web.scm (jq): Update to 1.8.2. [source]: Switch to git-fetch. <snippet>: Remove prebuilt manual page and tests. Patch Makefile.am to not require vendor/onigurama in bootstrap phase. [arguments]<#:phases>: Add unrequire-git-and-pipenv phase. <#:make-flags>: Remove XFAIL for optional tests on 32-bit systems. <#:configure-flags>: Add --enable-docs and --disable-static. [native-inputs]: Add autoconf, automake, libtool, python, python-lxml, python-markdown and python-pyyaml. [home-page]: Update URL. [properties]: Unset lint-hidden-cve. [license]: Add X11 License for bundled the bundled decNumber library. Merges: https://codeberg.org/guix/guix/pulls/7517 Reviewed-by: Efraim Flashner <efraim@flashner.co.il> Reviewed-by: Dariqq <dariqq@posteo.net> Reviewed-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/web.scm75
1 files changed, 53 insertions, 22 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index e4e8ac478e0..d2b381be771 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6110,38 +6110,70 @@ It uses the uwsgi protocol for all the networking/interprocess communications.")
6110(define-public jq 6110(define-public jq
6111 (package 6111 (package
6112 (name "jq") 6112 (name "jq")
6113 (version "1.8.1") 6113 (version "1.8.2")
6114 (source 6114 (source
6115 (origin 6115 (origin
6116 (method url-fetch) 6116 (method git-fetch)
6117 (uri (string-append "https://github.com/jqlang/jq" 6117 (uri (git-reference
6118 "/releases/download/jq-" version 6118 (url "https://github.com/jqlang/jq")
6119 "/jq-" version ".tar.gz")) 6119 (commit (string-append "jq-" version))))
6120 (file-name (git-file-name name version))
6120 (sha256 6121 (sha256
6121 (base32 "1c3yhg537p0ilc4c57vz7sggp57n1ahyp432j3ai3jyf55qlxrib")) 6122 (base32 "1m798zky0s4smpf4jxl5g0ndg8ybd9f6ca8vhld4yma1ga7r71vk"))
6122 (modules '((guix build utils))) 6123 (modules '((guix build utils)))
6123 (snippet 6124 (snippet
6124 ;; Remove bundled onigurama. 6125 #~(begin
6125 '(delete-file-recursively "vendor/oniguruma")))) 6126 (delete-file "jq.1.prebuilt")
6127 (delete-file "tests/man.test")
6128 (delete-file "tests/manonig.test")
6129 ;; TODO: unbundle decnumber, which is maintained in GCC.
6130 ;; Remove bundled onigurama.
6131 (delete-file-recursively "vendor/oniguruma")
6132 (substitute* "Makefile.am"
6133 (("SUBDIRS = vendor/oniguruma") ""))))))
6126 (arguments 6134 (arguments
6127 (if (or (target-x86-32?) 6135 (list #:configure-flags
6128 (target-arm32?)) 6136 #~'("--enable-docs" "--disable-static")
6129 ;; requires 64bit time_t 6137 #:phases
6130 (list #:make-flags #~'("XFAIL_TESTS=tests/optionaltest")) 6138 #~(modify-phases %standard-phases
6131 '())) 6139 (add-before 'bootstrap 'unrequire-git-and-pipenv
6140 (lambda* (#:key inputs #:allow-other-keys)
6141 (substitute* "configure.ac"
6142 (("^m4_define\\(\\[jq_version\\], .*\\)")
6143 (simple-format #f "m4_define([jq_version], [~a])"
6144 #$(package-version this-package))))
6145 ;; configure tries to launch $PIPENV.
6146 (setenv "PIPENV" "true")
6147 (substitute* "Makefile.am"
6148 (("\\$\\(PIPENV\\) run python (.*\\.py)" all prog)
6149 ;; Schema validation requires python-jsonschema,
6150 ;; which transitively depends on rustc.
6151 ;; Since jq is a transitive dependency of guix,
6152 ;; skipping this static analysis helps
6153 ;; with its bootstrapping cost.
6154 (if (string=? prog "validate_manual_schema.py")
6155 "true"
6156 (string-append "python3 " prog)))))))))
6132 (inputs 6157 (inputs
6133 (list oniguruma)) 6158 (list oniguruma))
6134 (native-inputs 6159 (native-inputs
6135 (append 6160 (cons*
6136 ;; TODO: fix gems to generate documentation 6161 autoconf
6137 ;(list ruby bundler) 6162 automake
6138 (list tzdata-for-tests) ; needed for tests 6163 libtool
6164 ;; Docs dependencies:
6165 python
6166 python-lxml
6167 python-markdown
6168 python-pyyaml
6169 ;; Test dependencies:
6170 tzdata-for-tests
6139 (if (member (%current-system) 6171 (if (member (%current-system)
6140 (package-supported-systems valgrind/pinned)) 6172 (package-supported-systems valgrind/pinned))
6141 (list valgrind/pinned) 6173 (list valgrind/pinned)
6142 '()))) 6174 '())))
6143 (build-system gnu-build-system) 6175 (build-system gnu-build-system)
6144 (home-page "https://jqlang.github.io/jq/") 6176 (home-page "https://jqlang.org")
6145 (synopsis "Command-line JSON processor") 6177 (synopsis "Command-line JSON processor")
6146 (description "jq is like sed for JSON data – you can use it to slice and 6178 (description "jq is like sed for JSON data – you can use it to slice and
6147filter and map and transform structured data with the same ease that sed, awk, 6179filter and map and transform structured data with the same ease that sed, awk,
@@ -6149,10 +6181,9 @@ grep and friends let you play with text. It is written in portable C. jq can
6149mangle the data format that you have into the one that you want with very 6181mangle the data format that you have into the one that you want with very
6150little effort, and the program to do so is often shorter and simpler than 6182little effort, and the program to do so is often shorter and simpler than
6151you'd expect.") 6183you'd expect.")
6152 (license (list license:expat license:cc-by3.0)) 6184 (license (list license:cc-by3.0 ;docs
6153 ;; Both those CVEs are actually fixed in version 1.7.1. 6185 license:x11 ;vendor/decNumber
6154 (properties `((lint-hidden-cve . ("CVE-2023-50246" 6186 license:expat)))) ;rest
6155 "CVE-2023-50268"))))))
6156 6187
6157(define-public go-jqp 6188(define-public go-jqp
6158 (package 6189 (package