mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
scry: 0.8.1 -> unstable-2020-09-02
Makes it build with 0.35.
This commit is contained in:
parent
86d5d9650d
commit
91e0754653
3 changed files with 11 additions and 31 deletions
|
@ -1,16 +1,18 @@
|
|||
{ lib, fetchFromGitHub, crystal_0_31, coreutils, shards, makeWrapper, which }:
|
||||
{ lib, fetchFromGitHub, crystal_0_35, coreutils, makeWrapper }:
|
||||
let
|
||||
crystal = crystal_0_35;
|
||||
|
||||
let crystal = crystal_0_31;
|
||||
|
||||
in crystal.buildCrystalPackage rec {
|
||||
in
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "scry";
|
||||
version = "0.8.1";
|
||||
version = "unstable-2020-09-02"; # to make it work with crystal 0.35
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crystal-lang-tools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ii4k9l3dgm1c9lllc8ni9dar59lrxik0v9iz7gk3d6v62wwnq79";
|
||||
# rev = "v${version}";
|
||||
rev = "580a1879810a9f5d63d8a0d90fbdaa99d86b58da";
|
||||
sha256 = "sha256-WjpkkHfy38wDj/ejXyyMtd5rLfTRoj/7D+SAhRROnbU=";
|
||||
};
|
||||
|
||||
# we are already testing for this, so we can ignore the failures
|
||||
|
@ -18,14 +20,12 @@ in crystal.buildCrystalPackage rec {
|
|||
rm spec/scry/executable_spec.cr
|
||||
'';
|
||||
|
||||
format = "crystal";
|
||||
format = "shards";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
shardsFile = ./shards.nix;
|
||||
|
||||
crystalBinaries.scry.src = "src/scry.cr";
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/scry \
|
||||
--prefix PATH : ${lib.makeBinPath [ crystal coreutils ]}
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
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"
|
|
@ -9570,7 +9570,7 @@ in
|
|||
|
||||
icr = callPackage ../development/tools/icr { };
|
||||
|
||||
scry = callPackage ../development/tools/scry {};
|
||||
scry = callPackage ../development/tools/scry { };
|
||||
|
||||
dasm = callPackage ../development/compilers/dasm/default.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue