scry: 0.8.0 -> 0.8.1

- Use `crystal.buildCrystalPackage`
- Add `shards.nix`
- Reformat a bit

2 files changed, 19 insertions, 39 deletions

diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix
index 9a87f5f93694..20991316cf93 100644
--- a/pkgs/development/tools/scry/default.nix
+++ b/pkgs/development/tools/scry/default.nix
@@ -1,50 +1,22 @@
-{ stdenv, lib, fetchFromGitHub, crystal, shards, llvm, which }:
+{ lib, fetchFromGitHub, crystal }:
 
-stdenv.mkDerivation {
+crystal.buildCrystalPackage rec {
   pname = "scry";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
-    owner  = "crystal-lang-tools";
-    repo   = "scry";
-    rev    = "543c1c3f764298f9fff192ca884d10f72338607d";
-    sha256 = "1yq7jap3y5pr2yqc6fn6bxshzwv7dz3w97incq7wpcvi7ibb4lcn";
+    owner = "crystal-lang-tools";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ii4k9l3dgm1c9lllc8ni9dar59lrxik0v9iz7gk3d6v62wwnq79";
   };
 
-  patches = lib.optional (lib.versionAtLeast crystal.version "0.28") ./fix_for_crystal_0_28_and_above.patch;
+  shardsFile = ./shards.nix;
+  crystalBinaries.scry.src = "src/scry.cr";
 
-  nativeBuildInputs = [ crystal shards llvm which ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    shards build --release
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 -t $out/bin bin/scry
-
-    runHook postInstall
-  '';
-
-  # https://github.com/crystal-lang-tools/scry/issues/138
-  doCheck = false;
-
-  checkPhase = ''
-    runHook preCheck
-
-    crystal spec
-
-    runHook postCheck
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Code analysis server for the Crystal programming language";
-    homepage = https://github.com/crystal-lang-tools/scry;
+    homepage = "https://github.com/crystal-lang-tools/scry";
     license = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];
   };
diff --git a/pkgs/development/tools/scry/shards.nix b/pkgs/development/tools/scry/shards.nix
new file mode 100644
index 000000000000..31660ef7cd2b
--- /dev/null
+++ b/pkgs/development/tools/scry/shards.nix
@@ -0,0 +1,8 @@
+{
+  lsp = {
+    owner = "crystal-lang-tools";
+    repo = "lsp";
+    rev = "v0.1.0";
+    sha256 = "1sgsdgm2dmkp92a2lbaf2pgf80gljdlqzp9xkqvwz0rr92la6810";
+  };
+}