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: 0.32.1 -> 0.33.0 #80390

Closed
wants to merge 3 commits into from
Closed

crystal: 0.32.1 -> 0.33.0 #80390

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b63e81
crystal: 0.32.1 -> 0.33.0
Br1ght0ne Feb 18, 2020
a0dae99
Update pkgs/development/compilers/crystal/default.nix
peterhoeg Feb 23, 2020
e11bfc8
Merge branch 'master' into crystal-0.33.0
lukateras Feb 23, 2020
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
37 changes: 25 additions & 12 deletions pkgs/development/compilers/crystal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ let

ln -s spec/compiler spec/std

mkdir /tmp/crystal
mkdir -p /tmp/crystal/cache
substituteInPlace spec/std/file_spec.cr \
--replace '/bin/ls' '${coreutils}/bin/ls' \
--replace '/usr/share' '/tmp/crystal' \
Expand All @@ -77,23 +77,19 @@ let
--replace '"env"' '"${coreutils}/bin/env"' \
--replace '"/usr"' '"/tmp"'

substituteInPlace spec/std/socket/tcp_server_spec.cr \
--replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'

substituteInPlace spec/std/system_spec.cr \
--replace '`hostname`' '`${nettools}/bin/hostname`'

# See https://github.com/crystal-lang/crystal/pull/8640
substituteInPlace spec/std/http/cookie_spec.cr \
--replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'

# 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"'

# See https://github.com/crystal-lang/crystal/pull/8699
substituteInPlace spec/std/xml/xml_spec.cr \
--replace 'it "handles errors"' 'pending "handles errors"'
# See https://github.com/crystal-lang/crystal/pull/7925
substituteInPlace spec/std/http/cookie_spec.cr \
--replace 'it "by max-age=0"' 'pending "by max-age=0"'

substituteInPlace spec/std/file_spec.cr \
--replace 'pending_win32 "raises if file cannot be accessed"' 'pending "raises if file cannot be accessed"'
'';

buildInputs = commonBuildInputs extraBuildInputs;
Expand All @@ -102,6 +98,8 @@ let

makeFlags = [
"CRYSTAL_CONFIG_VERSION=${version}"
# FIXME: not sure if this is the best idea
Copy link
Member

@lukateras lukateras Feb 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Why not? LGTM. The alternative is to set a writable HOME.

"CRYSTAL_CACHE_DIR=/tmp/crystal/cache"
];

buildFlags = [
Expand Down Expand Up @@ -214,6 +212,15 @@ in rec {
};
};

binaryCrystal_0_32 = genericBinary {
version = "0.32.1";
sha256s = {
x86_64-linux = "1mwpr87ix14vsdlswy3qjgc4pn9k5585wp3wyypbclz42f4gsc8c";
i686-linux = "17zfvvrzcd0hrxj3pcir3gwl95gazg7a49hk1kf88dhk0cj0hmis";
x86_64-darwin = "155wf1rnc5kh3y6gn5pjh185p3nvq50lfill1b714sm3kmqfh099";
};
};

crystal_0_27 = generic {
version = "0.27.2";
sha256 = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj";
Expand Down Expand Up @@ -248,7 +255,13 @@ in rec {
binary = binaryCrystal_0_31;
};

crystal = crystal_0_32;
crystal_0_33 = generic {
version = "0.33.0";
sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi";
binary = binaryCrystal_0_32;
};

crystal = crystal_0_33;

crystal2nix = callPackage ./crystal2nix.nix {};
}