From 4c91c947e4cf069bdeb7312d308f0082dd6afa29 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 17 Sep 2022 21:10:04 +0300 Subject: [PATCH 2/2] gnu: maven-slf4j-provider: Fix style. * gnu/packages/maven.scm (maven-slf4j-provider): Fix style. --- gnu/packages/maven.scm | 52 ++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 50c4b457b5..1b01116b88 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1780,31 +1780,33 @@ (define-public maven-slf4j-provider (arguments `(#:jar-name "maven-slf4j-provider.jar" #:source-dir "maven-slf4j-provider/src/main/java" - #:tests? #f; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-slf4j - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "generated-sources") - (copy-recursively (assoc-ref inputs "java-slf4j-simple-source") "generated-sources") - (with-directory-excursion "generated-sources" - (for-each delete-file (find-files "." "StaticLoggerBinder.java"))) - (for-each - (lambda (simple) - (for-each - (lambda (java) - (copy-file java - (string-append - "maven-slf4j-provider/src/main/java/org/slf4j/impl/" - (basename java)))) - (find-files (string-append simple "/src/main/java/") "\\.java$"))) - (find-files "generated-sources" "slf4j-simple" #:directories? #t)))) - (replace 'install - (install-from-pom "maven-slf4j-provider/pom.xml"))))) - (inputs - `(("java-slf4j-api" ,java-slf4j-api) - ("java-slf4j-simple-source" ,(package-source java-slf4j-simple)) - ("maven-shared-utils" ,maven-shared-utils))) + #:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (add-after 'unpack 'unpack-slf4j + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "generated-sources") + (copy-recursively (assoc-ref inputs + "java-slf4j-simple-source") + "generated-sources") + (with-directory-excursion "generated-sources" + (for-each delete-file + (find-files "." "StaticLoggerBinder.java"))) + (for-each (lambda (simple) + (for-each (lambda (java) + (copy-file java + (string-append + "maven-slf4j-provider/src/main/java/org/slf4j/impl/" + (basename java)))) + (find-files (string-append simple + "/src/main/java/") + "\\.java$"))) + (find-files "generated-sources" "slf4j-simple" + #:directories? #t)))) + (replace 'install + (install-from-pom "maven-slf4j-provider/pom.xml"))))) + (inputs `(("java-slf4j-api" ,java-slf4j-api) + ("java-slf4j-simple-source" ,(package-source java-slf4j-simple)) + ("maven-shared-utils" ,maven-shared-utils))) (native-inputs (list unzip)))) (define-public maven-embedder -- 2.34.1