Artyom V. Poptsov wrote 2 years ago
(address . guix-patches@gnu.org)
87edw9vpc8.fsf@gmail.com
Hello,
this patch fixes a bug that was likely introduced in
8efed18128b8bda3d7e4db460998dc20e3d6dc2f by switching from "url-fetch"
method to "git-fetch" in "java-slf4j-api" package.
From c7a022bfc3b6b36990a17ecfa12332889ad5aaa6 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sat, 17 Sep 2022 20:48:19 +0300
Subject: [PATCH 1/2] gnu: maven-slf4j-provider: Bugfix.
* gnu/packages/maven.scm (maven-slf4j-provider): Bugfix: Don't use "tar" to
extract "java-slf4j-simple-source" as it is already unpacked; recursively copy
the source instead.
---
gnu/packages/maven.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Toggle diff (16 lines)
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 28ec4eb9a8..50c4b457b5 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1786,8 +1786,8 @@ (define-public maven-slf4j-provider
(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"
- (invoke "tar" "xf" (assoc-ref inputs "java-slf4j-simple-source"))
(for-each delete-file (find-files "." "StaticLoggerBinder.java")))
(for-each
(lambda (simple)
--
2.34.1
From 4c91c947e4cf069bdeb7312d308f0082dd6afa29 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
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(-)
Toggle diff (65 lines)
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
Thanks,
- Artyom
--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
-----BEGIN PGP SIGNATURE-----
iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmMmDvcZHHBvcHRzb3Yu
YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigLwnlB/0Qnfqw3ormHJz8tn0NF5G+
Y6Cezx+rsLGIR1mziWALkK1TsqFNrGIW40+HZMteCdB16gEb60skO3kF647eK+Dr
eQowrDcSGPF/Elhl9bBbkWMA9Co+bJ8Fyov5ZCvLaeIbc+nO3A0bgTuTWuW4LhDj
SVvv3vQnz/ImBihDuAtbUiCCdQc4cIvBjDqhgqtn29cGn04Ex3NLamLANMhi1Jn3
XhETRw00eCXrCzXN7esWE36fcqjB5UMAbjKW62AToKJPgxjfE8h4e2v0iSSAmVXO
7SWu8Ka0hVgHSiXVQ4Iul90EWqjmYCKQ6U3bR2CX22O5oKgWICOnNr61CToqhNsA
=6lYa
-----END PGP SIGNATURE-----