nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Rename stringtemplate4 to java-stringtemplate. 

* gnu/packages/java.scm (stringtemplate4): Rename this...
(java-stringtemplate): ...to this.
(stringtemplate4-4.0.6)[inherit]: Adjust accordingly.
(antlr3)[inputs]: Likewise.
This commit is contained in:
Ricardo Wurmus 2017-05-16 13:22:01 +02:00
parent f4aa4cfe00
commit 64b7efc0db
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/java.scm
View File

@ -3210,9 +3210,9 @@ StringTemplate also powers ANTLR.")
;; only grammar files with the antlr2 syntax. ;; only grammar files with the antlr2 syntax.
;; So we build antlr3.1 -> antlr3.3 -> ST4.0.6 -> antlr3-bootstrap -> ST4 -> antlr3. ;; So we build antlr3.1 -> antlr3.3 -> ST4.0.6 -> antlr3-bootstrap -> ST4 -> antlr3.
(define-public stringtemplate4 (define-public java-stringtemplate
(package (inherit java-stringtemplate-3) (package (inherit java-stringtemplate-3)
(name "stringtemplate4") (name "java-stringtemplate")
(version "4.0.8") (version "4.0.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -3244,8 +3244,7 @@ StringTemplate also powers ANTLR.")
("java-stringtemplate" ,java-stringtemplate-3))))) ("java-stringtemplate" ,java-stringtemplate-3)))))
(define stringtemplate4-4.0.6 (define stringtemplate4-4.0.6
(package (package (inherit java-stringtemplate)
(inherit stringtemplate4)
(name "stringtemplate4") (name "stringtemplate4")
(version "4.0.6") (version "4.0.6")
(source (origin (source (origin
@ -3347,7 +3346,7 @@ import org.antlr.grammar.v3.ANTLRTreePrinter;"))
(inputs (inputs
`(("junit" ,java-junit) `(("junit" ,java-junit)
("stringtemplate" ,java-stringtemplate-3) ("stringtemplate" ,java-stringtemplate-3)
("stringtemplate4" ,stringtemplate4))) ("stringtemplate4" ,java-stringtemplate)))
(propagated-inputs (propagated-inputs
`(("stringtemplate" ,java-stringtemplate-3) `(("stringtemplate" ,java-stringtemplate-3)
("antlr" ,antlr2) ("antlr" ,antlr2)