ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java-hamcrest-all: Build with icedtea-8.

Browse source 
* gnu/packages/java.scm (java-hamcrest-all)[arguments]: Build with icedtea-8;
do not disable tests.
[inputs]: Remove java-hamcrest-core.
This commit is contained in:
Ricardo Wurmus 2018-03-11 20:02:10 +01:00
parent fb94174fc3
commit bfc007e13e
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/java.scm
View file

@ -3886,15 +3886,8 @@ (define-public java-hamcrest-all
(package (inherit java-hamcrest-core) (package (inherit java-hamcrest-core)
(name "java-hamcrest-all") (name "java-hamcrest-all")
(arguments (arguments
(substitute-keyword-arguments (package-arguments java-hamcrest-core) `(#:jdk ,icedtea-8
;; FIXME: a unit test fails because org.hamcrest.SelfDescribing is not ,@(substitute-keyword-arguments (package-arguments java-hamcrest-core)
;; found, although it is part of the hamcrest-core library that has
;; just been built.
;;
;; Fixing this one test is insufficient, though, and upstream confirmed
;; that the latest hamcrest release fails its unit tests when built
;; with Java 7. See https://github.com/hamcrest/JavaHamcrest/issues/30
((#:tests? _) #f)
((#:build-target _) "bigjar") ((#:build-target _) "bigjar")
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
@ -3908,17 +3901,15 @@ (define-public java-hamcrest-all
(string-join (string-join
(cons line (cons line
(append (append
(find-files (assoc-ref inputs "java-hamcrest-core") "\\.jar$")
(find-files (assoc-ref inputs "java-junit") "\\.jar$") (find-files (assoc-ref inputs "java-junit") "\\.jar$")
(find-files (assoc-ref inputs "java-jmock") "\\.jar$") (find-files (assoc-ref inputs "java-jmock") "\\.jar$")
(find-files (assoc-ref inputs "java-easymock") "\\.jar$"))) (find-files (assoc-ref inputs "java-easymock") "\\.jar$")))
";"))) ";")))
#t)))))) #t)))))))
(inputs (inputs
`(("java-junit" ,java-junit) `(("java-junit" ,java-junit)
("java-jmock" ,java-jmock-1) ("java-jmock" ,java-jmock-1)
("java-easymock" ,java-easymock) ("java-easymock" ,java-easymock)
("java-hamcrest-core" ,java-hamcrest-core)
,@(package-inputs java-hamcrest-core))))) ,@(package-inputs java-hamcrest-core)))))
(define-public java-jopt-simple (define-public java-jopt-simple