icu: use upstream icu (again) on Darwin (#383155)

pkgs/by-name/bu/bun/package.nix

···
 , curl
 , jq
 , common-updater-scripts
+, cctools
 , darwin
+, rcodesign
 }:
 
 stdenvNoCC.mkDerivation rec {
···
   postPhases = [ "postPatchelf"];
   postPatchelf =
     lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
-      wrapProgram $out/bin/bun \
-        --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ darwin.ICU ]}
+      '${lib.getExe' cctools "${cctools.targetPrefix}install_name_tool"}' $out/bin/bun \
+        -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib'
+      '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/bin/bun
     ''
     # We currently cannot generate completions for x86_64-darwin because bun requires avx support to run, which is:
     # 1. Not currently supported by the version of Rosetta on our aarch64 builders

pkgs/development/python-modules/pyicu/default.nix

···
 {
-  stdenv,
   lib,
   buildPythonPackage,
   fetchPypi,
···
     inherit version;
     hash = "sha256-rMfrkr1cVU7VdyScaXhFCk/toKpvAUcBUrOns4KgITI=";
   };
-
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [
-    # fails testExemplarSet2 test due to sjd locale not having an auxiliary
-    # esType. icuReal doesn't have an sjd locale
-    ./skip-sjd-local.diff
-  ];
 
   nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config
   buildInputs = [ icu ];

pkgs/development/python-modules/pyicu/skip-sjd-local.diff

···
-diff --git a/test/test_LocaleData.py b/test/test_LocaleData.py
-index 76410e7..7db6f13 100644
---- a/test/test_LocaleData.py
-+++ b/test/test_LocaleData.py
-@@ -126,6 +126,7 @@ class TestLocaleData(TestCase):
-             ld = LocaleData(locale)
-             scriptCodes = Script.getCode(locale)
-             exemplarSets = []
-+            if locale == 'sjd': continue
-             for k in range(2): # for casing option in (normal, uncased)
-                 # it seems USET_CASE_INSENSITIVE = 2
-                 option = 0 if k == 0 else 2
-

pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix

···
   fixDarwinDylibNames,
   mkAppleDerivation,
   python3,
-  stdenv, # Necessary for compatibility with python3Packages.tensorflow, which tries to override the stdenv
   testers,
 }:
 
···
     sourceRoot = "source/icu/icu4c/source";
 
     patches = [
-      # Apple defaults to `uint16_t` for compatibility with building one of their private frameworks,
-      # but nixpkgs needs `char16_t` for compatibility with packages that expect upstream ICU with `char16_t`.
-      # According to `unicode/umachine.h`, these types are bit-compatible but distinct in C++.
-      ./patches/define-uchar-as-char16_t.patch
-      # Enable the C++ API by default to match the upstream ICU packaging in nixpkgs
-      ./patches/enable-cxx-api-by-default.patch
       # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does.
       ./patches/suppress-icu-check-crash.patch
     ];

pkgs/os-specific/darwin/apple-source-releases/ICU/patches/define-uchar-as-char16_t.patch

