diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:46:38 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:46:38 +0100 |
| commit | 63bd6643c80f3af8180392eb1bf531bedb8e2201 (patch) | |
| tree | 5a3abc2a958d25963bb6628bba9e368818a5ef0e | |
| parent | f605eef2d4716023ccd127ca4910e5ccbd7cdfb0 (diff) | |
| download | patches-63bd6643c80f3af8180392eb1bf531bedb8e2201.tar patches-63bd6643c80f3af8180392eb1bf531bedb8e2201.tar.gz | |
gnu: icu4c: Incorporate grafted changes.
* gnu/packages/icu4c.scm (icu4c)[replacement]: Remove.
[source](patches, patch-flags): New fields.
(icu4c/fixed): Remove variable.
| -rw-r--r-- | gnu/packages/icu4c.scm | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 88f97efeb6..046e35e414 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -36,7 +36,6 @@ (define-public icu4c (package (name "icu4c") - (replacement icu4c/fixed) (version "66.1") (source (origin (method url-fetch) @@ -46,6 +45,8 @@ "/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")))) (build-system gnu-build-system) @@ -113,17 +114,6 @@ C/C++ part.") #t))))))) (native-inputs '()))) -(define icu4c/fixed - (package - (inherit icu4c) - (source (origin - (inherit (package-source icu4c)) - (patch-flags '("-p2")) - (patches (append - (origin-patches (package-source icu4c)) - (search-patches - "icu4c-CVE-2020-10531.patch"))))))) - (define-public java-icu4j (package (name "java-icu4j") |