summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2020-04-20 04:20:00 -0500
committerMario Rodas <marsam@users.noreply.github.com>2020-04-20 04:20:00 -0500
commitc5bcdbf2c0da07849f0e6b6c55bb8b8057766f03 (patch)
tree9ca6c102cd6036cc282ce2ccfc4621d96434868a
parentd3a41f3c23b5f7b88613f57d6c7f6b86d662df55 (diff)
downloadnixpkgs-c5bcdbf2c0da07849f0e6b6c55bb8b8057766f03.tar
nixpkgs-c5bcdbf2c0da07849f0e6b6c55bb8b8057766f03.tar.gz
nixpkgs-c5bcdbf2c0da07849f0e6b6c55bb8b8057766f03.tar.bz2
nixpkgs-c5bcdbf2c0da07849f0e6b6c55bb8b8057766f03.tar.lz
nixpkgs-c5bcdbf2c0da07849f0e6b6c55bb8b8057766f03.tar.xz
nixpkgs-c5bcdbf2c0da07849f0e6b6c55bb8b8057766f03.tar.zst
nixpkgs-c5bcdbf2c0da07849f0e6b6c55bb8b8057766f03.zip
icu65: init at 65.1
-rw-r--r--pkgs/development/libraries/icu/65.nix4
-rw-r--r--pkgs/development/libraries/icu/base.nix3
-rw-r--r--pkgs/top-level/all-packages.nix5
3 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/icu/65.nix b/pkgs/development/libraries/icu/65.nix
new file mode 100644
index 00000000000..c5074eea114
--- /dev/null
+++ b/pkgs/development/libraries/icu/65.nix
@@ -0,0 +1,4 @@
+import ./base.nix {
+  version = "65.1";
+  sha256 = "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk";
+}
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index 96b00027e20..81f75ad526a 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -9,8 +9,7 @@ let
 
   baseAttrs = {
     src = fetchurl {
-      url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
-        + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
+      url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceChars [ "." ] [ "-" ] version}/icu4c-${lib.replaceChars [ "." ] [ "_" ] version}-src.tgz";
       inherit sha256;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index febca841867..b48acfbb43d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12190,6 +12190,11 @@ in
   } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
       stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
     }));
+  icu65 = callPackage ../development/libraries/icu/65.nix ({
+    nativeBuildRoot = buildPackages.icu65.override { buildRootOnly = true; };
+  } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
+      stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
+    }));
 
   icu = icu64;