From e8512ca23fc113d953f175f166bcfda9f69e478c Mon Sep 17 00:00:00 2001
From: GeopJr <evan@geopjr.dev>
Date: Sun, 16 Apr 2023 02:25:42 +0300
Subject: [PATCH 1/3] crystal: 1.7 -> 1.8

---
 pkgs/development/compilers/crystal/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix                | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index e7047a81bd44..0745abdfab0a 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -274,5 +274,11 @@ rec {
     binary = binaryCrystal_1_2;
   };
 
-  crystal = crystal_1_7;
+  crystal_1_8 = generic {
+    version = "1.8.0";
+    sha256 = "sha256-oTvBKrfDkrpJg4gaOVrrKWfsqZC+Z9Lp/jt4ye+Iw/M=";
+    binary = binaryCrystal_1_2;
+  };
+
+  crystal = crystal_1_8;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8ab05a72910..bf2fe6a03718 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14539,7 +14539,14 @@ with pkgs;
     stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   })
     crystal_1_2
-    crystal_1_7
+    crystal_1_7;
+
+  inherit (callPackages ../development/compilers/crystal {
+    llvmPackages = llvmPackages_15;
+    pcre = pcre2;
+    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
+  })
+    crystal_1_8
     crystal;
 
   crystal2nix = callPackage ../development/compilers/crystal2nix { };

From 35f5549e29e0056eb379ad8d24475482bfd87d79 Mon Sep 17 00:00:00 2001
From: Evangelos Paterakis <evan@geopjr.dev>
Date: Tue, 18 Apr 2023 16:58:14 +0300
Subject: [PATCH 2/3] crystal: require pcre2

---
 pkgs/development/compilers/crystal/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 0745abdfab0a..914483656a0e 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -20,6 +20,7 @@
 , llvmPackages
 , makeWrapper
 , openssl
+, pcre2
 , pcre
 , pkg-config
 , readline
@@ -73,7 +74,7 @@ let
 
   commonBuildInputs = extraBuildInputs: [
     boehmgc
-    pcre
+    pcre2
     libevent
     libyaml
     zlib
@@ -265,13 +266,14 @@ rec {
     version = "1.2.2";
     sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU=";
     binary = binaryCrystal_1_2;
-    extraBuildInputs = [ libatomic_ops ];
+    extraBuildInputs = [ libatomic_ops pcre ];
   };
 
   crystal_1_7 = generic {
     version = "1.7.3";
     sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE=";
     binary = binaryCrystal_1_2;
+    extraBuildInputs = [ pcre ];
   };
 
   crystal_1_8 = generic {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf2fe6a03718..74f841ec963b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14543,7 +14543,6 @@ with pkgs;
 
   inherit (callPackages ../development/compilers/crystal {
     llvmPackages = llvmPackages_15;
-    pcre = pcre2;
     stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   })
     crystal_1_8

From 70cc7966aa62905e6b8f06b1503fb6fe2261fdfc Mon Sep 17 00:00:00 2001
From: Evangelos Paterakis <evan@geopjr.dev>
Date: Tue, 18 Apr 2023 18:23:52 +0300
Subject: [PATCH 3/3] crystal: include pcre even on pcre2 builds

---
 pkgs/development/compilers/crystal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 914483656a0e..e51e1e27dd37 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -74,6 +74,7 @@ let
 
   commonBuildInputs = extraBuildInputs: [
     boehmgc
+    pcre
     pcre2
     libevent
     libyaml
@@ -266,14 +267,13 @@ rec {
     version = "1.2.2";
     sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU=";
     binary = binaryCrystal_1_2;
-    extraBuildInputs = [ libatomic_ops pcre ];
+    extraBuildInputs = [ libatomic_ops ];
   };
 
   crystal_1_7 = generic {
     version = "1.7.3";
     sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE=";
     binary = binaryCrystal_1_2;
-    extraBuildInputs = [ pcre ];
   };
 
   crystal_1_8 = generic {