diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-05-22 02:00:00 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-05-22 02:00:11 +0200 |
| commit | 7730b45bf8f456bece97135b244a26e41df00838 (patch) | |
| tree | 0ff1d5d4f1c79881050fa887757de0d86b9a4f8e | |
| parent | a8a3d31dec5d24b67ae09cb10fd5e49c684ae314 (diff) | |
| download | guix-7730b45bf8f456bece97135b244a26e41df00838.tar.gz guix-7730b45bf8f456bece97135b244a26e41df00838.zip | |
gnu: clang@14: Include the extras.
* gnu/packages/llvm.scm (clang-14): Add a matching #:tools-extra origin.
Reported by foobarxyz on #guix.
| -rw-r--r-- | gnu/packages/llvm.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/patchutils.scm | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 4d5a948236..c93c1db7fe 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -627,7 +627,16 @@ of programming tools as well as libraries with equivalent functionality.") ,@(package-native-inputs template)))))) (define-public clang-14 - (let ((template (clang-from-llvm llvm-14 clang-runtime-14))) + (let ((template + (clang-from-llvm llvm-14 clang-runtime-14 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-14))) + (sha256 + (base32 + "188hh6l956gkl6hgjzzdraj5jp538zhhhllxvy23gml6slrmbj7j")))))) (package (inherit template) (arguments diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 5f16deaffa..856413d83c 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name> -;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; @@ -158,7 +158,7 @@ refreshed, and more.") (define-public colordiff (package (name "colordiff") - (version "1.0.19") + (version "1.0.20") (source (origin (method url-fetch) @@ -167,7 +167,7 @@ refreshed, and more.") (string-append "http://www.colordiff.org/archive/colordiff-" version ".tar.gz"))) (sha256 - (base32 "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26")))) + (base32 "1kbv3lsyzzrwca4v3ajpnv8q5j0h53r94lxiqgmikxmrxrxh3cp3")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests |