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 { };