diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-10 17:32:24 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-10 17:32:24 +0200 |
| commit | 4d14902b9402a83db444d8d6818d0a4f438ce8c4 (patch) | |
| tree | 85f05a0540ebcd4a1f192096c36271a287eb9fe8 /gnu/packages/cpp.scm | |
| parent | 647cfcf68184e8558fcea751ef6d95b6e5d86ae1 (diff) | |
| parent | 6c50e1dc0625f89884cff40b22627091efa37708 (diff) | |
| download | guix-4d14902b9402a83db444d8d6818d0a4f438ce8c4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/cpp.scm')
| -rw-r--r-- | gnu/packages/cpp.scm | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 9e95bacd65..1c98e381ab 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +34,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages tls)) + #:use-module (gnu packages tls) + #:use-module (gnu packages web)) (define-public libzen (package @@ -246,7 +248,7 @@ intuitive syntax and trivial integration.") (define-public xtl (package (name "xtl") - (version "0.6.4") + (version "0.6.7") (source (origin (method git-fetch) (uri @@ -255,7 +257,7 @@ intuitive syntax and trivial integration.") (commit version))) (sha256 (base32 - "0rwdw43fq7c581m6frzsd06h71sf7abk7danwa3cp6wd6cgkwdbk")) + "0dds2fzyis42b1c3biqr3ir9l96csyyfkwrkm3fqjksdhgdklzmj")) (file-name (git-file-name name version)))) (native-inputs `(("googletest" ,googletest) @@ -276,3 +278,34 @@ intuitive syntax and trivial integration.") (description "xtl is a C++ header-only template library providing basic tools (containers, algorithms) used by other QuantStack packages.") (license license:bsd-3))) + +(define-public ccls + (package + (name "ccls") + (version "0.20190823.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MaskRay/ccls") + (commit version))) + (sha256 + (base32 "1sx31zp6q2qc6fz3r78rx34zp2x4blrqzxwbpww71vb6lp1clmdm")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ; no check target. + (inputs + `(("rapidjson" ,rapidjson))) + (native-inputs + `(("clang" ,clang) + ("llvm" ,llvm))) + (home-page "https://github.com/MaskRay/ccls") + (synopsis "C/C++/Objective-C language server") + (description + "@code{ccls} is a server implementing the Language Server Protocol (LSP) +for C, C++ and Objective-C languages. It uses @code{clang} to perform static +code analysis and supports cross references, hierarchies, completion and +syntax highlighting. @code{ccls} is derived from @code{cquery} which is not +maintained anymore.") + (license license:asl2.0))) |