From 87bb750a7e8dd1f6cd21033b0cd47d77adfd83fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Apr 2020 20:30:31 +0200 Subject: gnu: icu4c: Remove redundant icu4c-66.1 variable. * gnu/packages/icu4c.scm (icu4c-66.1): Remove variable. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from ICU4C-66.1 to ICU4C. --- gnu/packages/chromium.scm | 2 +- gnu/packages/icu4c.scm | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 3625eb7964..d92d463e03 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -786,7 +786,7 @@ from forcing GEXP-PROMISE." ("glib" ,glib) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) - ("icu4c" ,icu4c-66.1) + ("icu4c" ,icu4c) ("jsoncpp" ,jsoncpp) ("lcms" ,lcms) ("libevent" ,libevent) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index d8a898263a..cf76c6fe20 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -114,24 +114,6 @@ C/C++ part.") #t))))))) (native-inputs '()))) -(define-public icu4c-66.1 - (package - (inherit icu4c) - (version "66.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/unicode-org/icu/releases/download/release-" - (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) - "/icu4c-" - (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) - "-src.tgz")) - (patch-flags '("-p2")) - (patches (search-patches "icu4c-CVE-2020-10531.patch")) - (sha256 - (base32 - "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj")))))) - (define-public java-icu4j (package (name "java-icu4j") -- cgit v1.2.3