Unverified Commit edaaba46 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #244155 from SuperSandro2000/crystal-apple-sdk 

crystal: correct usage of darwin.apple_sdk_11_0
parents 8f5f44b9 d47082aa

pkgs/development/compilers/crystal/default.nix

+23 −19
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
, libxml2

, libyaml

, libffi

, llvmPackages

, llvmPackages_13

, llvmPackages_15

, makeWrapper

, openssl

, pcre2
@@ -71,10 +72,11 @@ let 
    meta.platforms = lib.attrNames sha256s;

  };



  generic = (

  generic =

    { version

    , sha256

    , binary

    , llvmPackages

    , doCheck ? true

    , extraBuildInputs ? [ ]

    , buildFlags ? [ "all" "docs" "release=1"]
@@ -244,9 +246,7 @@ let 
        license = licenses.asl20;

        maintainers = with maintainers; [ david50407 manveru peterhoeg donovanglover ];

      };

    })

  );



    });

in

rec {

  binaryCrystal_1_2 = genericBinary {
@@ -263,6 +263,7 @@ rec { 
    version = "1.2.2";

    sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU=";

    binary = binaryCrystal_1_2;

    llvmPackages = llvmPackages_13;

    extraBuildInputs = [ libatomic_ops ];

  };
@@ -270,18 +271,21 @@ rec { 
    version = "1.7.3";

    sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE=";

    binary = binaryCrystal_1_2;

    llvmPackages = llvmPackages_13;

  };



  crystal_1_8 = generic {

    version = "1.8.2";

    sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8=";

    binary = binaryCrystal_1_2;

    llvmPackages = llvmPackages_15;

  };



  crystal_1_9 = generic {

    version = "1.9.2";

    sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84=";

    binary = binaryCrystal_1_2;

    llvmPackages = llvmPackages_15;

  };



  crystal = crystal_1_9;

pkgs/top-level/all-packages.nix

+3 −11
Original line number Diff line number Diff line
@@ -15422,19 +15422,11 @@ with pkgs; 
    inherit (darwin.apple_sdk.frameworks) CoreServices;

  };













  inherit (callPackages ../development/compilers/crystal {













    llvmPackages = llvmPackages_13;













    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;













  })













  inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { })















    crystal_1_2













    crystal_1_7;

























  inherit (callPackages ../development/compilers/crystal {













    llvmPackages = llvmPackages_15;













    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;













  })













    crystal_1_9













    crystal_1_7















    crystal_1_8













    crystal_1_9















    crystal;





























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