From f5831d89299ad8de2b3b83b4c046ec5e141612c9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Apr 2021 04:20:00 +0000 Subject: [PATCH 1/2] icu69: init at 69.1 http://site.icu-project.org/download/69 --- pkgs/development/libraries/icu/69.nix | 4 ++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 pkgs/development/libraries/icu/69.nix diff --git a/pkgs/development/libraries/icu/69.nix b/pkgs/development/libraries/icu/69.nix new file mode 100644 index 000000000000..8cea41daadb9 --- /dev/null +++ b/pkgs/development/libraries/icu/69.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "69.1"; + sha256 = "0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21c7103938f2..054a861fbdfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14967,6 +14967,11 @@ in } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu69 = callPackage ../development/libraries/icu/69.nix ({ + nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; }; + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); icu = icu68; From c634d107d0f13f85070ed1d60d998713074cc574 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Apr 2021 04:20:00 +0000 Subject: [PATCH 2/2] icu: 68.2 -> 69.1 --- 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 054a861fbdfd..37ae0b77d0c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14973,7 +14973,7 @@ in stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); - icu = icu68; + icu = icu69; id3lib = callPackage ../development/libraries/id3lib { };