From 55e40e600459f3864731c3febd1b95224a305030 Mon Sep 17 00:00:00 2001 From: Lyla Bravo Date: Mon, 26 Oct 2020 00:03:30 -0300 Subject: [PATCH 1/4] Added Nix derivation. --- default.nix | 51 ++++++++++++++ nix/sources.json | 38 +++++++++++ nix/sources.nix | 171 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+) create mode 100644 default.nix create mode 100644 nix/sources.json create mode 100644 nix/sources.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..6d4ac6b --- /dev/null +++ b/default.nix @@ -0,0 +1,51 @@ +let + sources = import ./nix/sources.nix; + pkgs = import sources.nixpkgs {}; + gitignore = import sources.gitignore {}; + + zig = pkgs.stdenvNoCC.mkDerivation rec { + name = "zig"; + version = "0.6.0+91a1c20e7"; + src = pkgs.fetchurl { + url = "https://ziglang.org/builds/zig-linux-x86_64-${version}.tar.xz"; + sha256 = "7d715ea8948611734986d8a056fdec98d0f39b064e38efcd088823c02b1afba8"; + }; + dontConfigure = true; + dontBuild = true; + installPhase = '' + mkdir -p $out $out/bin $out/doc + mv lib/ $out/ + mv zig $out/bin + mv langref.html $out/doc + ''; + }; +in + pkgs.stdenvNoCC.mkDerivation { + name = "zls"; + version = "master"; + src = gitignore.gitignoreSource ./.; + nativeBuildInputs = [ zig ]; + dontConfigure = true; + + buildPhase = '' + zig build -Drelease-safe=true + ''; + installPhase = '' + mkdir -p $out + zig build install --prefix $out + + # write configuration according to defaults described in README.md + cat << EOF > $out/bin/zls.json + { + "zig_lib_path": "${zig}/lib/zig/", + "zig_exe_path": "${zig}/bin/zig", + "warn_style": false, + "enable_snippets": false, + "enable_semantic_tokens": false, + "operator_completions": true + } + EOF + ''; + + XDG_CACHE_HOME = "."; + } diff --git a/nix/sources.json b/nix/sources.json new file mode 100644 index 0000000..3de8eb5 --- /dev/null +++ b/nix/sources.json @@ -0,0 +1,38 @@ +{ + "gitignore": { + "branch": "master", + "description": "Nix function for filtering local git sources", + "homepage": "", + "owner": "hercules-ci", + "repo": "gitignore", + "rev": "c4662e662462e7bf3c2a968483478a665d00e717", + "sha256": "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx", + "type": "tarball", + "url": "https://github.com/hercules-ci/gitignore/archive/c4662e662462e7bf3c2a968483478a665d00e717.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "niv": { + "branch": "master", + "description": "Easy dependency management for Nix projects", + "homepage": "https://github.com/nmattia/niv", + "owner": "nmattia", + "repo": "niv", + "rev": "9d35b9e4837ab88517210b1701127612c260eccf", + "sha256": "0q50xhnm8g2yfyakrh0nly4swyygxpi0a8cb9gp65wcakcgvzvdh", + "type": "tarball", + "url": "https://github.com/nmattia/niv/archive/9d35b9e4837ab88517210b1701127612c260eccf.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nixpkgs": { + "branch": "release-20.03", + "description": "Nix Packages collection", + "homepage": "", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a26e92a67d884db696792d25dcc44c466a1bc8b4", + "sha256": "0w4sp4cgncr62vgzknny76whlansab94dq2lx27if77ir3zpfiia", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a26e92a67d884db696792d25dcc44c466a1bc8b4.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + } +} diff --git a/nix/sources.nix b/nix/sources.nix new file mode 100644 index 0000000..b796fff --- /dev/null +++ b/nix/sources.nix @@ -0,0 +1,171 @@ +# This file has been generated by Niv. + +let + + # + # The fetchers. fetch_ fetches specs of type . + # + + fetch_file = pkgs: name: spec: + let + name' = sanitizeName name + "-src"; + in + if spec.builtin or true then + builtins_fetchurl { inherit (spec) url sha256; name = name'; } + else + pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; + + fetch_tarball = pkgs: name: spec: + let + name' = sanitizeName name + "-src"; + in + if spec.builtin or true then + builtins_fetchTarball { name = name'; inherit (spec) url sha256; } + else + pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; + + fetch_git = name: spec: + let + ref = + if spec ? ref then spec.ref else + if spec ? branch then "refs/heads/${spec.branch}" else + if spec ? tag then "refs/tags/${spec.tag}" else + abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; + in + builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; + + fetch_local = spec: spec.path; + + fetch_builtin-tarball = name: throw + ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. + $ niv modify ${name} -a type=tarball -a builtin=true''; + + fetch_builtin-url = name: throw + ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. + $ niv modify ${name} -a type=file -a builtin=true''; + + # + # Various helpers + # + + # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695 + sanitizeName = name: + ( + concatMapStrings (s: if builtins.isList s then "-" else s) + ( + builtins.split "[^[:alnum:]+._?=-]+" + ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name) + ) + ); + + # The set of packages used when specs are fetched using non-builtins. + mkPkgs = sources: system: + let + sourcesNixpkgs = + import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; + hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; + hasThisAsNixpkgsPath = == ./.; + in + if builtins.hasAttr "nixpkgs" sources + then sourcesNixpkgs + else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then + import {} + else + abort + '' + Please specify either (through -I or NIX_PATH=nixpkgs=...) or + add a package called "nixpkgs" to your sources.json. + ''; + + # The actual fetching function. + fetch = pkgs: name: spec: + + if ! builtins.hasAttr "type" spec then + abort "ERROR: niv spec ${name} does not have a 'type' attribute" + else if spec.type == "file" then fetch_file pkgs name spec + else if spec.type == "tarball" then fetch_tarball pkgs name spec + else if spec.type == "git" then fetch_git name spec + else if spec.type == "local" then fetch_local spec + else if spec.type == "builtin-tarball" then fetch_builtin-tarball name + else if spec.type == "builtin-url" then fetch_builtin-url name + else + abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; + + # If the environment variable NIV_OVERRIDE_${name} is set, then use + # the path directly as opposed to the fetched source. + replace = name: drv: + let + saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name; + ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; + in + if ersatz == "" then drv else ersatz; + + # Ports of functions for older nix versions + + # a Nix version of mapAttrs if the built-in doesn't exist + mapAttrs = builtins.mapAttrs or ( + f: set: with builtins; + listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) + ); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 + range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 + stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 + stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); + concatMapStrings = f: list: concatStrings (map f list); + concatStrings = builtins.concatStringsSep ""; + + # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331 + optionalAttrs = cond: as: if cond then as else {}; + + # fetchTarball version that is compatible between all the versions of Nix + builtins_fetchTarball = { url, name ? null, sha256 }@attrs: + let + inherit (builtins) lessThan nixVersion fetchTarball; + in + if lessThan nixVersion "1.12" then + fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) + else + fetchTarball attrs; + + # fetchurl version that is compatible between all the versions of Nix + builtins_fetchurl = { url, name ? null, sha256 }@attrs: + let + inherit (builtins) lessThan nixVersion fetchurl; + in + if lessThan nixVersion "1.12" then + fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) + else + fetchurl attrs; + + # Create the final "sources" from the config + mkSources = config: + mapAttrs ( + name: spec: + if builtins.hasAttr "outPath" spec + then abort + "The values in sources.json should not have an 'outPath' attribute" + else + spec // { outPath = replace name (fetch config.pkgs name spec); } + ) config.sources; + + # The "config" used by the fetchers + mkConfig = + { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null + , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile) + , system ? builtins.currentSystem + , pkgs ? mkPkgs sources system + }: rec { + # The sources, i.e. the attribute set of spec name to spec + inherit sources; + + # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers + inherit pkgs; + }; + +in +mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } From cbb603a63c3aca0b06fbfd971b77f8f9954a3f94 Mon Sep 17 00:00:00 2001 From: Lyla Bravo Date: Mon, 26 Oct 2020 00:23:10 -0300 Subject: [PATCH 2/4] Removed `nix/` directory (used by Niv). Now the derivation uses the system's `nixpkgs` and fetches `gitignore.nix` directly from it's GitHub repository --- default.nix | 15 +++-- nix/sources.json | 38 ----------- nix/sources.nix | 171 ----------------------------------------------- 3 files changed, 10 insertions(+), 214 deletions(-) delete mode 100644 nix/sources.json delete mode 100644 nix/sources.nix diff --git a/default.nix b/default.nix index 6d4ac6b..c89c4e9 100644 --- a/default.nix +++ b/default.nix @@ -1,8 +1,13 @@ let - sources = import ./nix/sources.nix; - pkgs = import sources.nixpkgs {}; - gitignore = import sources.gitignore {}; - + pkgs = import {}; + gitignoreSrc = pkgs.fetchFromGitHub { + owner = "hercules-ci"; + repo = "gitignore"; + rev = "c4662e662462e7bf3c2a968483478a665d00e717"; + sha256 = "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx"; + }; + inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource; + zig = pkgs.stdenvNoCC.mkDerivation rec { name = "zig"; version = "0.6.0+91a1c20e7"; @@ -23,7 +28,7 @@ in pkgs.stdenvNoCC.mkDerivation { name = "zls"; version = "master"; - src = gitignore.gitignoreSource ./.; + src = gitignoreSource ./.; nativeBuildInputs = [ zig ]; dontConfigure = true; diff --git a/nix/sources.json b/nix/sources.json deleted file mode 100644 index 3de8eb5..0000000 --- a/nix/sources.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "gitignore": { - "branch": "master", - "description": "Nix function for filtering local git sources", - "homepage": "", - "owner": "hercules-ci", - "repo": "gitignore", - "rev": "c4662e662462e7bf3c2a968483478a665d00e717", - "sha256": "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx", - "type": "tarball", - "url": "https://github.com/hercules-ci/gitignore/archive/c4662e662462e7bf3c2a968483478a665d00e717.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "niv": { - "branch": "master", - "description": "Easy dependency management for Nix projects", - "homepage": "https://github.com/nmattia/niv", - "owner": "nmattia", - "repo": "niv", - "rev": "9d35b9e4837ab88517210b1701127612c260eccf", - "sha256": "0q50xhnm8g2yfyakrh0nly4swyygxpi0a8cb9gp65wcakcgvzvdh", - "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/9d35b9e4837ab88517210b1701127612c260eccf.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs": { - "branch": "release-20.03", - "description": "Nix Packages collection", - "homepage": "", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a26e92a67d884db696792d25dcc44c466a1bc8b4", - "sha256": "0w4sp4cgncr62vgzknny76whlansab94dq2lx27if77ir3zpfiia", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a26e92a67d884db696792d25dcc44c466a1bc8b4.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - } -} diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index b796fff..0000000 --- a/nix/sources.nix +++ /dev/null @@ -1,171 +0,0 @@ -# This file has been generated by Niv. - -let - - # - # The fetchers. fetch_ fetches specs of type . - # - - fetch_file = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in - if spec.builtin or true then - builtins_fetchurl { inherit (spec) url sha256; name = name'; } - else - pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; - - fetch_tarball = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in - if spec.builtin or true then - builtins_fetchTarball { name = name'; inherit (spec) url sha256; } - else - pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; - - fetch_git = name: spec: - let - ref = - if spec ? ref then spec.ref else - if spec ? branch then "refs/heads/${spec.branch}" else - if spec ? tag then "refs/tags/${spec.tag}" else - abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; - in - builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; - - fetch_local = spec: spec.path; - - fetch_builtin-tarball = name: throw - ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=tarball -a builtin=true''; - - fetch_builtin-url = name: throw - ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=file -a builtin=true''; - - # - # Various helpers - # - - # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695 - sanitizeName = name: - ( - concatMapStrings (s: if builtins.isList s then "-" else s) - ( - builtins.split "[^[:alnum:]+._?=-]+" - ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name) - ) - ); - - # The set of packages used when specs are fetched using non-builtins. - mkPkgs = sources: system: - let - sourcesNixpkgs = - import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; - hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; - hasThisAsNixpkgsPath = == ./.; - in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then - import {} - else - abort - '' - Please specify either (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; - - # The actual fetching function. - fetch = pkgs: name: spec: - - if ! builtins.hasAttr "type" spec then - abort "ERROR: niv spec ${name} does not have a 'type' attribute" - else if spec.type == "file" then fetch_file pkgs name spec - else if spec.type == "tarball" then fetch_tarball pkgs name spec - else if spec.type == "git" then fetch_git name spec - else if spec.type == "local" then fetch_local spec - else if spec.type == "builtin-tarball" then fetch_builtin-tarball name - else if spec.type == "builtin-url" then fetch_builtin-url name - else - abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; - - # If the environment variable NIV_OVERRIDE_${name} is set, then use - # the path directly as opposed to the fetched source. - replace = name: drv: - let - saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name; - ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; - in - if ersatz == "" then drv else ersatz; - - # Ports of functions for older nix versions - - # a Nix version of mapAttrs if the built-in doesn't exist - mapAttrs = builtins.mapAttrs or ( - f: set: with builtins; - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) - ); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 - range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 - stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 - stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); - concatMapStrings = f: list: concatStrings (map f list); - concatStrings = builtins.concatStringsSep ""; - - # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331 - optionalAttrs = cond: as: if cond then as else {}; - - # fetchTarball version that is compatible between all the versions of Nix - builtins_fetchTarball = { url, name ? null, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchTarball; - in - if lessThan nixVersion "1.12" then - fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchTarball attrs; - - # fetchurl version that is compatible between all the versions of Nix - builtins_fetchurl = { url, name ? null, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchurl; - in - if lessThan nixVersion "1.12" then - fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchurl attrs; - - # Create the final "sources" from the config - mkSources = config: - mapAttrs ( - name: spec: - if builtins.hasAttr "outPath" spec - then abort - "The values in sources.json should not have an 'outPath' attribute" - else - spec // { outPath = replace name (fetch config.pkgs name spec); } - ) config.sources; - - # The "config" used by the fetchers - mkConfig = - { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null - , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile) - , system ? builtins.currentSystem - , pkgs ? mkPkgs sources system - }: rec { - # The sources, i.e. the attribute set of spec name to spec - inherit sources; - - # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers - inherit pkgs; - }; - -in -mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } From ff6686cd66e4541c82279cf625645fc485610746 Mon Sep 17 00:00:00 2001 From: Lyla Bravo Date: Mon, 26 Oct 2020 15:29:09 -0300 Subject: [PATCH 3/4] moved Zig reference to arqv/zig-overlay --- default.nix | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/default.nix b/default.nix index c89c4e9..838ebab 100644 --- a/default.nix +++ b/default.nix @@ -1,37 +1,32 @@ let - pkgs = import {}; - gitignoreSrc = pkgs.fetchFromGitHub { + zig-overlay = import (builtins.fetchGit { + url = "https://github.com/arqv/zig-overlay.git"; + rev = "a56601116906a2f192702e0b97487b8e7f796fdc"; + }); + pkgs = import { overlays = [ zig-overlay ]; }; + + gitignoreSrc = pkgs.fetchFromGitHub { owner = "hercules-ci"; repo = "gitignore"; rev = "c4662e662462e7bf3c2a968483478a665d00e717"; sha256 = "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx"; }; inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource; - - zig = pkgs.stdenvNoCC.mkDerivation rec { - name = "zig"; + + zig = pkgs.zig.custom { + sha256 = "7d715ea8948611734986d8a056fdec98d0f39b064e38efcd088823c02b1afba8"; version = "0.6.0+91a1c20e7"; - src = pkgs.fetchurl { - url = "https://ziglang.org/builds/zig-linux-x86_64-${version}.tar.xz"; - sha256 = "7d715ea8948611734986d8a056fdec98d0f39b064e38efcd088823c02b1afba8"; - }; - dontConfigure = true; - dontBuild = true; - installPhase = '' - mkdir -p $out $out/bin $out/doc - mv lib/ $out/ - mv zig $out/bin - mv langref.html $out/doc - ''; }; in pkgs.stdenvNoCC.mkDerivation { name = "zls"; version = "master"; src = gitignoreSource ./.; - nativeBuildInputs = [ zig ]; + nativeBuildInputs = [ + zig + ]; + dontConfigure = true; - buildPhase = '' zig build -Drelease-safe=true ''; From f9df6eb34053c286c0cded89fa90ec78600b5eaa Mon Sep 17 00:00:00 2001 From: Lyla Bravo Date: Sat, 31 Oct 2020 17:05:19 -0300 Subject: [PATCH 4/4] Added configuration options (fixed) --- default.nix | 76 +++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/default.nix b/default.nix index 838ebab..9cb9740 100644 --- a/default.nix +++ b/default.nix @@ -1,8 +1,10 @@ let - zig-overlay = import (builtins.fetchGit { - url = "https://github.com/arqv/zig-overlay.git"; - rev = "a56601116906a2f192702e0b97487b8e7f796fdc"; - }); + zig-overlay = import ( + builtins.fetchGit { + url = "https://github.com/arqv/zig-overlay.git"; + rev = "a56601116906a2f192702e0b97487b8e7f796fdc"; + } + ); pkgs = import { overlays = [ zig-overlay ]; }; gitignoreSrc = pkgs.fetchFromGitHub { @@ -13,39 +15,39 @@ let }; inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource; - zig = pkgs.zig.custom { - sha256 = "7d715ea8948611734986d8a056fdec98d0f39b064e38efcd088823c02b1afba8"; - version = "0.6.0+91a1c20e7"; - }; -in - pkgs.stdenvNoCC.mkDerivation { - name = "zls"; - version = "master"; - src = gitignoreSource ./.; - nativeBuildInputs = [ - zig - ]; + zig-default = pkgs.zig.master; +in { + zig ? zig-default, + extraConfig ? {} +}: - dontConfigure = true; - buildPhase = '' - zig build -Drelease-safe=true - ''; - installPhase = '' - mkdir -p $out - zig build install --prefix $out +pkgs.stdenvNoCC.mkDerivation { + name = "zls"; + version = "master"; + src = gitignoreSource ./.; + nativeBuildInputs = [ + zig + ]; - # write configuration according to defaults described in README.md - cat << EOF > $out/bin/zls.json - { - "zig_lib_path": "${zig}/lib/zig/", - "zig_exe_path": "${zig}/bin/zig", - "warn_style": false, - "enable_snippets": false, - "enable_semantic_tokens": false, - "operator_completions": true - } - EOF - ''; + dontConfigure = true; + buildPhase = '' + zig build -Drelease-safe=true + ''; + installPhase = '' + mkdir -p $out + zig build install --prefix $out - XDG_CACHE_HOME = "."; - } + cat << EOF > $out/bin/zls.json + ${builtins.toJSON { + zig_lib_path = "${zig}/lib/zig/"; + zig_exe_path = "${zig}/bin/zig"; + warn_style = false; + enable_snippets = false; + enable_semantic_tokens = false; + operator_completions = true; + } // extraConfig} + EOF + ''; + + XDG_CACHE_HOME = ".cache"; +}