me
/
guix
Archived
1
0
Fork 0
Code

guix: maven: Look in local packages when searching for package version. 

* guix/build/maven/pom.scm (fix-pom-dependencies): Also look at local
packages when looking for a package version.
master
Julien Lepiller 2021-06-01 00:44:19 +02:00
parent 0db1393b73
commit 5bb3395c42
No known key found for this signature in database
GPG Key ID: 53D457B2D636EE82
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/build/maven/pom.scm
View File

@ -481,7 +481,7 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
(cons `(http://maven.apache.org/POM/4.0.0:version ,version) dep))) (cons `(http://maven.apache.org/POM/4.0.0:version ,version) dep)))
dep))) dep)))
(define* (find-version inputs group artifact #:optional optional?) (define (find-packaged-version inputs group artifact)
(let* ((directory (string-append "lib/m2/" (group->dir group) (let* ((directory (string-append "lib/m2/" (group->dir group)
"/" artifact)) "/" artifact))
(java-inputs (filter (java-inputs (filter
@ -493,13 +493,19 @@ Returns nothing, but overrides the @var{pom-file} as a side-effect."
(versions (append-map ls java-inputs)) (versions (append-map ls java-inputs))
(versions (sort versions version>?))) (versions (sort versions version>?)))
(if (null? versions) (if (null? versions)
(if optional?
#f #f
(begin (car versions))))
(format (current-error-port) "maven: ~a:~a is missing from inputs~%"
group artifact) (define* (find-version inputs group artifact #:optional optional?)
(throw 'no-such-input group artifact))) (let ((packaged-version (find-packaged-version inputs group artifact))
(car versions)))) (local-version (assoc-ref (assoc-ref local-packages group) artifact)))
(or local-version packaged-version
(if optional?
#f
(begin
(format (current-error-port) "maven: ~a:~a is missing from inputs~%"
group artifact)
(throw 'no-such-input group artifact))))))
(let ((tmpfile (string-append pom-file ".tmp"))) (let ((tmpfile (string-append pom-file ".tmp")))
(with-output-to-file pom-file (with-output-to-file pom-file