icr: 0.6.0 -> 0.8.0

pkgs/development/tools/icr/default.nix

@@ -1,29 +1,31 @@
-{ stdenv, fetchFromGitHub, crystal, shards, which
+{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which
-, openssl, readline, libyaml }:
+, openssl, readline, libyaml, zlib }:
 
-stdenv.mkDerivation rec {
+crystal.buildCrystalPackage rec {
   pname = "icr";
-  version = "0.6.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
-    owner  = "crystal-community";
+    owner = "crystal-community";
-    repo   = pname;
+    repo = pname;
-    rev    = "v${version}";
+    rev = "v${version}";
-    sha256 = "0kkdqrxk4f4bqbb84mgjrk9r0fz1hsz95apvjsc49gav4c8xx3mb";
+    sha256 = "1bz2bhs6csyg2rhrlknlvaiilq3vq8plxjh1hdxmbrfi3n6c7k5a";
   };
 
-  postPatch = ''
+  shardsFile = ./shards.nix;
-    substituteInPlace Makefile \
+
-      --replace /usr/local $out
+  buildInputs = [ libyaml openssl readline zlib ];
+
+  nativeBuildInputs = [ makeWrapper pkgconfig which ];
+
+  # tests are failing due to our sandbox
+  doCheck = false;
+
+  postFixup = ''
+    wrapProgram $out/bin/icr \
+      --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]}
   '';
 
-  buildInputs = [ crystal libyaml openssl readline ];
-
-  nativeBuildInputs = [ shards which ];
-
-  doCheck = true;
-  checkTarget = "test";
-
   meta = with stdenv.lib; {
     description = "Interactive console for the Crystal programming language";
     homepage = "https://github.com/crystal-community/icr";

pkgs/development/tools/icr/shards.nix

@@ -0,0 +1,8 @@
+{
+  readline = {
+    owner = "crystal-lang";
+    repo = "crystal-readline";
+    rev = "0fb7d186da8e1b157998d98d1c96e99699b791eb";
+    sha256 = "1rk27vw3ssldgnfgprwvz2gag02v4g6d6yg56b3sk9w3fn8jyyi8";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -8114,9 +8114,7 @@ in
     crystal
     crystal2nix;
 
-  icr = callPackage ../development/tools/icr {
+  icr = callPackage ../development/tools/icr { };
-    openssl = openssl_1_0_2;
-  };
 
   scry = callPackage ../development/tools/scry {};