Skip to content

{crystal_1_14,crystal_1_15,crystal_1_16,crystal_1_17}: bump LLVM; crystal_1_11: drop #439928

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

Merged
emilazy merged 3 commits into from
Sep 5, 2025
Merged

{crystal_1_14,crystal_1_15,crystal_1_16,crystal_1_17}: bump LLVM; crystal_1_11: drop #439928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
886d371
{crystal_1_14,crystal_1_15,crystal_1_16,crystal_1_17}: bump LLVM
emilazy Aug 11, 2025
5d8cb80
ahk_x11: 1.0.4-unstable-2025-01-30 -> 1.0.5-unstable-2025-09-04
emilazy Sep 4, 2025
48c2a4e
crystal_1_11: drop
emilazy Aug 11, 2025
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
18 changes: 11 additions & 7 deletions pkgs/by-name/ah/ahk_x11/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
lib,
fetchFromGitHub,
crystal_1_11,
crystal,
copyDesktopItems,
gtk3,
libxkbcommon,
Expand All @@ -11,14 +11,16 @@
openbox,
xvfb-run,
xdotool,
nix-update-script,
versionCheckHook,

buildDevTarget ? false, # the dev version prints debug info
}:

# NOTICE: AHK_X11 from this package does not support compiling scripts into portable executables.
let
pname = "ahk_x11";
version = "1.0.4-unstable-2025-01-30"; # 1.0.4 cannot build on Crystal 1.12 or below.
version = "1.0.5-unstable-2025-09-04";

inherit (xorg)
libXinerama
Expand All @@ -27,18 +29,15 @@ let
libXi
;

# See upstream README. Crystal 1.11 or below is needed to work around phil294/AHK_X11#89.
crystal = crystal_1_11;

in
crystal.buildCrystalPackage {
inherit pname version;

src = fetchFromGitHub {
owner = "phil294";
repo = "AHK_X11";
rev = "66eb5208d95f4239822053c7d35f32bc62d57573"; # tag = version;
hash = "sha256-KzD5ExYPRYgsYO+/hlnoQpBJwokjaK5lYL2kobI2XQ0=";
rev = "f5375887dec3953c4cb3d78271821645bc3840f2";
hash = "sha256-GTcbwCVWnC+KP2qLArEUIUMs5S0vpkA4gJHQpWP1TNg=";
fetchSubmodules = true;
};

Expand Down Expand Up @@ -100,6 +99,11 @@ crystal.buildCrystalPackage {
# I don't know how to fix it for xvfb and openbox.
doCheck = false;

doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];

passthru.updateScript = nix-update-script { };

meta = {
description = "AutoHotkey for X11";
homepage = "https://phil294.github.io/AHK_X11";
Expand Down
12 changes: 6 additions & 6 deletions pkgs/by-name/ah/ahk_x11/shards.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
};
cron_parser = {
url = "https://github.com/kostya/cron_parser.git";
tag = "v0.4.0";
rev = "v0.4.0";
sha256 = "17fgg2nvyx99v05l10h6cnxfr7swz8yaxhmnk4l47kg2spi8w90a";
};
future = {
url = "https://github.com/crystal-community/future.cr.git";
tag = "v1.0.0";
rev = "v1.0.0";
sha256 = "1mji2djkrf4vxgs432kgkzxx54ybzk636789k2vsws3sf14l74i8";
};
gi-crystal = {
url = "https://github.com/hugopl/gi-crystal.git";
tag = "v0.22.1";
rev = "v0.22.1";
sha256 = "1bwsr5i6cmvnc72qdnmq4v6grif1hahrc7s6js2ivdrfix72flyg";
};
gtk3 = {
Expand All @@ -26,7 +26,7 @@
};
harfbuzz = {
url = "https://github.com/hugopl/harfbuzz.cr.git";
tag = "v0.2.0";
rev = "v0.2.0";
sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";
};
notify = {
Expand All @@ -36,12 +36,12 @@
};
pango = {
url = "https://github.com/hugopl/pango.cr.git";
tag = "v0.3.1";
rev = "v0.3.1";
sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv";
};
tasker = {
url = "https://github.com/spider-gazelle/tasker.git";
tag = "v2.1.4";
rev = "v2.1.4";
sha256 = "0254sl279nrw5nz43dz5gm89ah1zrw5bvxfma81navpx5gfg9pyb";
};
x11 = {
Expand Down
27 changes: 8 additions & 19 deletions pkgs/development/compilers/crystal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
libxml2,
libyaml,
libffi,
llvmPackages_15,
llvmPackages_18,
llvmPackages_19,
llvmPackages_20,
llvmPackages_21,
makeWrapper,
openssl,
pcre2,
Expand Down Expand Up @@ -168,11 +169,7 @@ let
export threads=$NIX_BUILD_CORES
export CRYSTAL_CACHE_DIR=$TMP
export MACOSX_DEPLOYMENT_TARGET=10.11

# Available since 1.13.0 https://github.com/crystal-lang/crystal/pull/14574
if [[ -f src/SOURCE_DATE_EPOCH ]]; then
export SOURCE_DATE_EPOCH="$(<src/SOURCE_DATE_EPOCH)"
fi
Comment on lines 172 to 175

@UlyssesZh UlyssesZh Sep 4, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the whole if clause be removed? It makes more sense to me if the export line is kept here.

@emilazy emilazy Sep 4, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thank you! Fixed.

export SOURCE_DATE_EPOCH="$(<src/SOURCE_DATE_EPOCH)"
'';

strictDeps = true;
Expand Down Expand Up @@ -296,43 +293,35 @@ rec {
};
};

# When removing this version, also remove checks for src/SOURCE_DATE_EPOCH existence
crystal_1_11 = generic {
version = "1.11.2";
sha256 = "sha256-BBEDWqFtmFUNj0kuGBzv71YHO3KjxV4d2ySTCD4HhLc=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_15;
};

crystal_1_14 = generic {
version = "1.14.1";
sha256 = "sha256-cQWK92BfksOW8GmoXn4BmPGJ7CLyLAeKccOffQMh5UU=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_18;
llvmPackages = llvmPackages_19;
doCheck = false; # Some compiler spec problems on x86-64_linux with the .0 release
};

crystal_1_15 = generic {
version = "1.15.1";
sha256 = "sha256-L/Q8yZdDq/wn4kJ+zpLfi4pxznAtgjxTCbLnEiCC2K0=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_18;
llvmPackages = llvmPackages_19;
doCheck = false;
};

crystal_1_16 = generic {
version = "1.16.3";
sha256 = "sha256-U9H1tHUMyDNicZnXzEccDki5bGXdV0B2Wu2PyCksPVI=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_18;
llvmPackages = llvmPackages_20;
doCheck = false;
};

crystal_1_17 = generic {
version = "1.17.1";
sha256 = "sha256-+wHhozPhpIsfQy1Lw+V48zvuWCfXzT4IC9KA1AU/DLw=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_18;
llvmPackages = llvmPackages_21;
doCheck = false;
};

Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ mapAliases {
crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
crystal_1_9 = throw "'crystal_1_9' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
crystal_1_11 = throw "'crystal_1_11' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-09-04
crystal_1_12 = throw "'crystal_1_12' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-19
clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19
clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17
Expand Down
1 change: 0 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 @@ -4720,7 +4720,6 @@ with pkgs;
corretto21 = javaPackages.compiler.corretto21;

inherit (callPackage ../development/compilers/crystal { })
crystal_1_11
crystal_1_14
crystal_1_15
crystal_1_16
Expand Down
Loading