diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/maven.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/maven.scm')
| -rw-r--r-- | gnu/packages/maven.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index b7794c4e89..fc3a63c263 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -32,9 +32,9 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages java) + #:use-module (gnu packages java-xml) #:use-module (gnu packages maven-parent-pom) #:use-module (gnu packages web) - #:use-module (gnu packages xml) #:use-module (ice-9 match)) (define-public maven-resolver-api @@ -2319,7 +2319,6 @@ reporting or the build process."))) #:modules ((guix build ant-build-system) (guix build java-utils) - (guix build syscalls) (guix build utils)) #:phases (modify-phases %standard-phases @@ -2328,7 +2327,7 @@ reporting or the build process."))) ;; The model has almost not changed, but the newer version is ;; needed to prevent an error in the newer modello we have (let ((source (assoc-ref inputs "maven-source")) - (dir (mkdtemp! "maven-source-XXXXXXXX"))) + (dir (mkdtemp "maven-source-XXXXXXXX"))) (with-directory-excursion dir (invoke "tar" "xf" source) (copy-file (car (find-files "." "maven.mdo")) @@ -3462,8 +3461,7 @@ internal to the SureFire Logger API. It is designed to have no dependency.") (add-before 'install 'fix-pom-dependency-versions (lambda _ (substitute* "pom.xml" - (("1.11") ,(package-version java-commons-compress)) - (("1.13") ,(package-version java-commons-codec))) + (("1.11") ,(package-version java-commons-codec))) (substitute* "pom.xml" (("commonsLang3Version>.*") (string-append |