diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
| commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
| tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /gnu/packages/icu4c.scm | |
| parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
| parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
| download | guix-patches-18af6870370226b4d502d7372844e7f2aded5887.tar guix-patches-18af6870370226b4d502d7372844e7f2aded5887.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'gnu/packages/icu4c.scm')
| -rw-r--r-- | gnu/packages/icu4c.scm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 61e252cff2..88f97efeb6 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -36,6 +36,7 @@ (define-public icu4c (package (name "icu4c") + (replacement icu4c/fixed) (version "66.1") (source (origin (method url-fetch) @@ -112,6 +113,17 @@ 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") |