From 28598c01e7e09c606b5988306ce84534a717b94a Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Wed, 8 Mar 2017 14:01:39 +0200 Subject: [PATCH] icu: 57.1 -> 58.2 Firefox requires new version of the icu to build: ``` checking for icu-i18n >= 58.1... Requested 'icu-i18n >= 58.1' but version of icu-i18n is 57.1 configure: error: Library requirements (icu-i18n >= 58.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them. ``` --- pkgs/development/libraries/icu/default.nix | 24 ++-------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index d4a4c2a500c1..1508f05db8b6 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -2,7 +2,7 @@ let pname = "icu4c"; - version = "57.1"; + version = "58.2"; in stdenv.mkDerivation ({ name = pname + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z"; + sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; }; outputs = [ "out" "dev" ]; @@ -35,26 +35,6 @@ stdenv.mkDerivation ({ ''; patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch"; - sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch"; - sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch"; - sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch"; - sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch"; - sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r"; - }) ]; preConfigure = ''