diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2020-05-16 17:04:35 +0200 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2020-07-17 04:10:51 +0200 |
| commit | fff4fcc4e22f11788dfaf103141ff6cffbf788dc (patch) | |
| tree | 6bb6fb6d4aada8472cedb7d25442ab49b8994c11 /gnu/packages/maths.scm | |
| parent | e0ee843f77b495cc2d8f4a402358b4628a687bfa (diff) | |
| download | guix-patches-fff4fcc4e22f11788dfaf103141ff6cffbf788dc.tar guix-patches-fff4fcc4e22f11788dfaf103141ff6cffbf788dc.tar.gz | |
gnu: java-junit: Install from pom file.
* gnu/packages/java.scm (java-junit)[arguments]: Replace install phase.
(java-hamcrest-core)[arguments]: Replace install phase.
(java-hamcrest-library)[arguments]: Replace install phase.
(java-cisd-jhdf5, java-commons-math3, java-commons-collections4)
(java-commons-io, java-commons-exec-1.1, java-commons-exec)
(java-commons-lang3, java-commons-codec, java-native-access)
(java-native-access-platform, java-hamcrest-all): Change junit and hamcrest
jar location accordingly.
(java-hamcrest-all): Use old install phase of java-hamcrest-core.
* gnu/packages/maths.scm (java-hdf): Change junit and hamcrest jar
location accordingly.
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b75fd25a23..ee4d30cfbe 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1187,10 +1187,15 @@ extremely large and complex data collections.") (jhdf (string-append lib "/jhdf.jar")) (jhdf5 (string-append lib "/jhdf5.jar")) (testjars - (map (lambda (i) - (string-append (assoc-ref inputs i) - "/share/java/" i ".jar")) - '("junit" "hamcrest-core" "slf4j-api" "slf4j-simple"))) + (append + (map (lambda (i) + (string-append (assoc-ref inputs i) + "/share/java/" i ".jar")) + '("slf4j-api" "slf4j-simple")) + (list + (car (find-files (assoc-ref inputs "junit") "jar$")) + (car (find-files (assoc-ref inputs "hamcrest-core") + "jar$"))))) (class-path (string-join `("." ,build-dir ,jhdf ,jhdf5 ,@testjars) ":"))) |