diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2021-06-01 00:44:15 +0200 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2021-06-22 13:09:57 +0200 |
| commit | 573b43c11675a2a125ab8c7d930f32e11f9d3acb (patch) | |
| tree | f210920bfd80d75025442c7dd1c3acca6c5307fb /guix/build/maven-build-system.scm | |
| parent | 4c98db94b0271aa5371ff00cf98c0ebc70ab1a8d (diff) | |
| download | guix-573b43c11675a2a125ab8c7d930f32e11f9d3acb.tar guix-573b43c11675a2a125ab8c7d930f32e11f9d3acb.tar.gz | |
guix: maven: Simplify finding version and group information.
* guix/build/maven/pom.scm (pom-version, pom-groupid): Do not use inputs
and local packages information anymore. Adapt file to new arguments.
* guix/build/maven-build-system.scm: Adapt to new arguments.
* guix/build/java-utils.scm: Adapt to new arguments.
Diffstat (limited to 'guix/build/maven-build-system.scm')
| -rw-r--r-- | guix/build/maven-build-system.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/build/maven-build-system.scm b/guix/build/maven-build-system.scm index 534b4ebcee..0456bfdf61 100644 --- a/guix/build/maven-build-system.scm +++ b/guix/build/maven-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2020, 2021 Julien Lepiller <julien@lepiller.eu> ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,8 +82,8 @@ (let* ((pom (get-pom pom-file)) (java-inputs (map cdr inputs)) (artifact (pom-artifactid pom)) - (group (pom-groupid pom java-inputs local-packages)) - (version (pom-version pom java-inputs local-packages))) + (group (pom-groupid pom)) + (version (pom-version pom))) (let loop ((modules (pom-ref pom "modules")) (local-packages (add-local-package local-packages group artifact version))) |