diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix index b9e36fb47a46..4eab73ff580a 100644 --- a/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/pkgs/development/tools/language-servers/crystalline/default.nix @@ -8,18 +8,17 @@ }: let - version = "0.15.0"; -in -crystal.buildCrystalPackage { - pname = "crystalline"; - inherit version; - + version = "0.17.1"; src = fetchFromGitHub { owner = "elbywan"; repo = "crystalline"; - rev = "v${version}"; - hash = "sha256-6ZAogEuOJH1QQ6NSJ+8KZUSFSgQAcvd4U9vWNAGix/M="; + tag = "v${version}"; + hash = "sha256-SIfInDY6KhEwEPZckgobOrpKXBDDd0KhQt/IjdGBhWo="; }; +in +crystal.buildCrystalPackage { + pname = "crystalline"; + inherit version src; format = "crystal"; shardsFile = ./shards.nix; @@ -31,6 +30,12 @@ crystal.buildCrystalPackage { ]; env.LLVM_CONFIG = lib.getExe' (lib.getDev llvmPackages.llvm) "llvm-config"; + preConfigure = '' + substituteInPlace "./src/crystalline/main.cr" \ + --replace-fail '`shards version #{__DIR__}`' '"${version}"' \ + --replace-fail 'system("git rev-parse --short HEAD || echo unknown").stringify' '"${src.rev}"' + ''; + doCheck = false; doInstallCheck = false; diff --git a/pkgs/development/tools/language-servers/crystalline/shards.nix b/pkgs/development/tools/language-servers/crystalline/shards.nix index 2e53527fd0b8..b0aec75192d6 100644 --- a/pkgs/development/tools/language-servers/crystalline/shards.nix +++ b/pkgs/development/tools/language-servers/crystalline/shards.nix @@ -1,27 +1,22 @@ { - bisect = { + "bisect" = { url = "https://github.com/spider-gazelle/bisect.git"; rev = "v1.2.1"; sha256 = "1ddz7fag1l65m6g0vw6xa96yv00rdwjj2z69k26rvyz37qk9ccqg"; }; - lsp = { + "lsp" = { url = "https://github.com/elbywan/crystal-lsp.git"; rev = "v0.1.2"; sha256 = "0knw8xaq3ssyb34w77a390j79m4w6bks5hlwr8m8fci2gq9a0r6z"; }; - priority-queue = { + "priority-queue" = { url = "https://github.com/spider-gazelle/priority-queue.git"; rev = "v1.0.1"; sha256 = "1rkppd8win4yalxcvsxikqcq6sw0npdqjajqbj57m78bzlxpyjv6"; }; - sentry = { + "sentry" = { url = "https://github.com/samueleaton/sentry.git"; rev = "e448ce83486f99ef016c311e10ec0cac805cded3"; sha256 = "13yp7805xpd605jpfpb3srqb0psy25w7n6x9mpkcyvzhqmpnpfyq"; }; - version_from_shard = { - url = "https://github.com/hugopl/version_from_shard.git"; - rev = "v1.2.5"; - sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; - }; }