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
parent
0db1393b73
commit
5bb3395c42
|
@ -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)))
|
||||
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)
|
||||
"/" artifact))
|
||||
(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 (sort versions version>?)))
|
||||
(if (null? versions)
|
||||
(if optional?
|
||||
#f
|
||||
(begin
|
||||
(format (current-error-port) "maven: ~a:~a is missing from inputs~%"
|
||||
group artifact)
|
||||
(throw 'no-such-input group artifact)))
|
||||
(car versions))))
|
||||
(car versions))))
|
||||
|
||||
(define* (find-version inputs group artifact #:optional optional?)
|
||||
(let ((packaged-version (find-packaged-version inputs group artifact))
|
||||
(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")))
|
||||
(with-output-to-file pom-file
|
||||
|
|
Reference in New Issue