diff --git a/pkgs/development/libraries/icu/59.nix b/pkgs/development/libraries/icu/59.nix deleted file mode 100644 index 9ca66ca525f..00000000000 --- a/pkgs/development/libraries/icu/59.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "59.1"; - sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; -} diff --git a/pkgs/development/libraries/icu/65.nix b/pkgs/development/libraries/icu/65.nix deleted file mode 100644 index c5074eea114..00000000000 --- a/pkgs/development/libraries/icu/65.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "65.1"; - sha256 = "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 271e5ba4c85..b93ba9744ca 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -566,6 +566,8 @@ mapAliases ({ icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15 icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + icu59 = throw "icu59 has been removed, use a more recent version instead"; # Added 2022-05-14 + icu65 = throw "icu65 has been removed, use a more recent version instead"; # Added 2022-05-14 idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 imagemagick7Big = imagemagickBig; # Added 2021-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af86ea2bc08..92374c3bda9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17884,65 +17884,34 @@ with pkgs; icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; - } // - (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); - icu59 = callPackage ../development/libraries/icu/59.nix ({ - nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu60 = callPackage ../development/libraries/icu/60.nix ({ nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu63 = callPackage ../development/libraries/icu/63.nix ({ nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu64 = callPackage ../development/libraries/icu/64.nix ({ nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; - } // (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; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu66 = callPackage ../development/libraries/icu/66.nix ({ nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu67 = callPackage ../development/libraries/icu/67.nix ({ nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; - } // (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' - })); + }); 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' - })); + }); icu70 = callPackage ../development/libraries/icu/70.nix ({ nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu71 = callPackage ../development/libraries/icu/71.nix ({ nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; }; - } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' - })); + }); icu = icu71;