Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crystal: 1.11 -> 1.14 #303173

Merged
merged 10 commits into from
Oct 27, 2024
Merged

crystal: 1.11 -> 1.14 #303173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b1380d9
crystal: 1.11 -> 1.12
will Apr 10, 2024
1b2de2c
crystalline: use llvm18 to match crystal 1.12
will Apr 10, 2024
cf6ea4f
invidious: add patch to fix compile error
will Apr 11, 2024
90a7904
crystal: add missing versions to all-packages.nix
will Apr 11, 2024
0491852
collision: mark as broken
will Apr 11, 2024
3bdb1b1
crystal: 1.12.0 -> 1.12.1
will Apr 11, 2024
47c7b06
crystal: add llvmPackages passthru and use it for crystalline
will Apr 19, 2024
032dbc0
crystal: 1.12.1 -> 1.14.0
will Oct 11, 2024
cafef48
tijolo: mark as broken
will Oct 11, 2024
cafeb37
crystal: set doCheck to false for 1.14.0
will Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkgs/applications/editors/tijolo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@ crystal.buildCrystalPackage rec {
license = licenses.mit;
mainProgram = "tijolo";
maintainers = with maintainers; [ sund3RRR ];
broken = true;
};
}
20 changes: 19 additions & 1 deletion pkgs/development/compilers/crystal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
, libffi
, llvmPackages_13
, llvmPackages_15
, llvmPackages_18
, makeWrapper
, openssl
, pcre2
Expand Down Expand Up @@ -246,6 +247,7 @@ let
passthru.buildCrystalPackage = callPackage ./build-package.nix {
crystal = finalAttrs.finalPackage;
};
passthru.llvmPackages = llvmPackages;

meta = with lib; {
inherit (binary.meta) platforms;
Expand Down Expand Up @@ -314,5 +316,21 @@ rec {
llvmPackages = llvmPackages_15;
};

crystal = crystal_1_11;
crystal_1_12 = generic {
version = "1.12.1";
sha256 = "sha256-Q6uI9zPZ3IOGyUuWdC179GPktPGFPRbRWKtOF4YWCBw=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_18;
};

crystal_1_14 = generic {
version = "1.14.0";
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
};


crystal = crystal_1_14;
}
5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14483,12 +14483,15 @@ with pkgs;
crystal_1_7
crystal_1_8
crystal_1_9
crystal_1_11
crystal_1_12
crystal_1_14
crystal;

crystal2nix = callPackage ../development/compilers/crystal2nix { };

crystalline = callPackage ../development/tools/language-servers/crystalline {
llvmPackages = llvmPackages_15;
llvmPackages = crystal.llvmPackages;
};

icr = callPackage ../development/tools/icr { };
Expand Down