Commit 208a24bf authored by Jost Alemann's avatar Jost Alemann
Browse files

zls: modernize; add zls_0_16 

Modernize by using `zigBuildFlags` instead of linking deps in
`postConfigure`.

Add zls_0_16.
Release Notes: https://zigtools.org/zls/releases/0.16.0/
Diff: https://github.com/zigtools/zls/compare/0.15.1...0.16.0
parent bbbf018e

pkgs/development/tools/zls/default.nix

+27 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  zig_0_14,

  zig_0_15,

  zig_0_16,

  fetchFromGitHub,

  callPackage,

}:
@@ -11,6 +12,13 @@ let 
  common = finalAttrs: _: {

    pname = "zls";



    strictDeps = true;



    zigBuildFlags = [

      "--system"

      "${finalAttrs.deps}"

    ];



    meta = {

      description = "Zig LSP implementation + Zig Language Server";

      mainProgram = "zls";
@@ -38,11 +46,9 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) 
      hash = "sha256-A5Mn+mfIefOsX+eNBRHrDVkqFDVrD3iXDNsUL4TPhKo=";

    };



    nativeBuildInputs = [ zig_0_14 ];

    deps = callPackage ./deps_0_14.nix { };



    postConfigure = ''

      ln -s ${callPackage ./deps_0_14.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

    '';

    nativeBuildInputs = [ zig_0_14 ];

  };



  zls_0_15 = finalAttrs: {
@@ -56,10 +62,24 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) 
      hash = "sha256-6IkRtQkn+qUHDz00QvCV/rb2yuF6xWEXug41CD8LLw8=";

    };



    deps = callPackage ./deps_0_15.nix { };



    nativeBuildInputs = [ zig_0_15 ];

  };



  zls_0_16 = finalAttrs: {

    version = "0.16.0";



    src = fetchFromGitHub {

      owner = "zigtools";

      repo = "zls";

      tag = finalAttrs.version;

      fetchSubmodules = true;

      hash = "sha256-k0xWObsw9K12BKfK+UB5TieWDFEFfBQhN1X1NO35fWk=";

    };



    deps = callPackage ./deps_0_16.nix { };



    postConfigure = ''

      ln -s ${callPackage ./deps_0_15.nix { }} $ZIG_GLOBAL_CACHE_DIR/p

    '';

    nativeBuildInputs = [ zig_0_16 ];

  };

}

pkgs/development/tools/zls/deps_0_16.nix

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{

  linkFarm,

  fetchzip,

}:

linkFarm "zig-packages" [

  {

    name = "known_folders-0.0.0-Fy-PJk3KAACzUg2us_0JvQQmod1ZA8jBt7MuoKCihq88";

    path = fetchzip {

      url = "https://github.com/ziglibs/known-folders/archive/d6d03830968cca6b7b9f24fd97ee348346a6905d.tar.gz";

      hash = "sha256-8LlAnEwuoeQuN9V5nUuh2UwXRhS5KOwDkpm6yuOfClk=";

    };

  }

  {

    name = "diffz-0.0.1-G2tlISzNAQCldmOcINavGmF1zdt20NFPXeM8d07jp_68";

    path = fetchzip {

      url = "https://github.com/ziglibs/diffz/archive/b39fe07e7fdbcf56e43ba2890b9f484f16969f90.tar.gz";

      hash = "sha256-mmgaOXFpoBYMsNdVkoFa7wJKkiXtzXIbSxRUgWLdVUc=";

    };

  }

  {

    name = "lsp_kit-0.1.0-bi_PL3IyDACfp1xdTnkiOHEok2YpPCCCJHuuOcNzjl1D";

    path = fetchzip {

      url = "https://github.com/zigtools/lsp-kit/archive/b886a2b0d5cee85ecbcc3089b863f7517cc9ff7f.tar.gz";

      hash = "sha256-367wPydvnpl9RYlTrXwk4bZ/ui9DbYjeY/VDYs7ZJRs=";

    };

  }

]