diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index a05c59a6ef87..f673eb6d0340 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -14,8 +14,7 @@ let dune_3 luv extlib - ] else if lib.versionAtLeast version "4.0" - then with ocaml-ng.ocamlPackages_4_10; [ + ] else with ocaml-ng.ocamlPackages_4_10; [ ocaml findlib sedlex @@ -26,9 +25,6 @@ let dune_3 luv extlib-1-7-7 - ] else with ocaml-ng.ocamlPackages_4_05; [ - ocaml - camlp4 ]; defaultPatch = '' @@ -120,24 +116,6 @@ let }; }; in { - # this old version is required to compile some libraries - haxe_3_2 = generic { - version = "3.2.1"; - sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3"; - prePatch = '' - sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' main.ml - substituteInPlace extra/haxelib_src/src/tools/haxelib/Main.hx \ - --replace '"neko"' '"${neko}/bin/neko"' - ''; - }; - haxe_3_4 = generic { - version = "3.4.6"; - sha256 = "1myc4b8fwp0f9vky17wv45n34a583f5sjvajsc93f5gm1wanp4if"; - prePatch = '' - ${defaultPatch} - sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml - ''; - }; haxe_4_0 = generic { version = "4.0.5"; sha256 = "0f534pchdx0m057ixnk07ab4s518ica958pvpd0vfjsrxg5yjkqa"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index da3031c9f941..acb7fd40058c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -640,6 +640,8 @@ mapAliases ({ hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12 inherit (harePackages) hare harec; # Added 2022-08-10 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 + haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 + haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 hdr-plus = throw "hdr-plus has been removed because it is unmaintained, often breaks and no longer consumed as a dependency"; # Added 2022-11-08 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7afeef86bd2c..08240819d6c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15132,8 +15132,6 @@ with pkgs; haxe_4_2 haxe_4_1 haxe_4_0 - haxe_3_4 - haxe_3_2 ; haxe = haxe_4_2;