b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

crystal: correct usage of darwin.apple_sdk_11_0

Browse source
This commit is contained in:
Sandro Jäckel 2023-07-18 13:55:28 +02:00 committed by Weijia Wang
parent c447ba5801
commit d47082aa9a
2 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pkgs/development/compilers/crystal/default.nix
View file

@ -17,7 +17,8 @@
, libxml2
, libyaml
, libffi
, llvmPackages
, llvmPackages_13
, llvmPackages_15
, makeWrapper
, openssl
, pcre2
@ -53,28 +54,29 @@ let
"https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";
genericBinary = { version, sha256s, rel ? 1 }:
stdenv.mkDerivation rec {
pname = "crystal-binary";
inherit version;
stdenv.mkDerivation rec {
pname = "crystal-binary";
inherit version;
src = fetchurl {
url = binaryUrl version rel;
sha256 = sha256s.${stdenv.system};
};
buildCommand = ''
mkdir -p $out
tar --strip-components=1 -C $out -xf ${src}
patchShebangs $out/bin/crystal
'';
meta.platforms = lib.attrNames sha256s;
src = fetchurl {
url = binaryUrl version rel;
sha256 = sha256s.${stdenv.system};
};
generic = (
buildCommand = ''
mkdir -p $out
tar --strip-components=1 -C $out -xf ${src}
patchShebangs $out/bin/crystal
'';
meta.platforms = lib.attrNames sha256s;
};
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;

14
pkgs/top-level/all-packages.nix
View file

@ -15418,19 +15418,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 { };