BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scry: 0.7.1 -> 0.8.0

Browse source
This commit is contained in:
Peter Hoeg 2019-06-25 11:32:56 +08:00
parent 24dc219de9
commit fda3f06656
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/tools/scry/default.nix
View file

@ -1,9 +1,8 @@
{ stdenv, fetchFromGitHub, crystal, shards, which }:
{ stdenv, lib, fetchFromGitHub, crystal, shards, llvm, which }:
stdenv.mkDerivation rec {
pname = "scry";
# 0.7.1 doesn't work with crystal > 0.25
version = "0.7.1.20180919";
version = "0.8.0";
src = fetchFromGitHub {
owner = "crystal-lang-tools";
@ -12,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1yq7jap3y5pr2yqc6fn6bxshzwv7dz3w97incq7wpcvi7ibb4lcn";
};
nativeBuildInputs = [ crystal shards which ];
patches = lib.optional (lib.versionAtLeast crystal.version "0.28") ./fix_for_crystal_0_28_and_above.patch;
nativeBuildInputs = [ crystal shards llvm which ];
buildPhase = ''
runHook preBuild

20
pkgs/development/tools/scry/fix_for_crystal_0_28_and_above.patch Normal file
View file

@ -0,0 +1,20 @@
diff --git a/src/scry/completion_provider.cr b/src/scry/completion_provider.cr
index 29e0d36..f67438c 100644
--- a/src/scry/completion_provider.cr
+++ b/src/scry/completion_provider.cr
@@ -1,4 +1,5 @@
require "./log"
+require "compiler/crystal/codegen/target"
require "compiler/crystal/crystal_path"
require "./completion/*"
diff --git a/src/scry/parse_analyzer.cr b/src/scry/parse_analyzer.cr
index d87eca4..bbe9ed5 100644
--- a/src/scry/parse_analyzer.cr
+++ b/src/scry/parse_analyzer.cr
@@ -1,4 +1,5 @@
require "compiler/crystal/syntax"
+require "compiler/crystal/codegen/target"
require "compiler/crystal/crystal_path"
require "./workspace"
require "./text_document"