This is an automated email from the git hooks/post-receive script.
ieure pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 57171c3243 gnu: java-icu4j: Restore the correct uri for source.
57171c3243 is described below
commit 57171c3243eb30f87a0583e3f554c3cc6c3dd2d0
Author: Tomas Volf <[email protected]>
AuthorDate: Fri Mar 7 21:21:28 2025 +0100
gnu: java-icu4j: Restore the correct uri for source.
The refactoring was wrong, so restore the original way for java-icu4j.
Since
that package is just in a single version, the benefit for DRYing is not that
large.
* gnu/packages/icu4c.scm (java-icu4j): Restore the source uri.
(icu4j-uri): Delete procedure.
(icu4?-uri): Rename this...
(icu4c-uri): ... to this.
Change-Id: If157fa2bcb2aca675edd5d2abfbb7f541a241c7c
Signed-off-by: Ian Eure <[email protected]>
---
gnu/packages/icu4c.scm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 5209f2f19b..2c836a8622 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -43,20 +43,14 @@
#:use-module (guix build-system ant)
#:use-module (guix build-system gnu))
-(define (icu4?-uri variant version)
+(define (icu4c-uri version)
(string-append
"https://github.com/unicode-org/icu/releases/download/release-"
(string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
- "/icu4" variant "-"
+ "/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
-(define (icu4c-uri version)
- (icu4?-uri "c" version))
-
-(define (icu4j-uri version)
- (icu4?-uri "j" version))
-
(define-public icu4c
(package
(name "icu4c")
@@ -218,7 +212,12 @@ C/C++ part.")
(version "70.1")
(source (origin
(method url-fetch)
- (uri (icu4j-uri version))
+ (uri (string-append
+
"https://github.com/unicode-org/icu/releases/download/release-"
+ (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
+ "/icu4j-"
+ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+ ".tgz"))
(sha256
(base32
"0qrs75iyzn19kf54q55jn8wf6xjlpkrihdwqpxm39jdh2hz4cgvj"))))
(build-system ant-build-system)