From 01d805a432048c8f7da870e971c7993781761c9d Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Wed, 24 Apr 2019 21:29:04 +0200 Subject: [PATCH 1/2] icu64: init at 64.2 --- pkgs/development/libraries/icu/64.nix | 4 ++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 pkgs/development/libraries/icu/64.nix diff --git a/pkgs/development/libraries/icu/64.nix b/pkgs/development/libraries/icu/64.nix new file mode 100644 index 00000000000..c7bdd22c179 --- /dev/null +++ b/pkgs/development/libraries/icu/64.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "64.2"; + sha256 = "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29733e3887c..206ba8d8857 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10764,6 +10764,11 @@ in } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' })); + icu64 = callPackage ../development/libraries/icu/64.nix ({ + nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); icu = icu59; From 2fe63c8faf9f4db4cee1fed0ea1aa82da4a7bfd2 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Fri, 26 Apr 2019 09:15:13 +0200 Subject: [PATCH 2/2] icu: 59 -> 64 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 206ba8d8857..406edbb6449 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10770,7 +10770,7 @@ in stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' })); - icu = icu59; + icu = icu64; id3lib = callPackage ../development/libraries/id3lib { };