diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/maven-parent-pom.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/maven-parent-pom.scm')
| -rw-r--r-- | gnu/packages/maven-parent-pom.scm | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 84af3a1c53..a47fbfa8c1 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Julien Lepiller <[email protected]> +;;; Copyright © 2020, 2021 Julien Lepiller <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +20,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system ant) @@ -321,14 +322,15 @@ other projects as their parent pom.") (base32 "0yl2hbwz2kn1hll1i00ddzn8f89bfdcjwdifz0pj2j15k1gjch7v")))) (arguments - `(#:tests? #f + (list + #:tests? #f #:phases - (modify-phases %standard-phases - (delete 'unpack) - (delete 'configure) - (delete 'build) - (replace 'install - (install-pom-file (assoc-ref %build-inputs "source"))))))))) + #~(modify-phases %standard-phases + (delete 'unpack) + (delete 'configure) + (delete 'build) + (replace 'install + (install-pom-file #$(package-source this-package))))))))) (define* (make-plexus-parent-pom version hash #:optional parent) (hidden-package @@ -495,7 +497,7 @@ tool. This package contains the Maven parent POM.") (replace 'install (install-pom-file "pom.xml"))))) (propagated-inputs - `(("maven-parent-pom" ,maven-parent-pom-22))) + (list maven-parent-pom-22)) (home-page "https://github.com/apache/maven-plugins") (synopsis "Maven parent pom for maven plugins projects") (description "This package contains the parent pom for maven plugins.") @@ -516,14 +518,15 @@ tool. This package contains the Maven parent POM.") "11skhrjgrrs6z5rw1w39ap1pzhrc99g0czip10kz7wsavg746ibm")))) (build-system ant-build-system) (arguments - `(#:tests? #f + (list + #:tests? #f #:phases - (modify-phases %standard-phases - (delete 'unpack) - (delete 'build) - (delete 'configure) - (replace 'install - (install-pom-file (assoc-ref %build-inputs "source")))))) + #~(modify-phases %standard-phases + (delete 'unpack) + (delete 'build) + (delete 'configure) + (replace 'install + (install-pom-file #$(package-source this-package)))))) (propagated-inputs `(("maven-parent-pom-27" ,maven-parent-pom-27))) (home-page "https://apache.org/maven") |