···
-diff --git a/icu/icu4c/source/common/unicode/umachine.h b/icu/icu4c/source/common/unicode/umachine.h
-index 9483031569..e451ad7c02 100644
---- a/common/unicode/umachine.h
-+++ b/common/unicode/umachine.h
-@@ -387,39 +387,6 @@
-  * @stable ICU 4.4
-  */
- 
--#if APPLE_ICU_CHANGES
--// rdar://121241618 (StarlightE: VideosUI-883.40.54#24 has failed to build in install; cannot initialize a variable of type 'const UChar *' (aka 'const char16_t)
--#if 0
-- // #if 1 is normal (Apple uses 0 to force us to still use uint16_t). UChar defaults to char16_t in C++.
-- // For configuration testing of UChar=uint16_t temporarily change this to #if 0.
-- // The intltest Makefile #defines UCHAR_TYPE=char16_t,
-- // so we only #define it to uint16_t if it is undefined so far.
--#elif !defined(UCHAR_TYPE)
--#   define UCHAR_TYPE uint16_t
--#endif
--
--#if defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || \
--        defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || \
--        defined (U_TOOLUTIL_IMPLEMENTATION)
--    // Inside the ICU library code, never configurable.
--    typedef char16_t UChar;
--#elif defined(T_CTEST_IMPLEMENTATION)
--    // internally to ctestfw, we want to use char16_t in C++ and uint_16 in C
--    #if U_CPLUSPLUS_VERSION != 0
--        typedef char16_t UChar;  // C++
--    #else
--        typedef uint16_t UChar;  // C
--    #endif
--#elif defined(UCHAR_TYPE)
--    typedef UCHAR_TYPE UChar;
--#elif U_CPLUSPLUS_VERSION != 0
--    typedef char16_t UChar;  // C++
--#else
--    typedef uint16_t UChar;  // C
--#endif
--
--#else
--
- #if 1
-     // #if 1 is normal. UChar defaults to char16_t in C++.
-     // For configuration testing of UChar=uint16_t temporarily change this to #if 0.
-@@ -441,8 +408,6 @@
-     typedef uint16_t UChar;  // C
- #endif
- 
--#endif // APPLE_ICU_CHANGES
--
- /**
-  * \var OldUChar
-  * Default ICU 58 definition of UChar.

pkgs/os-specific/darwin/apple-source-releases/ICU/patches/enable-cxx-api-by-default.patch

···
-diff --git a/icu/icu4c/source/common/unicode/utypes.h b/icu/icu4c/source/common/unicode/utypes.h
-index a3e0ec911c..e361c658ef 100644
---- a/common/unicode/utypes.h
-+++ b/common/unicode/utypes.h
-@@ -66,20 +66,6 @@
-  * \def U_SHOW_CPLUSPLUS_API
-  * @internal
-  */
--#if APPLE_ICU_CHANGES
--// rdar://60884991 #58 Replace installsrc patching with changes directly in header files
--// Apple modifies the default to be 0, not 1
--#ifdef __cplusplus
--#   ifndef U_SHOW_CPLUSPLUS_API
--#       define U_SHOW_CPLUSPLUS_API 0
--#   endif
--#else
--#   undef U_SHOW_CPLUSPLUS_API
--#   define U_SHOW_CPLUSPLUS_API 0
--#endif
--
--#else
--
- #ifdef __cplusplus
- #   ifndef U_SHOW_CPLUSPLUS_API
- #       define U_SHOW_CPLUSPLUS_API 1
-@@ -89,28 +75,6 @@
- #   define U_SHOW_CPLUSPLUS_API 0
- #endif
- 
--#endif // APPLE_ICU_CHANGES
--
--
--#if APPLE_ICU_CHANGES
--// rdar://30624081 64b8ed9b89.. Add #if U_SHOW_CPLUSPLUS_API..#endif around C++ interfaces that don’t have it
--// rdar://24075048 0f5f76d43c.. update ICU for AAS to use VS2015, remove old ICU 4.0 shims, fix build issues
--/* 
-- * Apple-specific warning if U_SHOW_CPLUSPLUS_API set and the compile
-- * is not for a build of ICU itself (ICU_DATA_DIR is always defined
-- * for ICU builds, and is unlikely to be defined for client builds).
-- * Windows VSC compliler does not like #warning, skip for it.
-- */
--#if U_SHOW_CPLUSPLUS_API
--#ifndef ICU_DATA_DIR
--#if U_PLATFORM!=U_PF_WINDOWS
--#warning Do not set U_SHOW_CPLUSPLUS_API for code that ships with the OS, it is only for local tools.
--#warning ICU C++ functionality may not be used by any OS client, it is not binary compatible across updates.
--#endif
--#endif
--#endif
--#endif // APPLE_ICU_CHANGES
--
- /** @{ API visibility control */
- 
- /**

pkgs/top-level/aliases.nix

···
   i3nator = throw "'i3nator' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15
+  icuReal = throw "icuReal has been removed from nixpkgs as a mistake"; # Added 2025-02-18
   imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17
   imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
   imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17

pkgs/top-level/all-packages.nix

···
     icu76
   ;
 
-  # Use Apple’s fork of ICU by default, which provides additional APIs that are not present in upstream ICU.
-  #
-  # `icuReal` is provided in case the upstream icu package is needed on Darwin instead of the fork.
-  # Note that the versioned icu packages always correspond to the upstream versions.
-  icuReal = icu76;
-  icu = if stdenv.hostPlatform.isDarwin then darwin.ICU else icuReal;
+  icu = icu76;
 
   idasen = with python3Packages; toPythonApplication idasen;