diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2017-05-16 13:22:01 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-05-16 15:18:17 +0200 |
| commit | 64b7efc0db00da085445e5c7f451384225797229 (patch) | |
| tree | 7baaa0698ac61f7e1d9ee9610fec95d2bac87b24 /gnu/packages | |
| parent | f4aa4cfe001d0637816577450aa2f35e23b5a653 (diff) | |
| download | guix-64b7efc0db00da085445e5c7f451384225797229.tar.gz guix-64b7efc0db00da085445e5c7f451384225797229.zip | |
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.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/java.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b45569ae3f..4841bad72f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3210,9 +3210,9 @@ StringTemplate also powers ANTLR.") ;; only grammar files with the antlr2 syntax. ;; 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) - (name "stringtemplate4") + (name "java-stringtemplate") (version "4.0.8") (source (origin (method url-fetch) @@ -3244,8 +3244,7 @@ StringTemplate also powers ANTLR.") ("java-stringtemplate" ,java-stringtemplate-3))))) (define stringtemplate4-4.0.6 - (package - (inherit stringtemplate4) + (package (inherit java-stringtemplate) (name "stringtemplate4") (version "4.0.6") (source (origin @@ -3347,7 +3346,7 @@ import org.antlr.grammar.v3.ANTLRTreePrinter;")) (inputs `(("junit" ,java-junit) ("stringtemplate" ,java-stringtemplate-3) - ("stringtemplate4" ,stringtemplate4))) + ("stringtemplate4" ,java-stringtemplate))) (propagated-inputs `(("stringtemplate" ,java-stringtemplate-3) ("antlr" ,antlr2) |