ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33029 from sifmelcara/update/crystal-0.24.1

Browse Source 
crystal: 0.23.1 -> 0.24.1
This commit is contained in:
Graham Christensen 2017-12-25 14:12:23 -05:00 committed by GitHub
commit 7635a70fc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,29 +2,33 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "crystal-${version}"; name = "crystal-${version}";
version = "0.23.1"; version = "0.24.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
sha256 = "8cf1b9a4eab29fca2f779ea186ae18f7ce444ce189c621925fa1a0c61dd5ff55"; sha256 = "1n375cwzb9rfqbjiimfbj4h5q4rsgh2rf6rmm2zbzizzm79a96a9";
}; };
prebuiltName = "crystal-0.23.0-1"; prebuiltName = "crystal-0.24.1-2";
prebuiltSrc = let arch = { prebuiltSrc = let arch = {
"x86_64-linux" = "linux-x86_64"; "x86_64-linux" = "linux-x86_64";
"i686-linux" = "linux-i686"; "i686-linux" = "linux-i686";
"x86_64-darwin" = "darwin-x86_64"; "x86_64-darwin" = "darwin-x86_64";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
in fetchurl { in fetchurl {
url = "https://github.com/crystal-lang/crystal/releases/download/0.23.0/${prebuiltName}-${arch}.tar.gz"; url = "https://github.com/crystal-lang/crystal/releases/download/v0.24.1/${prebuiltName}-${arch}.tar.gz";
sha256 = { sha256 = {
"x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx"; "x86_64-linux" = "19xchfzsyxh0gqi89y6d73iqc06bl097idz6905jf0i35x9ghpdp";
"i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a"; "i686-linux" = "15zaxgc1yc9ixbsgy2d8g8d7x2w4vbnndi1ms3wf0ss8azmghiag";
"x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz"; "x86_64-darwin" = "1818ahalahcbh974ai09hyfsns6njkpph4sbn4xwv2235x35dqib";
}."${stdenv.system}"; }."${stdenv.system}";
}; };
srcs = [ src prebuiltSrc ]; unpackPhase = ''
mkdir ${prebuiltName}
tar --strip-components=1 -C ${prebuiltName} -xf ${prebuiltSrc}
tar xf ${src}
'';
# crystal on Darwin needs libiconv to build # crystal on Darwin needs libiconv to build
libs = [ libs = [
@ -41,25 +45,17 @@ stdenv.mkDerivation rec {
sourceRoot = "${name}"; sourceRoot = "${name}";
fixPrebuiltBinary = if stdenv.isDarwin then ''
wrapProgram ../${prebuiltName}/embedded/bin/crystal \
--suffix DYLD_LIBRARY_PATH : $libPath
''
else ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
../${prebuiltName}/embedded/bin/crystal
patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \
../${prebuiltName}/embedded/bin/crystal
'';
preBuild = '' preBuild = ''
patchShebangs bin/crystal patchShebangs bin/crystal
patchShebangs ../${prebuiltName}/bin/crystal patchShebangs ../${prebuiltName}/bin/crystal
${fixPrebuiltBinary}
export PATH="$(pwd)/../${prebuiltName}/bin:$PATH" export PATH="$(pwd)/../${prebuiltName}/bin:$PATH"
''; '';
makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" "release=1" "all" "doc" ]; makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}"
"FLAGS=--no-debug"
"release=1"
"all" "docs"
];
installPhase = '' installPhase = ''
install -Dm755 .build/crystal $out/bin/crystal install -Dm755 .build/crystal $out/bin/crystal
@ -70,7 +66,7 @@ stdenv.mkDerivation rec {
cp -r src/* $out/lib/crystal/ cp -r src/* $out/lib/crystal/
install -dm755 $out/share/doc/crystal/api install -dm755 $out/share/doc/crystal/api
cp -r doc/* $out/share/doc/crystal/api/ cp -r docs/* $out/share/doc/crystal/api/
cp -r samples $out/share/doc/crystal/ cp -r samples $out/share/doc/crystal/
install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal

4
pkgs/development/tools/build-managers/shards/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "shards-${version}"; name = "shards-${version}";
version = "0.7.1"; version = "0.7.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz"; url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz";
sha256 = "31de819c66518479682ec781a39ef42c157a1a8e6e865544194534e2567cb110"; sha256 = "1qiv9zzpccf6i5r2qrzbl84wgvqapbs0csazayhcpzfjfhg6i8wp";
}; };
buildInputs = [ crystal libyaml which ]; buildInputs = [ crystal libyaml which ];

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

@ -5596,7 +5596,7 @@ with pkgs;
}); });
crystal = callPackage ../development/compilers/crystal { crystal = callPackage ../development/compilers/crystal {
llvm = llvm_4; llvm = llvm_5;
}; };
devpi-client = callPackage ../development/tools/devpi-client {}; devpi-client = callPackage ../development/tools/devpi-client {};