From b5012be0584634f0823c764a95a1e5150b1e895e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Thu, 16 Oct 2025 12:57:26 +0200 Subject: [PATCH 1/7] crystal_1_18: init at 1.18.1 --- pkgs/development/compilers/crystal/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 367a08aa87cb..53d51fb3e810 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -325,5 +325,13 @@ rec { doCheck = false; }; - crystal = crystal_1_16; + crystal_1_18 = generic { + version = "1.18.1"; + sha256 = "sha256-6bJnonQyPtWIl1ex1tw3QercDl4ZQcvuVNYiWzMpGZ0="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_21; + doCheck = false; + }; + + crystal = crystal_1_18; } From 757a78e2e08d3e882526c43b1b7a0b717fcb0f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Sat, 18 Oct 2025 18:20:09 +0200 Subject: [PATCH 2/7] Add to `all-packages.nix` --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 659b705ee86a..869093ed4e4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4524,6 +4524,7 @@ with pkgs; crystal_1_15 crystal_1_16 crystal_1_17 + crystal_1_18 crystal ; From a1d3ffe29c39ec6ab876e51b6a89aeae4d2c0bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Tue, 21 Oct 2025 18:40:45 +0200 Subject: [PATCH 3/7] Pin ameba and blahaj to `crystal_1_17` --- pkgs/by-name/am/ameba/package.nix | 6 ++++-- pkgs/by-name/bl/blahaj/package.nix | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix index c1ce7a669fad..429e0ef8a062 100644 --- a/pkgs/by-name/am/ameba/package.nix +++ b/pkgs/by-name/am/ameba/package.nix @@ -1,10 +1,12 @@ { lib, fetchFromGitHub, - crystal, + crystal_1_17, coreutils, }: - +let + crystal = crystal_1_17; +in crystal.buildCrystalPackage rec { pname = "ameba"; version = "1.6.4"; diff --git a/pkgs/by-name/bl/blahaj/package.nix b/pkgs/by-name/bl/blahaj/package.nix index 258da854cfb8..b834d213e8fe 100644 --- a/pkgs/by-name/bl/blahaj/package.nix +++ b/pkgs/by-name/bl/blahaj/package.nix @@ -1,13 +1,16 @@ { lib, stdenv, - crystal, + crystal_1_17, fetchFromGitHub, # https://crystal-lang.org/2019/09/06/parallelism-in-crystal/ multithreading ? true, static ? stdenv.hostPlatform.isStatic, }: +let + crystal = crystal_1_17; +in crystal.buildCrystalPackage rec { pname = "blahaj"; version = "2.2.0"; From 436f35019305d061112137b53d2f6f6662f15f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Tue, 21 Oct 2025 21:10:36 +0200 Subject: [PATCH 4/7] Crystal 1.18.2 --- 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 53d51fb3e810..30c53688cbeb 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -326,8 +326,8 @@ rec { }; crystal_1_18 = generic { - version = "1.18.1"; - sha256 = "sha256-6bJnonQyPtWIl1ex1tw3QercDl4ZQcvuVNYiWzMpGZ0="; + version = "1.18.2"; + sha256 = "sha256-bwKs9bwD1WfS95DSxVY5AjT5Q61jOsfAH897tmiurng="; binary = binaryCrystal_1_10; llvmPackages = llvmPackages_21; doCheck = false; From 614a43bb4ff766172d58072ef165a81ee9f04dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 22 Oct 2025 11:39:27 +0200 Subject: [PATCH 5/7] Pin invidious to `crystal_1_17` --- pkgs/by-name/in/invidious/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index db6d48735876..9b4a099fe824 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -1,7 +1,7 @@ { lib, callPackage, - crystal, + crystal_1_17, fetchFromGitHub, librsvg, pkg-config, @@ -27,6 +27,7 @@ let # normally video.js is downloaded at build time videojs = callPackage ./videojs.nix { inherit versions; }; + crystal = crystal_1_17; in crystal.buildCrystalPackage rec { pname = "invidious"; From 3c916f4b9eccafa8de09c827a27ce4dadc3cdc57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 22 Oct 2025 13:21:05 +0200 Subject: [PATCH 6/7] Update pkgs/by-name/in/invidious/package.nix Co-authored-by: Kenichi Kamiya --- pkgs/by-name/in/invidious/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index 9b4a099fe824..71c4b3d2aea9 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -27,7 +27,7 @@ let # normally video.js is downloaded at build time videojs = callPackage ./videojs.nix { inherit versions; }; - crystal = crystal_1_17; + crystal = crystal_1_16; in crystal.buildCrystalPackage rec { pname = "invidious"; From 78021c7da86d183b3ed85bda08c57e04151bc4c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 22 Oct 2025 13:30:13 +0200 Subject: [PATCH 7/7] Update pkgs/by-name/in/invidious/package.nix Co-authored-by: Kenichi Kamiya --- pkgs/by-name/in/invidious/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index 71c4b3d2aea9..d01f5bf3406a 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -1,7 +1,7 @@ { lib, callPackage, - crystal_1_17, + crystal_1_16, fetchFromGitHub, librsvg, pkg-config,