Unverified Commit 7d04516f authored by Emily's avatar Emily Committed by GitHub
Browse files

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

parents bcc37902 48c2a4e4
Loading
Loading
Loading
Loading
+11 −7
Original line number Diff line number Diff line
{
  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";
+6 −6
Original line number Diff line number Diff line
@@ -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 = {
+8 −19
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@
  libxml2,
  libyaml,
  libffi,
  llvmPackages_15,
  llvmPackages_18,
  llvmPackages_19,
  llvmPackages_20,
  llvmPackages_21,
  makeWrapper,
  openssl,
  pcre2,
@@ -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
      '';

      strictDeps = true;
@@ -296,19 +293,11 @@ 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
  };

@@ -316,7 +305,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 +313,7 @@ rec {
    version = "1.16.3";
    sha256 = "sha256-U9H1tHUMyDNicZnXzEccDki5bGXdV0B2Wu2PyCksPVI=";
    binary = binaryCrystal_1_10;
    llvmPackages = llvmPackages_18;
    llvmPackages = llvmPackages_20;
    doCheck = false;
  };

@@ -332,7 +321,7 @@ rec {
    version = "1.17.1";
    sha256 = "sha256-+wHhozPhpIsfQy1Lw+V48zvuWCfXzT4IC9KA1AU/DLw=";
    binary = binaryCrystal_1_10;
    llvmPackages = llvmPackages_18;
    llvmPackages = llvmPackages_21;
    doCheck = false;
  };

+1 −0
Original line number Diff line number Diff line
@@ -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
+0 −1
Original line number Diff line number Diff line
@@ -4712,7 +4712,6 @@ with pkgs;
  corretto21 = javaPackages.compiler.corretto21;

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