public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crystal: refactor and add 0.35.1

This commit is contained in:
Fabián Heredia Montiel 2020-11-16 13:32:03 -06:00 committed by Peter Hoeg
parent 224e1d5299
commit bc029589d4
2 changed files with 151 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
pkgs/development/compilers/crystal/default.nix
View File

@ -1,7 +1,29 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper { stdenv
, coreutils, git, gmp, hostname, openssl, readline, tzdata, libxml2, libyaml , callPackage
, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig , fetchFromGitHub
, callPackage }: , fetchurl
, lib
# Dependencies
, boehmgc
, coreutils
, git
, gmp
, hostname
, libatomic_ops
, libevent
, libiconv
, libxml2
, libyaml
, llvmPackages
, makeWrapper
, openssl
, pcre
, pkgconfig
, readline
, tzdata
, which
, zlib
}:
# We need multiple binaries as a given binary isn't always able to build # We need multiple binaries as a given binary isn't always able to build
# (even slightly) older or newer versions. # (even slightly) older or newer versions.
@ -43,144 +65,152 @@ let
] ++ extraBuildInputs ] ++ extraBuildInputs
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
generic = (
{ version
, sha256
, binary
, doCheck ? true
, extraBuildInputs ? []
, buildFlags ? ["all" "docs"]
}:
lib.fix (compiler: stdenv.mkDerivation {
pname = "crystal";
inherit buildFlags doCheck version;
generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [] }: src = fetchFromGitHub {
lib.fix (compiler: stdenv.mkDerivation { owner = "crystal-lang";
pname = "crystal"; repo = "crystal";
inherit doCheck version; rev = version;
inherit sha256;
};
src = fetchFromGitHub { outputs = [ "out" "lib" "bin" ];
owner = "crystal-lang";
repo = "crystal";
rev = version;
inherit sha256;
};
outputs = [ "out" "lib" "bin" ]; postPatch = ''
# Add dependency of crystal to docs to avoid issue on flag changes between releases
# https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782
substituteInPlace Makefile \
--replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation'
postPatch = '' substituteInPlace src/crystal/system/unix/time.cr \
substituteInPlace src/crystal/system/unix/time.cr \ --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo
--replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo
ln -sf spec/compiler spec/std ln -sf spec/compiler spec/std
# Dirty fix for when no sandboxing is enabled # Dirty fix for when no sandboxing is enabled
rm -rf /tmp/crystal rm -rf /tmp/crystal
mkdir -p /tmp/crystal mkdir -p /tmp/crystal
substituteInPlace spec/std/file_spec.cr \ substituteInPlace spec/std/file_spec.cr \
--replace '/bin/ls' '${coreutils}/bin/ls' \ --replace '/bin/ls' '${coreutils}/bin/ls' \
--replace '/usr/share' '/tmp/crystal' \ --replace '/usr/share' '/tmp/crystal' \
--replace '/usr' '/tmp' --replace '/usr' '/tmp'
substituteInPlace spec/std/process_spec.cr \ substituteInPlace spec/std/process_spec.cr \
--replace '/bin/cat' '${coreutils}/bin/cat' \ --replace '/bin/cat' '${coreutils}/bin/cat' \
--replace '/bin/ls' '${coreutils}/bin/ls' \ --replace '/bin/ls' '${coreutils}/bin/ls' \
--replace '/usr/bin/env' '${coreutils}/bin/env' \ --replace '/usr/bin/env' '${coreutils}/bin/env' \
--replace '"env"' '"${coreutils}/bin/env"' \ --replace '"env"' '"${coreutils}/bin/env"' \
--replace '"/usr"' '"/tmp"' --replace '"/usr"' '"/tmp"'
substituteInPlace spec/std/socket/tcp_server_spec.cr \ substituteInPlace spec/std/socket/tcp_server_spec.cr \
--replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'
substituteInPlace spec/std/system_spec.cr \ substituteInPlace spec/std/system_spec.cr \
--replace '`hostname`' '`${hostname}/bin/hostname`' --replace '`hostname`' '`${hostname}/bin/hostname`'
# See https://github.com/crystal-lang/crystal/pull/8640 # See https://github.com/crystal-lang/crystal/pull/8640
substituteInPlace spec/std/http/cookie_spec.cr \ substituteInPlace spec/std/http/cookie_spec.cr \
--replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'
# See https://github.com/crystal-lang/crystal/issues/8629 # See https://github.com/crystal-lang/crystal/issues/8629
substituteInPlace spec/std/socket/udp_socket_spec.cr \ substituteInPlace spec/std/socket/udp_socket_spec.cr \
--replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
# See https://github.com/crystal-lang/crystal/pull/8699 # See https://github.com/crystal-lang/crystal/pull/8699
substituteInPlace spec/std/xml/xml_spec.cr \ substituteInPlace spec/std/xml/xml_spec.cr \
--replace 'it "handles errors"' 'pending "handles errors"' --replace 'it "handles errors"' 'pending "handles errors"'
''; '';
buildInputs = commonBuildInputs extraBuildInputs; buildInputs = commonBuildInputs extraBuildInputs;
nativeBuildInputs = [ binary makeWrapper which pkgconfig llvm ]; nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ];
makeFlags = [ makeFlags = [
"CRYSTAL_CONFIG_VERSION=${version}" "CRYSTAL_CONFIG_VERSION=${version}"
]; ];
buildFlags = [ LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config";
"all" "docs"
];
LLVM_CONFIG = "${llvm}/bin/llvm-config"; FLAGS = [
"--release"
"--single-module" # needed for deterministic builds
];
FLAGS = [ # This makes sure we don't keep depending on the previous version of
"--release" # crystal used to build this one.
"--single-module" # needed for deterministic builds CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal";
];
# This makes sure we don't keep depending on the previous version of # We *have* to add `which` to the PATH or crystal is unable to build
# crystal used to build this one. # stuff later if which is not available.
CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal"; installPhase = ''
runHook preInstall
# We *have* to add `which` to the PATH or crystal is unable to build stuff install -Dm755 .build/crystal $bin/bin/crystal
# later if which is not available. wrapProgram $bin/bin/crystal \
installPhase = '' --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \
runHook preInstall --suffix CRYSTAL_PATH : lib:$lib/crystal \
--suffix CRYSTAL_LIBRARY_PATH : ${
lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
}
install -dm755 $lib/crystal
cp -r src/* $lib/crystal/
install -Dm755 .build/crystal $bin/bin/crystal install -dm755 $out/share/doc/crystal/api
wrapProgram $bin/bin/crystal \ cp -r docs/* $out/share/doc/crystal/api/
--suffix PATH : ${lib.makeBinPath [ pkgconfig clang which ]} \ cp -r samples $out/share/doc/crystal/
--suffix CRYSTAL_PATH : lib:$lib/crystal \
--suffix CRYSTAL_LIBRARY_PATH : ${
lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
}
install -dm755 $lib/crystal
cp -r src/* $lib/crystal/
install -dm755 $out/share/doc/crystal/api install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
cp -r docs/* $out/share/doc/crystal/api/ install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
cp -r samples $out/share/doc/crystal/
install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
install -Dm644 -t $out/share/licenses/crystal LICENSE README.md mkdir -p $out
ln -s $bin/bin $out/bin
ln -s $lib $out/lib
mkdir -p $out runHook postInstall
ln -s $bin/bin $out/bin '';
ln -s $lib $out/lib
runHook postInstall enableParallelBuilding = true;
'';
enableParallelBuilding = true; dontStrip = true;
dontStrip = true; checkTarget = "compiler_spec";
checkTarget = "spec"; preCheck = ''
export HOME=/tmp
mkdir -p $HOME/test
preCheck = '' export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
export HOME=/tmp export PATH=${lib.makeBinPath checkInputs}:$PATH
mkdir -p $HOME/test '';
export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH passthru.buildCrystalPackage = callPackage ./build-package.nix {
export PATH=${lib.makeBinPath checkInputs}:$PATH crystal = compiler;
''; };
passthru.buildCrystalPackage = callPackage ./build-package.nix { meta = with lib; {
crystal = compiler; description = "A compiled language with Ruby like syntax and type inference";
}; homepage = "https://crystal-lang.org/";
license = licenses.asl20;
meta = with lib; { maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
description = "A compiled language with Ruby like syntax and type inference"; platforms = builtins.attrNames archs;
homepage = "https://crystal-lang.org/"; };
license = licenses.asl20; })
maintainers = with maintainers; [ manveru david50407 peterhoeg ]; );
platforms = builtins.attrNames archs;
};
}));
in rec { in rec {
binaryCrystal_0_31 = genericBinary { binaryCrystal_0_31 = genericBinary {
@ -202,24 +232,30 @@ in rec {
crystal_0_32 = generic { crystal_0_32 = generic {
version = "0.32.1"; version = "0.32.1";
sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6"; sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6";
binary = binaryCrystal_0_31; binary = crystal_0_31;
}; };
crystal_0_33 = generic { crystal_0_33 = generic {
version = "0.33.0"; version = "0.33.0";
sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi";
binary = binaryCrystal_0_31; binary = crystal_0_32;
doCheck = false; # 4 checks are failing now
}; };
crystal_0_34 = generic { crystal_0_34 = generic {
version = "0.34.0"; version = "0.34.0";
sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4";
binary = crystal_0_33; binary = crystal_0_33;
doCheck = false; # 4 checks are failing now
}; };
crystal = crystal_0_34; crystal_0_35 = generic {
version = "0.35.1";
sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69";
binary = crystal_0_34;
# Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789
extraBuildInputs = [ git ];
};
crystal = crystal_0_35;
crystal2nix = callPackage ./crystal2nix.nix {}; crystal2nix = callPackage ./crystal2nix.nix {};
} }

3
pkgs/top-level/all-packages.nix
View File

@ -8799,12 +8799,13 @@ in
copper = callPackage ../development/compilers/copper {}; copper = callPackage ../development/compilers/copper {};
inherit (callPackages ../development/compilers/crystal { inherit (callPackages ../development/compilers/crystal {
inherit (llvmPackages_10) stdenv clang llvm; llvmPackages = llvmPackages_10;
}) })
crystal_0_31 crystal_0_31
crystal_0_32 crystal_0_32
crystal_0_33 crystal_0_33
crystal_0_34 crystal_0_34
crystal_0_35
crystal crystal
crystal2nix; crystal2nix;