diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2026-03-28 17:45:56 +0100 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2026-04-20 08:31:15 +0200 |
| commit | 86330b7344641a817761bd2c0d61f429736e0e5b (patch) | |
| tree | f704da77301537441321af9354489ac8c398d09d /gnu | |
| parent | d3a01084151655b59470286453ef29998edd6ab2 (diff) | |
gnu: ant-junit: Deprecate.
* gnu/packages/bioinformatics (java-picard-1.113): Remove ant-junit
dependency.
* gnu/packages/groovy.scm (groovy-ant): Remove ant-junit dependency.
* gnu/packages/java.scm (ant-junit): Deprecate in favor of ant/java8.
Change-Id: Ic877958cc559acd710ac38b7b9d4b271d3982c3f
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/groovy.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/java.scm | 30 |
3 files changed, 3 insertions, 31 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 70b2a3a46d2..c15a717f65c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm | |||
| @@ -9357,7 +9357,6 @@ VCF.") | |||
| 9357 | zlib)) | 9357 | zlib)) |
| 9358 | (native-inputs | 9358 | (native-inputs |
| 9359 | `(("ant-apache-bcel" ,ant-apache-bcel) | 9359 | `(("ant-apache-bcel" ,ant-apache-bcel) |
| 9360 | ("ant-junit" ,ant-junit) | ||
| 9361 | ("java-testng" ,java-testng) | 9360 | ("java-testng" ,java-testng) |
| 9362 | ("java-commons-bcel" ,java-commons-bcel) | 9361 | ("java-commons-bcel" ,java-commons-bcel) |
| 9363 | ("java-jcommander" ,java-jcommander) | 9362 | ("java-jcommander" ,java-jcommander) |
diff --git a/gnu/packages/groovy.scm b/gnu/packages/groovy.scm index 3e8eae44ae4..9655f482814 100644 --- a/gnu/packages/groovy.scm +++ b/gnu/packages/groovy.scm | |||
| @@ -431,8 +431,7 @@ similar to javadoc.")))) | |||
| 431 | ("java-asm-analysis" ,java-asm-analysis-8) | 431 | ("java-asm-analysis" ,java-asm-analysis-8) |
| 432 | ,@(package-inputs base))) | 432 | ,@(package-inputs base))) |
| 433 | (native-inputs | 433 | (native-inputs |
| 434 | `(("ant-junit" ,ant-junit) | 434 | `(("groovy-bootstrap" ,groovy-bootstrap) |
| 435 | ("groovy-bootstrap" ,groovy-bootstrap) | ||
| 436 | ("groovy-xml" ,groovy-xml) | 435 | ("groovy-xml" ,groovy-xml) |
| 437 | ("groovy-test" ,groovy-test) | 436 | ("groovy-test" ,groovy-test) |
| 438 | ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) | 437 | ("groovy-tests-bootstrap" ,groovy-tests-bootstrap) |
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3058431e297..6ee46330643 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm | |||
| @@ -2154,34 +2154,8 @@ build process and its dependencies, whereas Make uses Makefile format.") | |||
| 2154 | (modify-inputs (package-inputs ant/java8) | 2154 | (modify-inputs (package-inputs ant/java8) |
| 2155 | (prepend java-commons-bcel))))) | 2155 | (prepend java-commons-bcel))))) |
| 2156 | 2156 | ||
| 2157 | (define-public ant-junit | 2157 | (define-deprecated-package ant-junit |
| 2158 | (package | 2158 | ant/java8) |
| 2159 | (inherit ant/java8) | ||
| 2160 | (name "ant-junit") | ||
| 2161 | (arguments | ||
| 2162 | (substitute-keyword-arguments (package-arguments ant/java8) | ||
| 2163 | ((#:phases phases) | ||
| 2164 | #~(modify-phases #$phases | ||
| 2165 | (add-after 'unpack 'link-junit | ||
| 2166 | (lambda* (#:key inputs #:allow-other-keys) | ||
| 2167 | (for-each (lambda (file) | ||
| 2168 | (symlink file | ||
| 2169 | (string-append "lib/optional/" | ||
| 2170 | (basename file)))) | ||
| 2171 | (find-files (assoc-ref inputs "java-junit") | ||
| 2172 | "\\.jar$")))) | ||
| 2173 | (add-after 'build 'install | ||
| 2174 | (lambda _ | ||
| 2175 | (let ((share (string-append #$output "/share/java")) | ||
| 2176 | (bin (string-append #$output "/bin")) | ||
| 2177 | (lib (string-append #$output "/lib"))) | ||
| 2178 | (mkdir-p share) | ||
| 2179 | (install-file (string-append lib "/ant-junit.jar") share) | ||
| 2180 | (delete-file-recursively bin) | ||
| 2181 | (delete-file-recursively lib)))))))) | ||
| 2182 | (inputs | ||
| 2183 | (modify-inputs (package-inputs ant/java8) | ||
| 2184 | (prepend java-junit))))) | ||
| 2185 | 2159 | ||
| 2186 | (define-public libantlr3c | 2160 | (define-public libantlr3c |
| 2187 | (package | 2161 | (package |
