From 1e4b2d8e22b4d330fcce46173519c4e81391a312 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Nov 2021 22:12:13 +0100 Subject: gnu: kcov: Update to 39. * gnu/packages/code.scm (kcov): Update to 39. [inputs]: Add openssl. --- gnu/packages/code.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 155d2c6bde..8804173a14 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -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)) @@ -571,31 +572,31 @@ 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 _ (substitute* (find-files "src" ".*\\.cc?$") (("/bin/bash") (which "bash")) - (("/bin/sh") (which "sh"))) - #t))))) + (("/bin/sh") (which "sh")))))))) (inputs `(("curl" ,curl) ("elfutils" ,elfutils) ("libelf" ,libelf) + ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs `(("python" ,python))) -- cgit v1.2.3 From c6e99f78f0f8c9d4da11162acd55ec73c8625641 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 26 Nov 2021 22:22:08 +0100 Subject: gnu: kcov: Prepare for cross-compilation. * gnu/packages/code.scm (kcov)[arguments]: Look up bash in the inputs. --- gnu/packages/code.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 8804173a14..29479cae54 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -588,10 +588,11 @@ results and determine build stability.") #: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")))))))) + (("/bin/(bash|sh)" shell) + (string-append (assoc-ref inputs "bash") shell))))))))) (inputs `(("curl" ,curl) ("elfutils" ,elfutils) -- cgit v1.2.3 From 460a38976a03f75f0902677da66e11e3322620ef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Nov 2021 09:18:29 +0200 Subject: gnu: uncrustify: Update to 0.74.0. * gnu/packages/code.scm (uncrustify): Update to 0.74.0. [native-inputs]: Remove unzip. --- gnu/packages/code.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 29479cae54..9bc9771dc1 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -746,7 +746,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 @@ -755,11 +755,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 -- cgit v1.2.3