b42b5afdf4
gnu: Fix misplaced commas (unquotes).
...
* gnu/packages/java.scm (ant-bootstrap),
gnu/packages/kde.scm (kdenlive),
gnu/packages/lxqt.scm (lxqt-panel, lxqt-runner),
gnu/packages/mpd.scm (ncmpc),
gnu/packages/opencl.scm (beignet),
gnu/packages/pdf.scm (zathura-pdf-mupdf),
gnu/packages/video.scm (streamlink),
gnu/packages/web-browsers.scm (luakit),
gnu/packages/web.scm (perl-libwww),
gnu/packages/wm.scm (ghc-xmonad-contrib): Fix misplaced commas (unquotes).
2018-12-13 00:08:05 -05:00
accb5c3100
gnu: openjdk: Make idlj respect SOURCE_DATE_EPOCH.
...
* gnu/packages/patches/openjdk-10-idlj-reproducibility.patch: New file.
* gnu/packages/java.scm (openjdk10)[source]: Use it.
* gnu/locale.mk (dist_patch_DATA): Register it.
2018-12-09 12:55:36 +01:00
194451347d
Merge branch 'core-updates'
2018-12-03 08:52:17 +01:00
f5cc5ead58
gnu: Add java-xmlunit-matchers.
...
* gnu/packages/java.scm (java-xmlunit-matchers): New variable.
2018-12-01 23:56:32 +01:00
9cf4ff199c
Merge remote-tracking branch 'origin/master' into core-updates
2018-11-21 19:41:43 +02:00
3c4103c84f
gnu: java-jansi-native: Add "mips64el-linux" case.
...
* gnu/packages/java.scm (java-jansi-native)[arguments]: Add
"mips64el-linux" in 'match' clause.
2018-11-20 18:39:22 +01:00
4f70db97a0
Merge branch 'master' into core-updates
2018-11-20 01:14:12 +01:00
28e32b14e4
gnu: clojure: Move from java to lisp.
...
* gnu/packages/java.scm (clojure): Move from here...
* gnu/packages/lisp.scm (clojure): ...to here.
2018-11-19 12:01:25 +01:00
16b89ecc1f
gnu: Add openjdk10.
...
* gnu/packages/java.scm (openjdk10): New variable.
2018-11-01 21:16:59 +01:00
dd74105925
gnu: Add openjdk9.
...
* gnu/packages/java.scm (openjdk9): New variable.
2018-11-01 20:34:08 +01:00
33428d1267
gnu: javacc: Bootstrap from javacc-4 instead of bootstrap binary.
...
* gnu/packages/java.scm (javacc)[source](snippet): Delete bootstrap binary.
[arguments]: Set 'bootstrap-jar' path.
[native-inputs]: Add 'javacc-4'.
2018-10-18 14:59:55 +02:00
6662d65f96
gnu: javacc: Use snippet to delete bundled jars.
...
* gnu/packages/java.scm (javacc-4)[source](snippet, modules): New fields.
[arguments]: Remove 'delete-bundled-libs' phase and add 'delete-tests'
phase.
* gnu/packages/java.scm (javacc)[source](snippet, modules): New fields.
[arguments]: Remove 'delete-bundled-libs' phase.
2018-10-18 14:59:52 +02:00
53fb0476ec
gnu: javacc: 'javacc' now inherits from 'javacc-4'.
...
* gnu/packages/java.scm (javacc, javacc-4): 'javacc' now inherits from
'javacc-4' instead of the opposite around.
2018-10-18 14:59:44 +02:00
ae6922ed14
gnu: Add java-jakarta-regexp.
...
* gnu/packages/java.scm (java-jakarta-regexp): New variable.
2018-10-07 15:28:37 +02:00
5165fb40f4
gnu: Add java-fasterxml-jackson-modules-base-mrbean.
...
* gnu/packages/java.scm (java-fasterxml-jackson-modules-base-mrbean): New
variable.
2018-10-04 03:05:10 +02:00
46f9022c99
gnu: Add java-commons-exec.
...
* gnu/packages/java.scm (java-commons-exec-1.1): New variable.
(java-commons-exec): New variable.
2018-10-04 00:06:42 +02:00
869250809b
Merge branch 'master' into staging
2018-07-30 18:08:28 +02:00
6219685922
gnu: clojure: Fix index generation.
...
* gnu/packages/java.scm (clojure)[arguments]: Add phase 'fix-manifest-classpath to remove
offending directory entry making indexing fail.
2018-07-29 08:41:34 +02:00
1af575f04d
Merge branch 'master' into staging
2018-07-28 18:34:59 +02:00
4b472f6a06
gnu: java: Use java-javaee-servletapi instead of java-tomcat.
...
* gnu/packages/java.scm(java-eclipse-sisu-inject)[inputs]: Remove java-tomcat, add java-javaee-servletapi.
(logback-core)[inputs]: Likewise.
* gnu/packages/maven.scm (maven-wagon-provider-test)[inputs]: Likewise.
* gnu/packages/web.scm (java-eclipse-jetty-webapp)[inputs]: Likewise.
(java-eclipse-jetty-server)[inputs]: Likewise.
(java-eclipse-jetty-http)[inputs]: Likewise.
(java-eclipse-jetty-jmx)[inputs]: Likewise.
(java-eclipse-jetty-io)[inputs]: Likewise.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-07-25 00:27:12 +02:00
10d62a88bf
gnu: Add java-javaee-servletapi.
...
* gnu/packages/java.scm (java-javaee-servletapi): New variable.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-07-25 00:27:10 +02:00
10eddaca0e
gnu: java: Use java-classpathx-servletapi instead of java-tomcat where possible.
...
* gnu/package/java.scm (java-commons-jxpath)[inputs]: Remove java-tomcat, add java-classpathx-servletapi.
(java-guice-servlet)[inputs]: Likewise.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-07-25 00:27:08 +02:00
b1ccd2a1ec
gnu: java-logback-core: Add file-name field.
...
* gnu/package/java.scm (java-logback-core)[source]: Add file-name field.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-07-25 00:27:05 +02:00
9936ffe77d
gnu: java-guice: Remove jars.
...
* gnu/packages/java.scm (java-guice)[source]: Add snippet to delete jar-files.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2018-07-25 00:26:37 +02:00
9d2160171c
gnu: java-asm: Add missing propagated-input.
...
* gnu/packages/java.scm (java-asm)[propagated-inputs]: Add java-aqute-libg.
2018-07-24 07:11:48 +02:00
33aa65e0ee
gnu: icedtea: Make icedtea-8 the default jdk.
...
* gnu/packages/java.scm (icedtea): Point to icedtea-8.
2018-07-24 07:11:30 +02:00
248a9e163b
gnu: java-bouncycastle: Update to 1.60 [fixes CVE-2018-1000180].
...
* gnu/packages/java.scm (java-bouncycastle): Update to 1.60.
2018-07-16 03:07:49 -04:00
34aff57c82
gnu: antlr3: Fix compilation.
...
* gnu/packages/java.scm (antlr3)[arguments]: Fix 'generate-grammar' phase.
2018-07-13 18:39:28 +02:00
873325b030
Merge branch 'master' into staging
2018-07-08 23:58:22 +02:00
a70182b099
gnu: java-plexus-compiler-api: Update to 2.8.4.
...
* gnu/packages/java.scm (java-plexus-compiler-api): Update to 2.8.4.
2018-07-04 21:05:36 +02:00
673135df30
gnu: icedtea Work around gcc segfault.
...
* gnu/packages/java.scm (icedtea-8)[native-inputs]: Add icedtea-7
patch to hotspot.
2018-07-03 02:07:14 +02:00
db024183c9
gnu: icedtea: Work around gcc segfault.
...
* gnu/packages/java.scm (icedtea-7)[native-inputs]: Add patch to hotspot.
* gnu/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2018-07-03 00:53:56 +02:00
2cc63e6fcf
gnu: java-hamcrest-all: Add java-hamcrest-core to inputs.
...
Fixes <https://debbugs.gnu.org/31390 >, probably.
* gnu/packages/java.scm (java-hamcrest-all)[inputs]: Add java-hamcrest-core.
[arguments]: Add java-hamcrest-core to the build-time classpath.
2018-07-02 16:48:03 +02:00
1cdff8cdb7
gnu: icedtea: Work around gcc segfault.
...
* gnu/packages/java.scm (icedtea-6)[arguments]: Modify phases to extract
hostspot, as after the patching it becomes an archive.
[native-inputs]: add patch to hotspot-src.
* gnu/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2018-07-02 14:41:27 +02:00
79f9b054df
Revert "gnu: icedtea-7: Build with gcc-4.9."
...
This reverts commit bc73f673e8
2018-07-02 14:39:12 +02:00
92af3ce417
Merge branch 'master' into staging
2018-07-02 12:18:58 +02:00
88aa75e922
gnu: java-jarjar: Unbundle asm.
...
* gnu/packages/java.scm (java-jarjar)[inputs]: Add java-asm-bootstrap.
[source]: Add snippet to delete bundled asm and junit.
[arguments]: Add phase 'do-not-use-bundled-asm to patch build.xml to
use system asm.
2018-06-28 17:00:32 +02:00
fa41a089a1
gnu: icedtea-7: Return #t from custom check phase.
...
* gnu/packages/java.scm (icedtea-7)[arguments]: Return #t from custom
check phase.
2018-06-28 05:47:48 -04:00
2c8ac3641a
gnu: java: Return #t from all phases and snippets.
...
* guix/build/java-utils.scm (ant-build-javadoc): Use invoke; return #t.
* guix/build/ant-build-system.scm (generate-jar-indices): Return #t and
remove vestigal plumbing.
* gnu/packages/java.scm (classpath-bootstrap, ant-bootstrap, classpath-devel)
(icedtea-6, icedtea-7, java-plexus-sec-dispatcher, ant/java8, clojure)
(java-classpathx-servletapi, java-swt, java-qdox-1.12, java-hamcrest-core)
(java-plexus-archiver, java-plexus-sec-dispatcher, java-modello-plugins-xml)
(java-asm, java-commons-collections, java-commons-bsf, java-slf4j-api)
(java-slf4j-api, java-slf4j-simple, java-stringtemplate-3)
(java-stringtemplate, antlr3, antlr3-3.3, antlr3-3.1, java-ops4j-base-lang)
(java-ops4j-pax-tinybundles, java-ops4j-pax-exam-core-spi)
(java-fasterxml-jackson-core, java-fasterxml-jackson-databind)
(java-fasterxml-jackson-modules-base-jaxb, java-ecj-3, java-ecj-3.5)
(java-fasterxml-jackson-dataformat-yaml, java-woodstox-core)
(java-fasterxml-jackson-dataformat-xml, java-testng, java-jnacl)
(java-bouncycastle, java-powermock-core, java-powermock-modules-junit4)
(java-jansi-native, java-jansi, java-commons-httpclient, java-commons-vfs)
(java-apache-ivy, java-janino, java-logback-core): Return #t from all phases
and snippets, use invoke where appropriate, and remove vestigial plumbing.
2018-06-28 03:55:37 -04:00
b6dc384a5a
gnu: ecj-javac-wrapper: Remove unnecessary build flags.
...
* gnu/packages/java.scm (ecj-javac-wrapper)[arguments]: Remove
unnecessary build flags passed to the java command.
2018-06-27 22:16:23 +03:00
3785ccd201
gnu: java-aqute-libg-bootstrap: Use base package phases.
...
* gnu/packages/java.scm (java-aqute-libg-boostrap)[arguments]: Do not ignore
base package arguments.
2018-06-27 19:54:50 +02:00
a167873c67
Merge branch 'master' into staging
2018-06-26 13:51:26 +02:00
4c65eb43c7
gnu: classpath-devel: Use INVOKE.
...
* gnu/packages/java.scm (classpath-devel)[arguments]: Substitute INVOKE
for SYSTEM*.
2018-06-26 14:46:00 +03:00
15a59c21d3
gnu: classpath@0.99: Use INVOKE.
...
* gnu/packages/java.scm (classpath@0.99 )[arguments]: Substitute INVOKE
for SYSTEM*.
2018-06-26 14:45:59 +03:00
0b302a161d
gnu: ecj-bootstrap: Use INVOKE.
...
* gnu/packages/java.scm (ecj-bootstrap)[arguments]: Substitute INVOKE
for SYSTEM*.
2018-06-26 14:45:59 +03:00
8e14634a88
gnu: ant-bootstrap: Use INVOKE.
...
* gnu/packages/java.scm (ant-bootstrap)[arguments]: Substitute INVOKE
for SYSTEM*.
2018-06-26 14:45:59 +03:00
0c66a4ebb8
gnu: classpath@0.93: Use INVOKE.
...
* gnu/packages/java.scm (classpath@0.93 )[arguments]: Substitute INVOKE
for SYSTEM*.
2018-06-26 14:45:59 +03:00
e3ec1258e3
gnu: classpath-jamvm-wrappers: Fix building on armhf-linux.
...
* gnu/packages/java.scm (classpath-jamvm-wrappers)[arguments]: Change
the flags used in custom script for armhf-linux.
2018-06-26 14:45:58 +03:00
6e6bd6f929
gnu: ecj-javac-bootstrap: Fix building on armhf-linux.
...
* gnu/packages/java.scm (ecj-javac-bootstrap)[arguments]: On armhf-linux
use different flags when calling 'java'.
2018-06-26 14:45:58 +03:00
a495998b79
gnu: ant-bootstrap: Fix building on armhf-linux.
...
* gnu/packages/java.scm (ant-bootstrap)[arguments]: On armhf-linux add
different flags to the 'bootstrap.sh' file.
2018-06-26 14:45:58 +03:00
Mark H Weaver