Merge pull request #322277 from SuperSandro2000/icu58

NixOS · Jun 26, 2024 · ca48a25 · ca48a25
2 parents 5ce587f + 4bfb0ba
commit ca48a25
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git 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=";
@@ -62,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
@@ -21325,13 +21325,11 @@ with pkgs;
 
   icu-versions = callPackages ../development/libraries/icu { };
   inherit (icu-versions)
-    icu58
     icu60
     icu63
     icu64
     icu66
     icu67
-    icu68
     icu69
     icu70
     icu71
-Original file line number
+Diff line change
@@ Expand Up / @@ -21325,13 +21325,11 @@ with pkgs; @@
       icu-versions = callPackages ../development/libraries/icu { };
       inherit (icu-versions)
-        icu58
         icu60
         icu63
         icu64
         icu66
         icu67
-        icu68
         icu69
         icu70
         icu71
@@ Expand Down @@