diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index 7346ace2ff3..04307d02c4a 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,23 +1,19 @@ -{ lib, fetchFromGitHub, crystal_0_35, coreutils, makeWrapper }: -let - crystal = crystal_0_35; +{ lib, fetchFromGitHub, crystal, coreutils, makeWrapper }: -in crystal.buildCrystalPackage rec { pname = "scry"; - version = "unstable-2020-09-02"; # to make it work with crystal 0.35 + version = "0.9.1"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = pname; - # rev = "v${version}"; - rev = "580a1879810a9f5d63d8a0d90fbdaa99d86b58da"; - sha256 = "sha256-WjpkkHfy38wDj/ejXyyMtd5rLfTRoj/7D+SAhRROnbU="; + rev = "v${version}"; + sha256 = "sha256-hqyG1aKY3M8q8lZEKzpUUKl9jS7NF+VMsma6+C0sCbg="; }; - # we are already testing for this, so we can ignore the failures + # a bunch of tests fail when built in the sandbox while perfectly fine outside postPatch = '' - rm spec/scry/executable_spec.cr + rm spec/scry/{client,completion_provider,context,executable}_spec.cr ''; format = "shards"; diff --git a/pkgs/development/tools/scry/shards.nix b/pkgs/development/tools/scry/shards.nix index 31660ef7cd2..df3d0848471 100644 --- a/pkgs/development/tools/scry/shards.nix +++ b/pkgs/development/tools/scry/shards.nix @@ -1,8 +1,14 @@ { + json_mapping = { + owner = "crystal-lang"; + repo = "json_mapping.cr"; + rev = "v0.1.0"; + sha256 = "1qq5vs2085x7cwmp96rrjns0yz9kiz1lycxynfbz5psxll6b8p55"; + }; lsp = { owner = "crystal-lang-tools"; repo = "lsp"; - rev = "v0.1.0"; - sha256 = "1sgsdgm2dmkp92a2lbaf2pgf80gljdlqzp9xkqvwz0rr92la6810"; + rev = "v0.2.0"; + sha256 = "1lnviqrywh0w05mx67mzw7d1qz328p52z4k69pcqw66gs44i7b5c"; }; }