From 886d371ce756f98bcb334a954d51af4b38cca1dc Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 11 Aug 2025 14:17:36 +0100 Subject: [PATCH 1/3] {crystal_1_14,crystal_1_15,crystal_1_16,crystal_1_17}: bump LLVM See: * * * * --- pkgs/development/compilers/crystal/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 3a575396c71b3..4d85f7b815c38 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -17,7 +17,9 @@ libyaml, libffi, llvmPackages_15, - llvmPackages_18, + llvmPackages_19, + llvmPackages_20, + llvmPackages_21, makeWrapper, openssl, pcre2, @@ -308,7 +310,7 @@ rec { 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 }; @@ -316,7 +318,7 @@ rec { version = "1.15.1"; sha256 = "sha256-L/Q8yZdDq/wn4kJ+zpLfi4pxznAtgjxTCbLnEiCC2K0="; binary = binaryCrystal_1_10; - llvmPackages = llvmPackages_18; + llvmPackages = llvmPackages_19; doCheck = false; }; @@ -324,7 +326,7 @@ rec { version = "1.16.3"; sha256 = "sha256-U9H1tHUMyDNicZnXzEccDki5bGXdV0B2Wu2PyCksPVI="; binary = binaryCrystal_1_10; - llvmPackages = llvmPackages_18; + llvmPackages = llvmPackages_20; doCheck = false; }; @@ -332,7 +334,7 @@ rec { version = "1.17.1"; sha256 = "sha256-+wHhozPhpIsfQy1Lw+V48zvuWCfXzT4IC9KA1AU/DLw="; binary = binaryCrystal_1_10; - llvmPackages = llvmPackages_18; + llvmPackages = llvmPackages_21; doCheck = false; }; From 5d8cb800f4cbe811e0601d4a5fd3656b92329fff Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 5 Sep 2025 00:30:01 +0100 Subject: [PATCH 2/3] ahk_x11: 1.0.4-unstable-2025-01-30 -> 1.0.5-unstable-2025-09-04 Co-authored-by: Ulysses Zhan --- pkgs/by-name/ah/ahk_x11/package.nix | 18 +++++++++++------- pkgs/by-name/ah/ahk_x11/shards.nix | 12 ++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ah/ahk_x11/package.nix b/pkgs/by-name/ah/ahk_x11/package.nix index f31fe47f11271..1750d7cafdc05 100644 --- a/pkgs/by-name/ah/ahk_x11/package.nix +++ b/pkgs/by-name/ah/ahk_x11/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - crystal_1_11, + crystal, copyDesktopItems, gtk3, libxkbcommon, @@ -11,6 +11,8 @@ openbox, xvfb-run, xdotool, + nix-update-script, + versionCheckHook, buildDevTarget ? false, # the dev version prints debug info }: @@ -18,7 +20,7 @@ # 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 @@ -27,9 +29,6 @@ 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; @@ -37,8 +36,8 @@ crystal.buildCrystalPackage { src = fetchFromGitHub { owner = "phil294"; repo = "AHK_X11"; - rev = "66eb5208d95f4239822053c7d35f32bc62d57573"; # tag = version; - hash = "sha256-KzD5ExYPRYgsYO+/hlnoQpBJwokjaK5lYL2kobI2XQ0="; + rev = "f5375887dec3953c4cb3d78271821645bc3840f2"; + hash = "sha256-GTcbwCVWnC+KP2qLArEUIUMs5S0vpkA4gJHQpWP1TNg="; fetchSubmodules = true; }; @@ -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"; diff --git a/pkgs/by-name/ah/ahk_x11/shards.nix b/pkgs/by-name/ah/ahk_x11/shards.nix index ade3b370c53b3..d7e82bf7b9804 100644 --- a/pkgs/by-name/ah/ahk_x11/shards.nix +++ b/pkgs/by-name/ah/ahk_x11/shards.nix @@ -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 = { @@ -26,7 +26,7 @@ }; harfbuzz = { url = "https://github.com/hugopl/harfbuzz.cr.git"; - tag = "v0.2.0"; + rev = "v0.2.0"; sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694"; }; notify = { @@ -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 = { From 48c2a4e44078ae665aec1eddc0b1f4e562c0e7d1 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 11 Aug 2025 14:17:36 +0100 Subject: [PATCH 3/3] crystal_1_11: drop LLVM 15 is being removed for the 25.11 release. --- pkgs/development/compilers/crystal/default.nix | 15 +-------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 4d85f7b815c38..367a08aa87cbe 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -16,7 +16,6 @@ libxml2, libyaml, libffi, - llvmPackages_15, llvmPackages_19, llvmPackages_20, llvmPackages_21, @@ -170,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="$(