Merge pull request #41834 from manveru/crystal-2.25.0

Crystal: 0.24.2 -> 0.25.0
This commit is contained in:
Jörg Thalheim 2018-06-18 10:10:16 +01:00 committed by GitHub
commit 0eee2f746f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 26 deletions

View file

@ -1,26 +1,27 @@
{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, makeWrapper }:
{ stdenv, fetchurl, makeWrapper
, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang }:
stdenv.mkDerivation rec {
name = "crystal-${version}";
version = "0.24.2";
version = "0.25.0";
src = fetchurl {
url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
sha256 = "1l7nrrfgz1yxxjphypwzlxj6dbari20p71zb4l0gix09lmas8l6y";
sha256 = "1pnx21ky6cqfyv6df4mmjnyd1yh1bvcqkdzq6f0mk0yrkcl57k3q";
};
prebuiltName = "crystal-0.24.2-1";
prebuiltName = "crystal-0.25.0-1";
prebuiltSrc = let arch = {
"x86_64-linux" = "linux-x86_64";
"i686-linux" = "linux-i686";
"x86_64-darwin" = "darwin-x86_64";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
in fetchurl {
url = "https://github.com/crystal-lang/crystal/releases/download/0.24.2/${prebuiltName}-${arch}.tar.gz";
url = "https://github.com/crystal-lang/crystal/releases/download/0.25.0/${prebuiltName}-${arch}.tar.gz";
sha256 = {
"x86_64-linux" = "1xf6riwd5k5f95988m1hsppsfii5v96svgmy12ncy7mgmm7k4dh3";
"i686-linux" = "0ar05kj89pm3zxfnxwhf0mz9vrd9q5p47y4969sh0r6knccri0kp";
"x86_64-darwin" = "1vz8bi5rfgggiic4ayxbcf6pfmdjvqcg4lsivnk2fyshr1m8l0h5";
"x86_64-linux" = "1q006086pbbvhmscbjzzgbdq1jkppd4p4kl9z9fn9j6np8fhi8ms";
"i686-linux" = "074ndm9n0mzsa7dkl3chhf234l85msm99yjksa5980lyqynyrw1d";
"x86_64-darwin" = "006f2j5984dkp5lsq8kns5mkxbhj50syjvzqk9z931pxl92wc7iy";
}."${stdenv.system}";
};
@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -Dm755 .build/crystal $out/bin/crystal
wrapProgram $out/bin/crystal \
--suffix PATH : ${clang}/bin \
--suffix CRYSTAL_PATH : lib:$out/lib/crystal \
--suffix LIBRARY_PATH : $libPath
install -dm755 $out/lib/crystal
@ -79,7 +81,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
enableParallelBuilding = true;
enableParallelBuilding = false;
meta = {
description = "A compiled language with Ruby like syntax and type inference";

View file

@ -8,7 +8,7 @@ end
File.open "shards.nix", "w+" do |file|
file.puts %({)
yaml = YAML.parse(File.read("shard.lock"))
yaml["shards"].each do |key, value|
yaml["shards"].as_h.each do |key, value|
owner, repo = value["github"].as_s.split("/")
url = "https://github.com/#{value["github"]}"
rev = if value["version"]?

View file

@ -28,13 +28,13 @@ let
};
in
stdenv.mkDerivation rec {
version = "0.0.3";
version = "0.0.4";
name = "mint-${version}";
src = fetchFromGitHub {
owner = "mint-lang";
repo = "mint";
rev = "0.0.3";
sha256 = "15aawhpagpaqrs64jnz3g6iw3dhq0rlqm92cvfd5a3hbwvxg7lm0";
rev = "0.0.4";
sha256 = "04zq6qqh2dbqgnywsy6qfpimsr2zg19gs3xls1bphbaygnb2yi3l";
};
buildInputs = [ crystal zlib openssl duktape ];

View file

@ -8,26 +8,26 @@
ameba = {
owner = "veelenga";
repo = "ameba";
rev = "v0.6.0";
sha256 = "16jfyrkfc909h16si513lw944qp3dyapymczcqc2ic0jaal0af5b";
rev = "v0.7.0";
sha256 = "01h0a1ba5l254r04mgkqhjdfn21cs0q7fmvk4gj35cj5lpr2bp17";
};
baked_file_system = {
owner = "schovi";
repo = "baked_file_system";
rev = "v0.9.6";
sha256 = "06cpriaizp5pcqwdq3jl2lm4sz9b2gcxg3a9q3lh0fqk2acajzmx";
rev = "e1447549d5ac0560720fae62179b2f2c62c9bfd1";
sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z";
};
duktape = {
owner = "jessedoyle";
repo = "duktape.cr";
rev = "v0.13.0";
sha256 = "0v0nckprgr7idmsx97g98as1a7z4hmlmwl924dbbaqvyslv5ls6w";
rev = "v0.14.1";
sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1";
};
kemal = {
owner = "kemalcr";
repo = "kemal";
rev = "v0.22.0";
sha256 = "0gq3c27grgh90fykbj9fdsz507lwd41gk686qfnig6npndqv1v10";
rev = "a5870e7d24e5ec75c956bcf3e4423f55a2c4ff78";
sha256 = "1f2bm4xmfg6zqs3a8744pbk1vx964flf17g1mj01yslfcnzxywal";
};
kilt = {
owner = "jeromegn";
@ -50,8 +50,8 @@
time_format = {
owner = "vladfaust";
repo = "time_format.cr";
rev = "v0.1.0";
sha256 = "1f3rssdlcw2a5f74qa8bzlf1rh5dzvyg1d32w9qlisf2cc4lkh9g";
rev = "v0.1.1";
sha256 = "0mmssnabf476i07sajm7s3rlvfcav4lkh0n8g12rybxr6c9f683v";
};
tree_template = {
owner = "anykeyh";

View file

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "shards-${version}";
version = "0.7.2";
version = "0.8.0";
src = fetchurl {
url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz";
sha256 = "1qiv9zzpccf6i5r2qrzbl84wgvqapbs0csazayhcpzfjfhg6i8wp";
sha256 = "02v69xl7x6sn0ddn29mjx3srwk4fyz0hz2pwaqa25fwwyhxvyn3p";
};
buildInputs = [ crystal libyaml which ];
buildFlags = [ "CRFLAGS=" "release" ];
buildFlags = [ "CRFLAGS=--release" ];
installPhase = ''
mkdir -p $out/bin