summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-10-21 16:57:58 +0200
committerMarius Bakke <marius@gnu.org>2020-10-22 18:41:28 +0200
commit0658cc83d2fb8e6591666f622efd5ca8f27c8d86 (patch)
treea9415f3374c0d98910c6ff1f724b6be7f8bd9446
parentcad55e91fd5a481279e6286a2728761b8da7c07a (diff)
gnu: universal-ctags: Update to 5.9.20201018.0.
* gnu/packages/code.scm (universal-ctags): Update to 5.9.20201018.0. [native-inputs]: Replace PACKCC with a forked origin.
-rw-r--r--gnu/packages/code.scm150
1 files changed, 80 insertions, 70 deletions
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index e3e4c6738c..86f633a28b 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -339,81 +339,91 @@ features that are not supported by the standard @code{stdio} implementation.")
"http://sourceforge.net/p/ctrio/git/ci/master/tree/README"))))
(define-public universal-ctags
- ;; The project is unable to decide whether to use 1.0 or 6.0 as the
- ;; first public release version (it started as a fork of another ctags
- ;; project that was on version 5.8), and five years later have been
- ;; unable to tag a release. Thus, we just take the master branch.
- (let ((commit "0c78c0c4a68030df0d025c90bad291108b5e7107")
- (revision "0"))
- (package
- (name "universal-ctags")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/universal-ctags/ctags")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0lnxc3kwi6srw0015m16vyjfdc7pdr9d1qzxjsbfv3c69ag87jhc"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove the bundled PackCC and associated build rules.
- (substitute* "Makefile.am"
- (("\\$\\(packcc_verbose\\)\\$\\(PACKCC\\)")
- "packcc")
- (("\\$\\(PEG_SRCS\\) \\$\\(PEG_HEADS\\): packcc\\$\\(EXEEXT\\)")
- "$(PEG_SRCS) $(PEG_HEADS):")
- (("noinst_PROGRAMS \\+= packcc")
- ""))
- (delete-file-recursively "misc/packcc")
- #t))))
- (build-system gnu-build-system)
- (arguments
- '(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'make-files-writable
- (lambda _
- (for-each make-file-writable (find-files "."))
- #t))
- (add-before 'bootstrap 'patch-optlib2c
- (lambda _
- ;; The autogen.sh script calls out to optlib2c to
- ;; generate translations, so we can not wait for the
- ;; patch-source-shebangs phase.
- (patch-shebang "misc/optlib2c")
- #t))
- (add-before 'check 'patch-tests
- (lambda _
- (substitute* "misc/units"
- (("SHELL=/bin/sh")
- (string-append "SHELL=" (which "sh"))))
- (substitute* "Tmain/utils.sh"
- (("/bin/echo") (which "echo")))
- #t)))))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("packcc" ,packcc)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("jansson" ,jansson)
- ("libseccomp" ,libseccomp)
- ("libxml2" ,libxml2)
- ("libyaml" ,libyaml)))
- (home-page "https://ctags.io/")
- (synopsis "Generate tag files for source code")
- (description
- "Universal Ctags generates an index (or tag) file of language objects
+ (package
+ (name "universal-ctags")
+ (version "5.9.20201018.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/universal-ctags/ctags")
+ (commit (string-append "p" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "174p1w20pl25k996hfw61inw4mqhskmmic1lyw2m65firmkyvs7x"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove the bundled PackCC and associated build rules.
+ (substitute* "Makefile.am"
+ (("\\$\\(packcc_verbose\\)\\$\\(PACKCC\\)")
+ "packcc")
+ (("\\$\\(PEG_SRCS\\) \\$\\(PEG_HEADS\\): packcc\\$\\(EXEEXT\\)")
+ "$(PEG_SRCS) $(PEG_HEADS):")
+ (("noinst_PROGRAMS \\+= packcc")
+ ""))
+ (delete-file-recursively "misc/packcc")
+ #t))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'make-files-writable
+ (lambda _
+ (for-each make-file-writable (find-files "."))
+ #t))
+ (add-before 'bootstrap 'patch-optlib2c
+ (lambda _
+ ;; The autogen.sh script calls out to optlib2c to
+ ;; generate translations, so we can not wait for the
+ ;; patch-source-shebangs phase.
+ (patch-shebang "misc/optlib2c")
+ #t))
+ (add-before 'check 'patch-tests
+ (lambda _
+ (substitute* "misc/units"
+ (("SHELL=/bin/sh")
+ (string-append "SHELL=" (which "sh"))))
+ (substitute* "Tmain/utils.sh"
+ (("/bin/echo") (which "echo")))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ;; XXX: Use ctags' own packcc fork even though we meticolously unbundle
+ ;; it above. Mainly for historical reasons, and perhaps their changes
+ ;; get upstreamed in the future.
+ ("packcc"
+ ,(let ((commit "03402b79505dc0024f90d5bebfd7e5d3fb62da9a"))
+ (package
+ (inherit packcc)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/universal-ctags/packcc")
+ (commit commit)))
+ (file-name (git-file-name "packcc-for-ctags"
+ (string-take commit 7)))
+ (sha256
+ (base32
+ "0vxpdk9l2lf7f32nx1p3b3xmw2kw2wp95vnf9bc4lyqrg69pblm0")))))))
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("jansson" ,jansson)
+ ("libseccomp" ,libseccomp)
+ ("libxml2" ,libxml2)
+ ("libyaml" ,libyaml)))
+ (home-page "https://ctags.io/")
+ (synopsis "Generate tag files for source code")
+ (description
+ "Universal Ctags generates an index (or tag) file of language objects
found in source files for many popular programming languages. This index
makes it easy for text editors and other tools to locate the indexed items.
Universal Ctags improves on traditional ctags because of its multilanguage
support, its ability for the user to define new languages searched by regular
expressions, and its ability to generate emacs-style TAGS files.")
- (license license:gpl2+))))
+ (license license:gpl2+)))
(define-public withershins
(package