From 947e443e02acc92200e45c568d2e4787242da6f2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Dec 2020 04:20:00 +0000 Subject: [PATCH 1/2] icu68: init at 68.2 --- pkgs/development/libraries/icu/68.nix | 4 ++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 pkgs/development/libraries/icu/68.nix diff --git a/pkgs/development/libraries/icu/68.nix b/pkgs/development/libraries/icu/68.nix new file mode 100644 index 00000000000..5aeba0f2628 --- /dev/null +++ b/pkgs/development/libraries/icu/68.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "68.2"; + sha256 = "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78ba3328c20..7337562bd88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14336,6 +14336,11 @@ in } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu68 = callPackage ../development/libraries/icu/68.nix ({ + nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; }; + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); icu = icu67; From c0b3169d4a48bcd8da29157e1cc2c412873e51d6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 27 Dec 2020 04:20:00 +0000 Subject: [PATCH 2/2] icu: 67.1 -> 68.2 --- 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 7337562bd88..30f195bceb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14342,7 +14342,7 @@ in stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); - icu = icu67; + icu = icu68; id3lib = callPackage ../development/libraries/id3lib { };