MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

scry: 0.8.1 -> unstable-2020-09-02

Browse source 
Makes it build with 0.35.
This commit is contained in:
Peter Hoeg 2021-02-01 12:19:12 +08:00
parent 86d5d9650d
commit 91e0754653
3 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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"; pname = "scry";
version = "0.8.1"; version = "unstable-2020-09-02"; # to make it work with crystal 0.35
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crystal-lang-tools"; owner = "crystal-lang-tools";
repo = pname; repo = pname;
rev = "v${version}"; # rev = "v${version}";
sha256 = "0ii4k9l3dgm1c9lllc8ni9dar59lrxik0v9iz7gk3d6v62wwnq79"; rev = "580a1879810a9f5d63d8a0d90fbdaa99d86b58da";
sha256 = "sha256-WjpkkHfy38wDj/ejXyyMtd5rLfTRoj/7D+SAhRROnbU=";
}; };
# we are already testing for this, so we can ignore the failures # 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 rm spec/scry/executable_spec.cr
''; '';
format = "crystal"; format = "shards";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
shardsFile = ./shards.nix; shardsFile = ./shards.nix;
crystalBinaries.scry.src = "src/scry.cr";
postFixup = '' postFixup = ''
wrapProgram $out/bin/scry \ wrapProgram $out/bin/scry \
--prefix PATH : ${lib.makeBinPath [ crystal coreutils ]} --prefix PATH : ${lib.makeBinPath [ crystal coreutils ]}

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

@ -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"

2
pkgs/top-level/all-packages.nix
View file

@ -9570,7 +9570,7 @@ in
icr = callPackage ../development/tools/icr { }; icr = callPackage ../development/tools/icr { };
scry = callPackage ../development/tools/scry {}; scry = callPackage ../development/tools/scry { };
dasm = callPackage ../development/compilers/dasm/default.nix { }; dasm = callPackage ../development/compilers/dasm/default.nix { };