1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-14 11:00:36 +02:00

Merge remote-tracking branch 'origin/master' into core-updates-frozen

This commit is contained in:
Ricardo Wurmus 2021-12-05 19:17:41 +01:00
commit 9bc0f45df5
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
202 changed files with 205024 additions and 194678 deletions

View file

@ -68,6 +68,7 @@
#:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xml))
@ -575,31 +576,32 @@ results and determine build stability.")
(define-public kcov
(package
(name "kcov")
(version "38")
(version "39")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/SimonKagstrom/kcov")
(commit version)))
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0zqg21xwivi16csl6a5wby6679ny01bjaw4am3y4qcgjdyihifp8"))))
"09wf1k4dlpdhqjjgq2bibmgy8i3z32wf0zxhd2px2dvg92m4zwqr"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;no test target
`(#:tests? #f ; no test target
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-/bin/bash-references
(lambda _
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
(substitute* (find-files "src" ".*\\.cc?$")
(("/bin/bash") (which "bash"))
(("/bin/sh") (which "sh")))
#t)))))
(("/bin/(bash|sh)" shell)
(string-append (assoc-ref inputs "bash") shell)))))))))
(inputs
`(("curl" ,curl)
("elfutils" ,elfutils)
("libelf" ,libelf)
("openssl" ,openssl)
("zlib" ,zlib)))
(native-inputs
`(("python" ,python)))
@ -748,7 +750,7 @@ independent targets.")
(define-public uncrustify
(package
(name "uncrustify")
(version "0.69.0")
(version "0.74.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -757,11 +759,10 @@ independent targets.")
(file-name (git-file-name name version))
(sha256
(base32
"0sqrg13kp8fwymq40976bq380bzw40g4ss7ihlbq45d0f90ifa1k"))))
"0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd"))))
(build-system cmake-build-system)
(native-inputs
`(("unzip" ,unzip)
("python" ,python-wrapper)))
`(("python" ,python-wrapper)))
(arguments
`(#:phases
(modify-phases %standard-phases