Skip to content
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

crystal: 1.2 -> 1.7 #195606

Merged
merged 21 commits into from
Jan 20, 2023
Merged

crystal: 1.2 -> 1.7 #195606

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e0d0d1c
crystal: 1.2 -> 1.6
GeopJr Oct 11, 2022
9b6172a
fix: re-enable 1.0.x - 1.2.x
GeopJr Oct 22, 2022
ffa22c6
fix: mark broken if > 1.3.x and 1686-linux
GeopJr Oct 22, 2022
89dab4d
feat: bump 1.6.x to 1.6.2
GeopJr Nov 12, 2022
4bd897e
fix: add another patch for < 1.6.0
GeopJr Nov 12, 2022
b8ae9f9
fix: supported platforms per version
ento Nov 12, 2022
ce5ce4b
fix: downstreams
miangraham Nov 21, 2022
8a4536c
fix: make kakoune-cr use crystal 1.2
GeopJr Nov 21, 2022
b1be734
fix: disable ffi on < 1.6.1 instead of patching the spec
GeopJr Nov 21, 2022
5564346
feat: use release mode only on the compiler and not the specs
GeopJr Nov 21, 2022
392df0c
feat: 1.5.0 -> 1.5.1 and enable aarch64-linux builds
GeopJr Nov 21, 2022
159ddb5
feat: get rid of unused versions
GeopJr Nov 22, 2022
eab3f4d
fix: darwin compile errors
GeopJr Dec 18, 2022
23b9200
Merge branch 'master' into update/crystal
GeopJr Dec 18, 2022
3efc4e5
fix: versionOlder => lib.versionOlder
GeopJr Dec 18, 2022
44073f6
fix: version limits on unix_spec
GeopJr Dec 18, 2022
a979bd9
fix(tzdata): prepend to ZONE_SOURCES instead of substituting in place
GeopJr Dec 21, 2022
f29f0d0
feat: 1.7.0
GeopJr Jan 9, 2023
796afea
Merge branch 'master' of https://github.com/NixOS/nixpkgs into update…
GeopJr Jan 9, 2023
52c3f58
feat: 1.7.1
GeopJr Jan 17, 2023
3597e7e
fix(darwin): use sdk 11
GeopJr Jan 17, 2023
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
74 changes: 36 additions & 38 deletions pkgs/development/compilers/crystal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
, libiconv
, libxml2
, libyaml
, libffi
, llvmPackages
, makeWrapper
, openssl
Expand All @@ -32,19 +33,21 @@ let
archs = {
x86_64-linux = "linux-x86_64";
i686-linux = "linux-i686";
x86_64-darwin = "darwin-x86_64";
x86_64-darwin = "darwin-universal";
aarch64-darwin = "darwin-universal";
GeopJr marked this conversation as resolved.
Show resolved Hide resolved
aarch64-linux = "linux-aarch64";
};

arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported");
isAarch64Darwin = stdenv.system == "aarch64-darwin";

checkInputs = [ git gmp openssl readline libxml2 libyaml ];
checkInputs = [ git gmp openssl readline libxml2 libyaml libffi ];

binaryUrl = version: rel:
if arch == archs.aarch64-linux then
"https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz"
else if arch == archs.x86_64-darwin && lib.versionOlder version "1.2.0" then
"https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-darwin-x86_64.tar.gz"
else
"https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";
GeopJr marked this conversation as resolved.
Show resolved Hide resolved

Expand All @@ -64,12 +67,11 @@ let
patchShebangs $out/bin/crystal
'';

meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin;
meta.platforms = lib.attrNames sha256s;
};

