From 238dde3c3c23e7ecb91a3089e3a586d416e588f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 24 Jun 2024 23:57:00 +0200 Subject: [PATCH 1/2] icu68: drop --- pkgs/development/libraries/icu/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index bf595108baaf..d084bb56d7e3 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -30,10 +30,6 @@ in version = "69.1"; hash = "sha256-TLp7es0dPELES7DBS+ZjcJjH+vKzMM6Ha8XzuRXQl0U="; }; - icu68 = make-icu { - version = "68.2"; - hash = "sha256-x5GT3uOQeiGZuClqk7UsXLdDMsJvPRZyaUh2gNR51iU="; - }; icu67 = make-icu { version = "67.1"; hash = "sha256-lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd6ca38ddd6c..95050e6589f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21379,7 +21379,6 @@ with pkgs; icu64 icu66 icu67 - icu68 icu69 icu70 icu71 From 4bfb0ba68f20d5649f6d5646662dbd1e2a08ac2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 24 Jun 2024 23:59:23 +0200 Subject: [PATCH 2/2] icu58: drop --- pkgs/development/libraries/icu/default.nix | 12 ------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 13 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index d084bb56d7e3..0e77aebd1486 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -58,16 +58,4 @@ in version = "60.2"; hash = "sha256-8HPqjzW5JtcLsz5ld1CKpkKosxaoA/Eb4grzhIEdtBg="; }; - icu58 = make-icu { - version = "58.2"; - hash = "sha256-KwpEEBU6myDeDiDH2LZgSacq7yRLU2g9DXUhNxaD2gw="; - patches = [ - (fetchurl { - url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; - name = "icu-changeset-39484.diff"; - sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; - }) - ]; - patchFlags = [ "-p4" ]; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95050e6589f0..c445605d119f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21373,7 +21373,6 @@ with pkgs; icu-versions = callPackages ../development/libraries/icu { }; inherit (icu-versions) - icu58 icu60 icu63 icu64