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

gnu: java-asm: Update to 6.0. 

* gnu/packages/java.scm (java-asm): Update to 6.0.
[propagated-inputs]: Add java-aqute-bndlib.
[arguments]: Adjust #:make-flags accordingly.

Co-authored-by: Chris Marusich <cmmarusich@gmail.com>
This commit is contained in:
Gábor Boskovits 2018-01-07 22:23:56 +01:00 committed by Chris Marusich
parent 8329cb53d3
commit d0e9ded713
No known key found for this signature in database
GPG Key ID: DD409A15D822469D
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/java.scm
View File

@ -7,6 +7,8 @@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2660,23 +2662,31 @@ archives (jar).")
(define-public java-asm (define-public java-asm
(package (package
(name "java-asm") (name "java-asm")
(version "5.2") (version "6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.forge.ow2.org/asm/" (uri (string-append "http://download.forge.ow2.org/asm/"
"asm-" version ".tar.gz")) "asm-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0kxvmv5275rnjl7jv0442k3wjnq03ngkb7sghs78avf45pzm4qgr")))) "115l5pqblirdkmzi32dxx7gbcm4jy0s14y5wircr6h8jdr9aix00"))))
(build-system ant-build-system) (build-system ant-build-system)
(propagated-inputs
`(("java-aqute-bndlib" ,java-aqute-bndlib)))
(arguments (arguments
`(#:build-target "compile" `(#:build-target "compile"
;; The tests require an old version of Janino, which no longer compiles ;; The tests require an old version of Janino, which no longer compiles
;; with the JDK7. ;; with the JDK7.
#:tests? #f #:tests? #f
#:make-flags
(list
;; We don't need these extra ant tasks, but the build system asks us to ;; We don't need these extra ant tasks, but the build system asks us to
;; provide a path anyway. ;; provide a path anyway.
#:make-flags (list (string-append "-Dobjectweb.ant.tasks.path=foo")) "-Dobjectweb.ant.tasks.path=dummy-path"
;; The java-aqute.bndlib JAR file will be put onto the classpath and
;; used during the build automatically by ant-build-system, but
;; java-asm's build.xml fails unless we provide something here.
"-Dbiz.aQute.bnd.path=dummy-path")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'install 'build-jars (add-before 'install 'build-jars