commonBuildInputs = extraBuildInputs: [
boehmgc
libatomic_ops
pcre
libevent
libyaml
Expand All @@ -85,7 +87,7 @@ let
, binary
, doCheck ? true
, extraBuildInputs ? [ ]
, buildFlags ? [ "all" "docs" ]
, buildFlags ? [ "all" "docs" "release=1"]
}:
lib.fix (compiler: stdenv.mkDerivation {
pname = "crystal";
Expand All @@ -98,7 +100,8 @@ let
inherit sha256;
};

patches = lib.optionals (lib.versionOlder version "1.2.0") [
patches = [ ]
++ lib.optionals (lib.versionOlder version "1.2.0") [
# add support for DWARF5 debuginfo, fixes builds on recent compilers
# the PR is 8 commits from 2019, so just fetch the whole thing
# and hope it doesn't change
Expand All @@ -113,6 +116,7 @@ let
postPatch = ''
export TMP=$(mktemp -d)
export HOME=$TMP
export TMPDIR=$TMP
mkdir -p $HOME/test

# Add dependency of crystal to docs to avoid issue on flag changes between releases
Expand All @@ -123,8 +127,6 @@ let
substituteInPlace src/crystal/system/unix/time.cr \
--replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo

ln -sf spec/compiler spec/std

mkdir -p $TMP/crystal

substituteInPlace spec/std/file_spec.cr \
Expand All @@ -147,13 +149,19 @@ let
# See https://github.com/crystal-lang/crystal/issues/8629
substituteInPlace spec/std/socket/udp_socket_spec.cr \
--replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'

'' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") ''
# See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277
substituteInPlace spec/compiler/loader/unix_spec.cr \
--replace 'it "parses file paths"' 'pending "parses file paths"'
'';

# Defaults are 4
preBuild = ''
export CRYSTAL_WORKERS=$NIX_BUILD_CORES
export threads=$NIX_BUILD_CORES
export CRYSTAL_CACHE_DIR=$TMP
export MACOSX_DEPLOYMENT_TARGET=10.11
'';


Expand All @@ -163,13 +171,16 @@ let

makeFlags = [
"CRYSTAL_CONFIG_VERSION=${version}"
"progress=1"
];

LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config";

FLAGS = [
"--release"
GeopJr marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

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

I guess we no longer need to do this as you're patching the versions that do not support it.

Otherwise good to. Once this is reinstated I'll squash and merge.

Thanks a ton @GeopJr !!!

Copy link
Member Author

Choose a reason for hiding this comment

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

The release flag moved to makeFlags (which has the same effect as far as I am aware) from the #173928 PR. Is there another reason to include it in FLAGS?

"--single-module" # needed for deterministic builds
] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [
# ffi is only used by the interpreter and its spec are broken on < 1.6.1
"-Dwithout_ffi"
];

# This makes sure we don't keep depending on the previous version of
Expand Down Expand Up @@ -220,58 +231,45 @@ let
export PATH=${lib.makeBinPath checkInputs}:$PATH
'';

passthru.buildBinary = binary;
passthru.buildCrystalPackage = callPackage ./build-package.nix {
crystal = compiler;
};

meta = with lib; {
broken = stdenv.isDarwin && (isAarch64Darwin -> lib.versionOlder version "1.2.0");
inherit (binary.meta) platforms;
description = "A compiled language with Ruby like syntax and type inference";
homepage = "https://crystal-lang.org/";
license = licenses.asl20;
maintainers = with maintainers; [ david50407 manveru peterhoeg ];
platforms = let archNames = builtins.attrNames archs; in
if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames;
};
})
);

in
rec {
binaryCrystal_1_0 = genericBinary {
version = "1.0.0";
sha256s = {
x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880";
i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch";
x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099";
aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53";
};
};

binaryCrystal_1_2 = genericBinary {
version = "1.2.0";
version = "1.2.2";
sha256s = {
aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf";
x86_64-linux = "sha256-sW5nhihW/6Dkq95i3vJNWs2D1CtQhujhxVbgQCAas6E=";
aarch64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs=";
x86_64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs=";
aarch64-linux = "sha256-QgPKUDFyodqY1+b85AybSpbbr0RmfISdNpB08Wf34jo=";
};
};

crystal_1_0 = generic {
version = "1.0.0";
sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8=";
binary = binaryCrystal_1_0;
};

crystal_1_1 = generic {
version = "1.1.1";
sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ=";
binary = crystal_1_0;
};

crystal_1_2 = generic {
version = "1.2.2";
sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU=";
binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1;
binary = binaryCrystal_1_2;
extraBuildInputs = [ libatomic_ops ];
};

crystal_1_6 = generic {
version = "1.6.2";
sha256 = "sha256-WgU6Y8ww1IYyB0vd5tXwmWBEL5RiPjHA7YzPd21jlsY=";
binary = binaryCrystal_1_2;
};

crystal = crystal_1_2;
crystal = crystal_1_6;
}
4 changes: 2 additions & 2 deletions pkgs/development/tools/ameba/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

