From b1380d98288e7f4d9e0293c0fae902b49d855b72 Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Wed, 10 Apr 2024 20:16:45 +0200 Subject: [PATCH 01/10] crystal: 1.11 -> 1.12 --- 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 0907c1c4d68d..35650041eb71 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -19,6 +19,7 @@ , libffi , llvmPackages_13 , llvmPackages_15 +, llvmPackages_18 , makeWrapper , openssl , pcre2 @@ -314,5 +315,12 @@ rec { llvmPackages = llvmPackages_15; }; - crystal = crystal_1_11; + crystal_1_12 = generic { + version = "1.12.0"; + sha256 = "sha256-2oH2EtZDBDnRMh5AGB2UdTVVEaku+DXZT+QTQ+V8vmM="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_18; + }; + + crystal = crystal_1_12; } From 1b2de2cbcf46b4953ebc60104e9f34781e98fdf7 Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Wed, 10 Apr 2024 23:39:58 +0200 Subject: [PATCH 02/10] crystalline: use llvm18 to match crystal 1.12 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f4f754cbf72..0ed3393185a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14488,7 +14488,7 @@ with pkgs; crystal2nix = callPackage ../development/compilers/crystal2nix { }; crystalline = callPackage ../development/tools/language-servers/crystalline { - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_18; }; icr = callPackage ../development/tools/icr { }; From cf6ea4f75ec6eeecd1dcd805c0cb42bbeaee3e79 Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Thu, 11 Apr 2024 09:30:50 +0200 Subject: [PATCH 03/10] invidious: add patch to fix compile error --- pkgs/servers/invidious/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index a52d431a1ce9..1a2d36e6a326 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -51,6 +51,13 @@ crystal.buildCrystalPackage rec { inherit (versions.invidious) commit date; in '' + # bugfix for crystal_1_12 Time::Span, can be removed when fixed upstream + substituteInPlace src/invidious/yt_backend/proxy.cr \ + --replace-fail "opts[:dns_timeout] = @dns_timeout" "opts[:dns_timeout] = @dns_timeout.try(&.to_f)" \ + --replace-fail "opts[:connect_timeout] = @connect_timeout" "opts[:connect_timeout] = @connect_timeout.try(&.to_f)" \ + --replace-fail "opts[:read_timeout] = @read_timeout" "opts[:read_timeout] = @read_timeout.try(&.to_f)" \ + + for d in ${videojs}/*; do ln -s "$d" assets/videojs; done # Use the version metadata from the derivation instead of using git at From 90a79047cdc5417de4d2fa6d39d14d47c391a65f Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Thu, 11 Apr 2024 09:59:17 +0200 Subject: [PATCH 04/10] crystal: add missing versions to all-packages.nix --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ed3393185a3..0819e8534a36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14483,6 +14483,8 @@ with pkgs; crystal_1_7 crystal_1_8 crystal_1_9 + crystal_1_11 + crystal_1_12 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; From 0491852c1a344b6117abffe3fabda45764b801fd Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Thu, 11 Apr 2024 10:00:55 +0200 Subject: [PATCH 05/10] collision: mark as broken --- pkgs/applications/misc/collision/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index 1f05eb614f0d..f1c3e3b272e4 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -87,5 +87,6 @@ crystal.buildCrystalPackage rec { license = licenses.bsd2; mainProgram = "collision"; maintainers = with maintainers; [ sund3RRR ]; + broken = true; # gi-crystal error: fatal - Binding config already loaded for Gio namespace. }; } From 3bdb1b157ecb6f0985c28bdcfdff7a344946fbdf Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Thu, 11 Apr 2024 23:22:46 +0200 Subject: [PATCH 06/10] crystal: 1.12.0 -> 1.12.1 --- 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 35650041eb71..7e01daed235d 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -316,8 +316,8 @@ rec { }; crystal_1_12 = generic { - version = "1.12.0"; - sha256 = "sha256-2oH2EtZDBDnRMh5AGB2UdTVVEaku+DXZT+QTQ+V8vmM="; + version = "1.12.1"; + sha256 = "sha256-Q6uI9zPZ3IOGyUuWdC179GPktPGFPRbRWKtOF4YWCBw="; binary = binaryCrystal_1_10; llvmPackages = llvmPackages_18; }; From 47c7b064069e30a43c8ee3845fbf19c48177c965 Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Fri, 19 Apr 2024 13:37:18 +0200 Subject: [PATCH 07/10] crystal: add llvmPackages passthru and use it for crystalline --- pkgs/development/compilers/crystal/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 7e01daed235d..61b468fdff82 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -247,6 +247,7 @@ let passthru.buildCrystalPackage = callPackage ./build-package.nix { crystal = finalAttrs.finalPackage; }; + passthru.llvmPackages = llvmPackages; meta = with lib; { inherit (binary.meta) platforms; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0819e8534a36..0cf3e7ecbe58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14490,7 +14490,7 @@ with pkgs; crystal2nix = callPackage ../development/compilers/crystal2nix { }; crystalline = callPackage ../development/tools/language-servers/crystalline { - llvmPackages = llvmPackages_18; + llvmPackages = crystal.llvmPackages; }; icr = callPackage ../development/tools/icr { }; From 032dbc02dea0ed06777fdc28236cc5f9178979db Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Fri, 11 Oct 2024 15:30:14 +0200 Subject: [PATCH 08/10] crystal: 1.12.1 -> 1.14.0 --- pkgs/applications/misc/collision/default.nix | 1 - pkgs/development/compilers/crystal/default.nix | 10 +++++++++- pkgs/servers/invidious/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index f1c3e3b272e4..1f05eb614f0d 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -87,6 +87,5 @@ crystal.buildCrystalPackage rec { license = licenses.bsd2; mainProgram = "collision"; maintainers = with maintainers; [ sund3RRR ]; - broken = true; # gi-crystal error: fatal - Binding config already loaded for Gio namespace. }; } diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 61b468fdff82..c7ff9fb37566 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -323,5 +323,13 @@ rec { llvmPackages = llvmPackages_18; }; - crystal = crystal_1_12; + crystal_1_14 = generic { + version = "1.14.0"; + sha256 = "sha256-ayMF5yinHVOUaZxhlmqxb/iiGJHmloeYuKcnrPmxo9Y="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_18; + }; + + + crystal = crystal_1_14; } diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 1a2d36e6a326..a52d431a1ce9 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -51,13 +51,6 @@ crystal.buildCrystalPackage rec { inherit (versions.invidious) commit date; in '' - # bugfix for crystal_1_12 Time::Span, can be removed when fixed upstream - substituteInPlace src/invidious/yt_backend/proxy.cr \ - --replace-fail "opts[:dns_timeout] = @dns_timeout" "opts[:dns_timeout] = @dns_timeout.try(&.to_f)" \ - --replace-fail "opts[:connect_timeout] = @connect_timeout" "opts[:connect_timeout] = @connect_timeout.try(&.to_f)" \ - --replace-fail "opts[:read_timeout] = @read_timeout" "opts[:read_timeout] = @read_timeout.try(&.to_f)" \ - - for d in ${videojs}/*; do ln -s "$d" assets/videojs; done # Use the version metadata from the derivation instead of using git at diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cf3e7ecbe58..856f87b81e83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14485,6 +14485,7 @@ with pkgs; crystal_1_9 crystal_1_11 crystal_1_12 + crystal_1_14 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; From cafef48cf6bdcbbb64823f2b93ea06686e812fcc Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Fri, 11 Oct 2024 15:56:53 +0200 Subject: [PATCH 09/10] tijolo: mark as broken While updating crystal for 1.14 this project breaks with In src/code_language.cr:46:18 46 | mime = Gio.content_type_guess(file.to_s, contents[0, contents_size]) ^----------------- Error: wrong number of arguments for 'Gio.content_type_guess' (given 2, expected 4) Overloads are: - Gio.content_type_guess(filename : ::String, data : Pointer(UInt8), data_size : UInt64, result_uncertain : Pointer(Bool)) --- pkgs/applications/editors/tijolo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/applications/editors/tijolo/default.nix index 54f0f154ab37..49c58a2f9010 100644 --- a/pkgs/applications/editors/tijolo/default.nix +++ b/pkgs/applications/editors/tijolo/default.nix @@ -53,5 +53,6 @@ crystal.buildCrystalPackage rec { license = licenses.mit; mainProgram = "tijolo"; maintainers = with maintainers; [ sund3RRR ]; + broken = true; }; } From cafeb37f092228e7f81bc2cf95fa6bb000fef77d Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Fri, 25 Oct 2024 12:06:58 +0300 Subject: [PATCH 10/10] crystal: set doCheck to false for 1.14.0 --- pkgs/development/compilers/crystal/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index c7ff9fb37566..39745f61faca 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -328,6 +328,7 @@ rec { sha256 = "sha256-ayMF5yinHVOUaZxhlmqxb/iiGJHmloeYuKcnrPmxo9Y="; binary = binaryCrystal_1_10; llvmPackages = llvmPackages_18; + doCheck = false; # Some compiler spec problems on x86-64_linux with the .0 release };