From 3cdb2c3d0cfe1a077363dccef0d7beec9456da58 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 12 May 2019 15:27:55 +0200 Subject: [PATCH] icr: 0.5.0 -> 0.6.0 (#61156) * icr: 0.5.0 -> 0.6.0 * icr: ensure crystal is in PATH --- pkgs/development/tools/icr/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 8fb79a9eabe..668fb2204d6 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, crystal, shards, which -, openssl, readline }: +{ stdenv, fetchFromGitHub, crystal, shards, which, makeWrapper +, openssl, readline, libyaml }: stdenv.mkDerivation rec { pname = "icr"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "crystal-community"; - repo = "icr"; + repo = pname; rev = "v${version}"; - sha256 = "1vavdzgm06ssnxm6mylki6xma0mfsj63n5kivhk1v4pg4xj966w5"; + sha256 = "0kkdqrxk4f4bqbb84mgjrk9r0fz1hsz95apvjsc49gav4c8xx3mb"; }; postPatch = '' @@ -17,17 +17,20 @@ stdenv.mkDerivation rec { --replace /usr/local $out ''; - buildInputs = [ openssl readline ]; + buildInputs = [ crystal libyaml openssl readline ]; - nativeBuildInputs = [ crystal shards which ]; + nativeBuildInputs = [ makeWrapper shards which ]; doCheck = true; - checkTarget = "test"; + postInstall = '' + wrapProgram $out/bin/icr --prefix PATH : "${stdenv.lib.makeBinPath [ crystal ]}" + ''; + meta = with stdenv.lib; { description = "Interactive console for the Crystal programming language"; - homepage = https://github.com/crystal-community/icr; + homepage = "https://github.com/crystal-community/icr"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; };