ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-clang-format: Inherit from clang.

Browse source 
* gnu/packages/emacs.scm (emacs-clang-format): Remove.
* gnu/packages/llvm.scm (emacs-clang-format): Add.
This commit is contained in:
Tim Gesthuizen 2018-11-12 22:27:41 +01:00 committed by Pierre Neidhardt
parent 3133d678a8
commit 7628ff1fc0
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
2 changed files with 27 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gnu/packages/emacs.scm
View file

@ -12533,43 +12533,6 @@ (define-public emacs-helm-slime
@end itemize\n")
(license license:gpl3+))))
(define-public emacs-clang-format
(let ((commit "5556c31528af2661bed3011bd63ffc0ed44e18a0"))
(package
(name "emacs-clang-format")
(version (git-version "0.0.0" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/emacsorphanage/clang-format")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0ynvnp3vrcpngmwakb23xv4xn7jbkg43s196q7pg9nkl13x4n2nq"))))
(build-system emacs-build-system)
(inputs
`(("clang" ,clang)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((clang (assoc-ref inputs "clang")))
;; Repo is read-only.
(chmod "clang-format.el" #o644)
(emacs-substitute-variables "clang-format.el"
("clang-format-executable"
(string-append clang "/bin/clang-format"))))
#t)))))
(home-page "https://github.com/emacsorphanage/clang-format")
(synopsis "Format code using clang-format")
(description "This package allows to filter code through clang-format to
fix its formatting. @command{clang-format} is a tool that formats C/C++/Obj-C
code according to a set of style options, see
@url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}.")
(license license:gpl3+))))
(define-public emacs-gtk-look
(package
(name "emacs-gtk-look")

27
gnu/packages/llvm.scm
View file

@ -7,6 +7,8 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@ -30,6 +32,7 @@ (define-module (gnu packages llvm)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (guix build-system emacs)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages gcc)
@ -433,3 +436,27 @@ (define-public python-llvmlite
(description
"This package provides a Python binding to LLVM for use in Numba.")
(license license:bsd-3)))
(define-public emacs-clang-format
(package
(inherit clang)
(name "emacs-clang-format")
(build-system emacs-build-system)
(inputs
`(("clang" ,clang)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((clang (assoc-ref inputs "clang")))
(copy-file "tools/clang-format/clang-format.el" "clang-format.el")
(emacs-substitute-variables "clang-format.el"
("clang-format-executable"
(string-append clang "/bin/clang-format"))))
#t)))))
(synopsis "Format code using clang-format")
(description "This package allows to filter code through @code{clang-format}
to fix its formatting. @code{clang-format} is a tool that formats
C/C++/Obj-C code according to a set of style options, see
@url{http://clang.llvm.org/docs/ClangFormatStyleOptions.html}.")))