crystal.buildCrystalPackage rec {
pname = "ameba";
version = "1.0.1";
version = "1.3.1";

src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
hash = "sha256-dvhGk6IbSV3pxtoIV7+0+qf47hz2TooPhsSwFd2+xkw=";
hash = "sha256-SZ2sBQeZgtPOYioH9eK5MveFtWVGPvgKMrqsCfjoRGM=";
};

format = "make";
Expand Down
11 changes: 5 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8507,7 +8507,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};

kakoune-cr = callPackage ../tools/misc/kakoune-cr { };
kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; };

katana = callPackage ../tools/security/katana { };

Expand Down Expand Up @@ -13889,18 +13889,17 @@ with pkgs;
};

inherit (callPackages ../development/compilers/crystal {
llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10;
llvmPackages = llvmPackages_13;
Copy link
Contributor

Choose a reason for hiding this comment

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

Something I don't get from the x86-darwing error is that it refers to clang-11, but shouldn't it refer to clang-13?

Maybe we could try sticking with llvmPackages_11 here? I'm not sure for the underlying reason, but the llvm package in nixpkgs points to 11.

Or we are missing some path to use llvmPackages_13.clang

Copy link
Member Author

Choose a reason for hiding this comment

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

:/ Closest discussion I could find: https://discourse.nixos.org/t/nixpkgs-aarch64-darwin-build-m1-uses-wrong-old-clang-how-to-fix/ (in our case x86_64 instead of aarch64)

the suggested change adds clang-unwrapped to PATH

nixpkgs/pkgs/build-support/libredirect/default.nix

Lines 35 to 49 in 6de1617

${if stdenv.isDarwin && stdenv.isAarch64 then ''
# We need the unwrapped binutils and clang:
# We also want to build a fat library with x86_64, arm64, arm64e in there.
# Because we use the unwrapped tools, we need to provide -isystem for headers
# and the library search directory for libdl.
# We can't build this on x86_64, because the libSystem we point to doesn't
# like arm64(e).
PATH=${bintools-unwrapped}/bin:${llvmPackages_13.clang-unwrapped}/bin:$PATH \
clang -arch x86_64 -arch arm64 -arch arm64e \
-isystem ${llvmPackages_13.clang.libc}/include \
-isystem ${llvmPackages_13.libclang.lib}/lib/clang/*/include \
-L${llvmPackages_13.clang.libc}/lib \
-Wl,-install_name,$libName \
-Wall -std=c99 -O3 -fPIC libredirect.c \
-ldl -shared -o "$libName"

Someone on darwin needs to give it a try otherwise I'll just revert to llvmPackages_11 for x86_64

The nix build definitely downloaded clang-13:

...
/nix/store/5b4s502i0ifbivjfb0pwxjlf7vrwgr2v-clang-13.0.1-lib
...
/nix/store/dx1q2d5zh3f45y8amkisy5lbq9b48zsx-clang-13.0.1
...
/nix/store/myqkicxg2zg8wmc84k048hn6fznilqm9-clang-wrapper-13.0.1
...

https://logs.nix.ci/?attempt_id=65e680ba-2ce4-4aae-8375-2b4107302113&key=nixos%2Fnixpkgs.195606

})
crystal_1_0
crystal_1_1
crystal_1_2
crystal_1_6
crystal;

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

icr = callPackage ../development/tools/icr { };

scry = callPackage ../development/tools/scry { };
scry = callPackage ../development/tools/scry { crystal = crystal_1_2; };

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

Expand Down Expand Up @@ -14971,7 +14970,7 @@ with pkgs;

millet = callPackage ../development/tools/millet {};

mint = callPackage ../development/compilers/mint { };
mint = callPackage ../development/compilers/mint { crystal = crystal_1_2; };

mitscheme = callPackage ../development/compilers/mit-scheme
{ stdenv = gcc10StdenvCompat; texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; };
Expand Down