diff options
| author | Marius Bakke | 2017-08-26 15:15:49 +0200 |
|---|---|---|
| committer | Marius Bakke | 2017-08-26 15:15:49 +0200 |
| commit | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (patch) | |
| tree | b3d6aa01aec86a7f224e15d97a40b64de4e5cdb8 /gnu/packages/icu4c.scm | |
| parent | c20cd0d24d9b5e8a47b864db9799e0992ffd44b9 (diff) | |
| parent | 2f837cf7fe100b0584fb02cf8f19d4cfb4e14d88 (diff) | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/icu4c.scm')
| -rw-r--r-- | gnu/packages/icu4c.scm | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 224319f84..346128585 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -33,7 +33,6 @@ (package (name "icu4c") (version "58.2") - (replacement icu4c/fixed) (source (origin (method url-fetch) (uri (string-append @@ -42,6 +41,9 @@ "/icu4c-" (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) + (patches + (search-patches "icu4c-CVE-2017-7867-CVE-2017-7868.patch" + "icu4c-reset-keyword-list-iterator.patch")) (sha256 (base32 "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib")))) (build-system gnu-build-system) @@ -68,15 +70,6 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) -(define icu4c/fixed - (package - (inherit icu4c) - (source (origin - (inherit (package-source icu4c)) - (patches - (search-patches "icu4c-CVE-2017-7867-CVE-2017-7868.patch" - "icu4c-reset-keyword-list-iterator.patch")))))) - (define-public java-icu4j (package (name "java-icu4j") |