From e44112e1a5fbac4041f7d4a38d164d3e520848c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 May 2017 12:43:49 +0200 Subject: [PATCH] gnu: Rename stringtemplate3 to java-stringtemplate-3. * gnu/packages/java.scm (stringtemplate3): Replace this... (java-stringtemplate-3): ...with this. [name]: Change to "java-stringtemplate". (stringtemplate4)[inputs]: Adjust accordingly. (stringtemplate4-4.0.6)[inputs]: Likewise. (antlr3)[inputs, propagated-inputs]: Likewise. (antlr3-3.3)[propagated-inputs, arguments]: Likewise. (antlr3-3.1)[propagated-inputs]: Likewise. --- gnu/packages/java.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4a381b6a1c..895cb730b8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3149,9 +3149,9 @@ (define-public antlr2 tree walking, and translation.") (license license:public-domain))) -(define-public stringtemplate3 +(define-public java-stringtemplate-3 (package - (name "stringtemplate3") + (name "java-stringtemplate") (version "3.2.1") (source (origin (method url-fetch) @@ -3231,7 +3231,7 @@ (define-public stringtemplate4 (inputs `(("antlr3" ,antlr3-bootstrap) ("antlr2" ,antlr2) - ("stringtemplate" ,stringtemplate3))) + ("java-stringtemplate" ,java-stringtemplate-3))) (home-page "http://www.stringtemplate.org") (synopsis "Template engine to generate formatted text output") (description "StringTemplate is a java template engine (with ports for C#, @@ -3257,7 +3257,7 @@ (define stringtemplate4-4.0.6 (inputs `(("antlr3" ,antlr3-3.3) ("antlr2" ,antlr2) - ("stringtemplate" ,stringtemplate3))))) + ("java-stringtemplate" ,java-stringtemplate-3))))) (define-public antlr3 (package @@ -3344,10 +3344,10 @@ (define-public antlr3 ("antlr3" ,antlr3-bootstrap))) (inputs `(("junit" ,java-junit) - ("stringtemplate" ,stringtemplate3) + ("stringtemplate" ,java-stringtemplate-3) ("stringtemplate4" ,stringtemplate4))) (propagated-inputs - `(("stringtemplate" ,stringtemplate3) + `(("stringtemplate" ,java-stringtemplate-3) ("antlr" ,antlr2) ("stringtemplate4" ,stringtemplate4-4.0.6))) (home-page "http://www.antlr3.org") @@ -3400,7 +3400,7 @@ (define antlr3-3.3 (string-append "#!" (which "sh") "\n" "java -cp " jar "/antlr3-3.3.jar:" (string-concatenate - (find-files (assoc-ref inputs "stringtemplate") + (find-files (assoc-ref inputs "java-stringtemplate") ".*\\.jar")) ":" (string-concatenate @@ -3450,7 +3450,7 @@ (define antlr3-3.3 (inputs `(("junit" ,java-junit))) (propagated-inputs - `(("stringtemplate" ,stringtemplate3) + `(("java-stringtemplate" ,java-stringtemplate-3) ("antlr" ,antlr2) ("antlr3" ,antlr3-3.1))))) @@ -3522,7 +3522,7 @@ (define antlr3-3.1 (inputs `(("junit" ,java-junit))) (propagated-inputs - `(("stringtemplate" ,stringtemplate3))))) + `(("stringtemplate" ,java-stringtemplate-3))))) (define-public java-asm (package