From fdd64ce4046dc2986d3699144fc781057f08095b Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 08:30:36 -0500 Subject: [PATCH 1/6] crystal_1_2: drop --- pkgs/development/compilers/crystal/default.nix | 9 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index a0aa47a88151..9e2a97ebdb8c 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -10,7 +10,6 @@ , git , gmp , hostname -, libatomic_ops , libevent , libiconv , libxml2 @@ -265,14 +264,6 @@ rec { }; }; - crystal_1_2 = generic { - version = "1.2.2"; - sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = binaryCrystal_1_2; - llvmPackages = llvmPackages_13; - extraBuildInputs = [ libatomic_ops ]; - }; - crystal_1_7 = generic { version = "1.7.3"; sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1f24eadb8713..fa47b49da074 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -248,6 +248,7 @@ mapAliases { cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 + crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d8c1b340cbf..f01960f08dee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5706,7 +5706,6 @@ with pkgs; }; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) - crystal_1_2 crystal_1_7 crystal_1_8 crystal_1_9 From 758e3fad7a6c5eeb444e6e65ec90339100f0f139 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:15:30 -0500 Subject: [PATCH 2/6] crystal_1_7: drop --- pkgs/development/compilers/crystal/default.nix | 8 -------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 9e2a97ebdb8c..71bc60a727e2 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -15,7 +15,6 @@ , libxml2 , libyaml , libffi -, llvmPackages_13 , llvmPackages_15 , llvmPackages_18 , makeWrapper @@ -264,13 +263,6 @@ rec { }; }; - crystal_1_7 = generic { - version = "1.7.3"; - sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE="; - binary = binaryCrystal_1_2; - llvmPackages = llvmPackages_13; - }; - crystal_1_8 = generic { version = "1.8.2"; sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fa47b49da074..32b99ff92f2f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -249,6 +249,7 @@ mapAliases { crispyDoom = crispy-doom; # Added 2023-05-01 crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 + crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01960f08dee..642e29474b56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5706,7 +5706,6 @@ with pkgs; }; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) - crystal_1_7 crystal_1_8 crystal_1_9 crystal_1_11 From b19fe47d49d166706d8b5b00a219a7436d85adfa Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:17:08 -0500 Subject: [PATCH 3/6] crystal: drop pcre dependency from < 1.8 --- pkgs/development/compilers/crystal/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 71bc60a727e2..b8f415920c6a 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -20,7 +20,6 @@ , makeWrapper , openssl , pcre2 -, pcre , pkg-config , installShellFiles , readline @@ -152,7 +151,7 @@ let nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm installShellFiles ]; buildInputs = [ boehmgc - (if lib.versionAtLeast version "1.8" then pcre2 else pcre) + pcre2 libevent libyaml zlib From 3d3c822fce2aeab22965b2d4f9f7aeac73b7b6d9 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:18:45 -0500 Subject: [PATCH 4/6] crystal_1_8: drop --- pkgs/development/compilers/crystal/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index b8f415920c6a..5da00de9578e 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -262,13 +262,6 @@ rec { }; }; - crystal_1_8 = generic { - version = "1.8.2"; - sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8="; - binary = binaryCrystal_1_2; - llvmPackages = llvmPackages_15; - }; - crystal_1_9 = generic { version = "1.9.2"; sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 32b99ff92f2f..f7885d8324ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -250,6 +250,7 @@ mapAliases { crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 + crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 642e29474b56..9428c334212c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5706,7 +5706,6 @@ with pkgs; }; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) - crystal_1_8 crystal_1_9 crystal_1_11 crystal_1_12 From 5b0bbb8e834d57905a804770bb047c62bf5299be Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:21:15 -0500 Subject: [PATCH 5/6] crystal_1_9: drop --- pkgs/development/compilers/crystal/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 5da00de9578e..d4772476a12b 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -262,13 +262,6 @@ rec { }; }; - crystal_1_9 = generic { - version = "1.9.2"; - sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; - binary = binaryCrystal_1_2; - llvmPackages = llvmPackages_15; - }; - crystal_1_11 = generic { version = "1.11.2"; sha256 = "sha256-BBEDWqFtmFUNj0kuGBzv71YHO3KjxV4d2ySTCD4HhLc="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7885d8324ae..b60b441f62c4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -251,6 +251,7 @@ mapAliases { crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 + crystal_1_9 = throw "'crystal_1_9' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9428c334212c..b9df72226a2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5706,7 +5706,6 @@ with pkgs; }; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) - crystal_1_9 crystal_1_11 crystal_1_12 crystal_1_14 From 4c2c01b861f9a236b4f318086863e39355306247 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:24:06 -0500 Subject: [PATCH 6/6] crystal: drop binaryCrystal_1_2 dependency from < 1.10 --- pkgs/development/compilers/crystal/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index d4772476a12b..f8195c2e7775 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -242,16 +242,6 @@ let }); in rec { - binaryCrystal_1_2 = genericBinary { - version = "1.2.2"; - sha256s = { - x86_64-linux = "sha256-sW5nhihW/6Dkq95i3vJNWs2D1CtQhujhxVbgQCAas6E="; - aarch64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; - x86_64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; - aarch64-linux = "sha256-QgPKUDFyodqY1+b85AybSpbbr0RmfISdNpB08Wf34jo="; - }; - }; - binaryCrystal_1_10 = genericBinary { version = "1.10.1"; sha256s = {