diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-01-06 07:59:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-06 07:59:28 -0500 |
| commit | f80d506324791a85258f0bcb5176d2a2eb542996 (patch) | |
| tree | e92d233678a8473eaa822656619b8c025e080872 /pkgs/development/tools | |
| parent | 1c38ff613ebc4801992879a0f2626201cea16197 (diff) | |
| parent | d6b3bfef4663489d26c689a4fe5abc0c8559bd51 (diff) | |
| download | nixpkgs-f80d506324791a85258f0bcb5176d2a2eb542996.tar nixpkgs-f80d506324791a85258f0bcb5176d2a2eb542996.tar.gz nixpkgs-f80d506324791a85258f0bcb5176d2a2eb542996.tar.bz2 nixpkgs-f80d506324791a85258f0bcb5176d2a2eb542996.tar.lz nixpkgs-f80d506324791a85258f0bcb5176d2a2eb542996.tar.xz nixpkgs-f80d506324791a85258f0bcb5176d2a2eb542996.tar.zst nixpkgs-f80d506324791a85258f0bcb5176d2a2eb542996.zip | |
Merge pull request #74920 from filalex77/scry-0.8.1
scry: 0.8.0 -> 0.8.1
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/scry/default.nix | 52 | ||||
| -rw-r--r-- | pkgs/development/tools/scry/shards.nix | 8 |
2 files changed, 20 insertions, 40 deletions
diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index 9a87f5f9369..7bd3fa38332 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,51 +1,23 @@ -{ 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 ]; + maintainers = with maintainers; [ peterhoeg filalex77 ]; }; } diff --git a/pkgs/development/tools/scry/shards.nix b/pkgs/development/tools/scry/shards.nix new file mode 100644 index 00000000000..31660ef7cd2 --- /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"; + }; +} |