Skip to content

Commit

Permalink
Merge pull request #80389 from Infinisil/fix/crystal
Browse files Browse the repository at this point in the history
crystal_0_32: Fix hydra build on 20.03
  • Loading branch information
infinisil authored Feb 18, 2020
2 parents 81e6859 + fc1bbc0 commit 51991d7
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions pkgs/development/compilers/crystal/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, makeWrapper
, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml
, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig
, callPackage }:
Expand Down Expand Up @@ -44,10 +44,10 @@ let
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];


generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [] }:
generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [], patches ? [] }:
lib.fix (compiler: stdenv.mkDerivation {
pname = "crystal";
inherit doCheck version;
inherit doCheck version patches;

src = fetchFromGitHub {
owner = "crystal-lang";
Expand Down Expand Up @@ -269,6 +269,13 @@ in rec {
version = "0.32.1";
sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6";
binary = binaryCrystal_0_31;
patches = [
# https://github.com/crystal-lang/crystal/pull/8673, can be removed in 0.33.0
(fetchpatch {
url = "https://github.com/crystal-lang/crystal/commit/0ae289dd05aa372fa37a7c6fc6777810a2f42d26.patch";
sha256 = "0dsqppnbdxfqk7xb554mlklwc30jyhkyq8lc1diwz8ng9c1qlqfa";
})
];
};

crystal = crystal_0_32;
Expand Down

0 comments on commit 51991d7

Please sign in to comment.