Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 485bf85407ea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a2eed09a8c85
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 17, 2018

  1. icu63: init at 63.1

    @alyssais
    alyssais committed Dec 17, 2018
    Copy the full SHA
    70b8ab6 View commit details

Commits on Dec 21, 2018

  1. Merge pull request #52416 from alyssais/icu 

    icu63: init at 63.1
    @alyssais
    alyssais authored Dec 21, 2018
    Copy the full SHA
    a2eed09 View commit details
Showing with 21 additions and 2 deletions.
  1. +14 −0 pkgs/development/libraries/icu/63.nix
  2. +2 −2 pkgs/development/libraries/icu/base.nix
  3. +5 −0 pkgs/top-level/all-packages.nix
14 changes: 14 additions & 0 deletions pkgs/development/libraries/icu/63.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }:

import ./base.nix {
version = "63.1";
sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05";
patches = [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1499398
(fetchpatch {
url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch;
sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb";
})
];
patchFlags = [ "-p3" ];
} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; }
4 changes: 2 additions & 2 deletions pkgs/development/libraries/icu/base.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ version, sha256, patches ? [], patchFlags ? "" }:
{ stdenv, fetchurl, fixDarwinDylibNames
{ stdenv, lib, fetchurl, fixDarwinDylibNames
# Cross-compiled icu4c requires a build-root of a native compile
, buildRootOnly ? false, nativeBuildRoot
}:
@@ -20,7 +20,7 @@ let
'';

# https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl")
postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") && lib.versionOlder version "62.1"
then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'"
else null; # won't find locale_t on darwin

5 changes: 5 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -10336,6 +10336,11 @@ in
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
}));
icu63 = callPackage ../development/libraries/icu/63.nix ({
nativeBuildRoot = buildPackages.icu63.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;